Attachment 66131 Details for Bug 185768 – Proposed fix

[patch] Proposed fix

patch_185768.txt (text/plain), 3.67 KB, created by Olivier Thomann

on 2007-05-07 11:58:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2007-05-07 11:58:05 EDT

Size: 3.67 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.compiler.tool
>Index: src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java,v
>retrieving revision 1.17
>diff -u -r1.17 EclipseCompiler.java
>--- src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java	16 Apr 2007 21:55:43 -0000	1.17
>+++ src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java	7 May 2007 15:57:06 -0000
>@@ -304,16 +304,6 @@
> 		this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
> 		this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
> 
>-		// TODO FIXME (olivier) REMOVE BEFORE 3.3 once the APT1.6 IS WORKING FINE
>-		for (String option : options ) {
>-			if ("-processorpath".equals(option) //$NON-NLS-1$
>-					|| ("-processor".equals(option))) { //$NON-NLS-1$
>-				this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED);
>-				this.options.put(CompilerOptions.OPTION_DocCommentSupport, CompilerOptions.ENABLED);
>-				break;
>-			}
>-		}
>-
> 		ArrayList<String> allOptions = new ArrayList<String>();
> 		if (options != null) {
> 			for (Iterator<String> iterator = options.iterator(); iterator.hasNext(); ) {
>#P org.eclipse.jdt.core
>Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v
>retrieving revision 1.299
>diff -u -r1.299 Main.java
>--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java	26 Apr 2007 02:51:41 -0000	1.299
>+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java	7 May 2007 15:57:07 -0000
>@@ -2155,6 +2155,12 @@
> 		printUsage();
> 		return;
> 	}
>+
>+	// enable annotation processing by default in batch mode: 185768
>+	this.options.put(
>+		CompilerOptions.OPTION_Process_Annotations,
>+		CompilerOptions.ENABLED);
>+
> 	final int INSIDE_CLASSPATH_start = 1;
> 	final int INSIDE_DESTINATION_PATH = 3;
> 	final int INSIDE_TARGET = 4;
>@@ -2685,16 +2691,10 @@
> 				}
> 				if (currentArg.equals("-processorpath")) { //$NON-NLS-1$
> 					mode = INSIDE_PROCESSOR_PATH_start;
>-					this.options.put(
>-						CompilerOptions.OPTION_Process_Annotations,
>-						CompilerOptions.ENABLED);
> 					continue;
> 				}
> 				if (currentArg.equals("-processor")) { //$NON-NLS-1$
> 					mode = INSIDE_PROCESSOR_start;
>-					this.options.put(
>-						CompilerOptions.OPTION_Process_Annotations,
>-						CompilerOptions.ENABLED);
> 					continue;
> 				}
> 				if (currentArg.equals("-proc:only")) { //$NON-NLS-1$
>Index: compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java,v
>retrieving revision 1.183
>diff -u -r1.183 CompilerOptions.java
>--- compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	7 May 2007 14:55:50 -0000	1.183
>+++ compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	7 May 2007 15:57:08 -0000
>@@ -920,6 +920,7 @@
> 			if (ENABLED.equals(optionValue)) {
> 				this.processAnnotations = true;
> 				this.storeAnnotations = true; // annotation processing requires annotation to be stored
>+				this.docCommentSupport = true;  // annotation processing requires javadoc processing
> 			} else if (DISABLED.equals(optionValue)) {
> 				this.processAnnotations = false;
> 				this.storeAnnotations = false;

Flags:

Olivier_Thomann: review?

Actions: View | Diff

Attachments on bug 185768: 66131