Attachment #193868 for bug #343607

View | Details | Raw Unified | Return to bug 343607
Collapse All | Expand All





		private void logExtraProblem(CategorizedProblem problem, int localErrorCount, int globalErrorCount) {
			char[] originatingFileName = problem.getOriginatingFileName();
			if (originatingFileName == null) {
				// simplified message output
				if (problem.isError()) {
					printErr(this.main.bind(
								"requestor.extraerror", //$NON-NLS-1$
								Integer.toString(globalErrorCount)));
				} else {
					// warning / mandatory warning / other
					printErr(this.main.bind(
							"requestor.extrawarning", //$NON-NLS-1$
							Integer.toString(globalErrorCount)));
				}
				printErr(" "); //$NON-NLS-1$
				this.printlnErr(problem.getMessage());
				this.printlnErr(errorReportSource);
			} else {
				String fileName = new String(originatingFileName);
				if ((this.tagBits & Logger.EMACS) != 0) {
					String result = fileName
							+ ":" //$NON-NLS-1$
							+ problem.getSourceLineNumber()
							+ ": " //$NON-NLS-1$
							+ (problem.isError() ? this.main.bind("output.emacs.error") : this.main.bind("output.emacs.warning")) //$NON-NLS-1$ //$NON-NLS-2$
							+ ": " //$NON-NLS-1$
							+ problem.getMessage();
					this.printlnErr(result);
					final String errorReportSource = errorReportSource(problem, null, this.tagBits);
					this.printlnErr(errorReportSource);
				} else {
					if (localErrorCount == 0) {
						this.printlnErr("----------"); //$NON-NLS-1$
					}
					printErr(problem.isError() ?
							this.main.bind(
									"requestor.error", //$NON-NLS-1$
									Integer.toString(globalErrorCount),
									new String(fileName))
									: this.main.bind(
											"requestor.warning", //$NON-NLS-1$
											Integer.toString(globalErrorCount),
											new String(fileName)));
					final String errorReportSource = errorReportSource(problem, null, 0);
					this.printlnErr(errorReportSource);
					this.printlnErr(problem.getMessage());
					this.printlnErr("----------"); //$NON-NLS-1$
				}
				printErr(problem.isError() ?
						this.main.bind(
								"requestor.error", //$NON-NLS-1$
								Integer.toString(globalErrorCount),
								new String(fileName))
								: this.main.bind(
										"requestor.warning", //$NON-NLS-1$
										Integer.toString(globalErrorCount),
										new String(fileName)));
				final String errorReportSource = errorReportSource(problem, null, 0);
				this.printlnErr(errorReportSource);
				this.printlnErr(problem.getMessage());
				this.printlnErr("----------"); //$NON-NLS-1$
			}
		}


Lines 104-109 Link Here

(-)batch/org/eclipse/jdt/internal/compiler/batch/messages.properties (+2 lines)
104	### requestor	104	### requestor
105	requestor.error = {0}. ERROR in {1}	105	requestor.error = {0}. ERROR in {1}
106	requestor.warning = {0}. WARNING in {1}	106	requestor.warning = {0}. WARNING in {1}
		107	requestor.extraerror = {0}. Error:
		108	requestor.extrawarning = {0}. Warning:
107	requestor.notRetrieveErrorMessage = Cannot retrieve the error message for {0}	109	requestor.notRetrieveErrorMessage = Cannot retrieve the error message for {0}
108	requestor.noFileNameSpecified = (original file name is not available)	110	requestor.noFileNameSpecified = (original file name is not available)
109		111

Return to bug 343607

Lines 569-606 Link Here

(-)batch/org/eclipse/jdt/internal/compiler/batch/Main.java (-29 / +42 lines)
569		569
570	private void logExtraProblem(CategorizedProblem problem, int localErrorCount, int globalErrorCount) {	570	private void logExtraProblem(CategorizedProblem problem, int localErrorCount, int globalErrorCount) {
571	char[] originatingFileName = problem.getOriginatingFileName();	571	char[] originatingFileName = problem.getOriginatingFileName();
572	String fileName =	572	if (originatingFileName == null) {
573	originatingFileName == null	573	// simplified message output
574	? this.main.bind("requestor.noFileNameSpecified")//$NON-NLS-1$	574	if (problem.isError()) {
575	: new String(originatingFileName);	575	printErr(this.main.bind(
576	if ((this.tagBits & Logger.EMACS) != 0) {	576	"requestor.extraerror", //$NON-NLS-1$
577	String result = fileName	577	Integer.toString(globalErrorCount)));
578	+ ":" //$NON-NLS-1$	578	} else {
579	+ problem.getSourceLineNumber()	579	// warning / mandatory warning / other
580	+ ": " //$NON-NLS-1$	580	printErr(this.main.bind(
581	+ (problem.isError() ? this.main.bind("output.emacs.error") : this.main.bind("output.emacs.warning")) //$NON-NLS-1$ //$NON-NLS-2$	581	"requestor.extrawarning", //$NON-NLS-1$
582	+ ": " //$NON-NLS-1$	582	Integer.toString(globalErrorCount)));
583	+ problem.getMessage();	583	}
584	this.printlnErr(result);	584	printErr(" "); //$NON-NLS-1$
585	final String errorReportSource = errorReportSource(problem, null, this.tagBits);	585	this.printlnErr(problem.getMessage());
586	this.printlnErr(errorReportSource);
587	} else {	586	} else {
588	if (localErrorCount == 0) {	587	String fileName = new String(originatingFileName);
		588	if ((this.tagBits & Logger.EMACS) != 0) {
		589	String result = fileName
		590	+ ":" //$NON-NLS-1$
		591	+ problem.getSourceLineNumber()
		592	+ ": " //$NON-NLS-1$
		593	+ (problem.isError() ? this.main.bind("output.emacs.error") : this.main.bind("output.emacs.warning")) //$NON-NLS-1$ //$NON-NLS-2$
		594	+ ": " //$NON-NLS-1$
		595	+ problem.getMessage();
		596	this.printlnErr(result);
		597	final String errorReportSource = errorReportSource(problem, null, this.tagBits);
		598	this.printlnErr(errorReportSource);
		599	} else {
		600	if (localErrorCount == 0) {
		601	this.printlnErr("----------"); //$NON-NLS-1$
		602	}
		603	printErr(problem.isError() ?
		604	this.main.bind(
		605	"requestor.error", //$NON-NLS-1$
		606	Integer.toString(globalErrorCount),
		607	new String(fileName))
		608	: this.main.bind(
		609	"requestor.warning", //$NON-NLS-1$
		610	Integer.toString(globalErrorCount),
		611	new String(fileName)));
		612	final String errorReportSource = errorReportSource(problem, null, 0);
		613	this.printlnErr(errorReportSource);
		614	this.printlnErr(problem.getMessage());
589	this.printlnErr("----------"); //$NON-NLS-1$	615	this.printlnErr("----------"); //$NON-NLS-1$
590	}	616	}
591	printErr(problem.isError() ?
592	this.main.bind(
593	"requestor.error", //$NON-NLS-1$
594	Integer.toString(globalErrorCount),
595	new String(fileName))
596	: this.main.bind(
597	"requestor.warning", //$NON-NLS-1$
598	Integer.toString(globalErrorCount),
599	new String(fileName)));
600	final String errorReportSource = errorReportSource(problem, null, 0);
601	this.printlnErr(errorReportSource);
602	this.printlnErr(problem.getMessage());
603	this.printlnErr("----------"); //$NON-NLS-1$
604	}	617	}
605	}	618	}
606		619