### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: model/org/eclipse/jdt/internal/core/CompilationUnit.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java,v
retrieving revision 1.216
diff -u -r1.216 CompilationUnit.java
--- model/org/eclipse/jdt/internal/core/CompilationUnit.java	4 Oct 2005 13:50:23 -0000	1.216
+++ model/org/eclipse/jdt/internal/core/CompilationUnit.java	3 Nov 2005 17:04:15 -0000
@@ -16,7 +16,6 @@
 import org.eclipse.core.runtime.*;
 import org.eclipse.jdt.core.*;
 import org.eclipse.jdt.core.compiler.*;
-import org.eclipse.jdt.core.compiler.IProblem;
 import org.eclipse.jdt.core.dom.AST;
 import org.eclipse.jdt.internal.compiler.ASTVisitor;
 import org.eclipse.jdt.internal.compiler.IProblemFactory;
@@ -155,7 +154,7 @@
 	try {
 		if (computeProblems){
 			perWorkingCopyInfo.beginReporting();
-			compilationUnitDeclaration = CompilationUnitProblemFinder.process(unit, this, contents, parser, this.owner, perWorkingCopyInfo, !createAST/*reset env if not creating AST*/, pm);
+			compilationUnitDeclaration = CompilationUnitProblemFinder.process(unit, this, contents, parser, this.owner, perWorkingCopyInfo, createAST, pm);
 			perWorkingCopyInfo.endReporting();
 		}
 		
Index: model/org/eclipse/jdt/internal/core/ReconcileWorkingCopyOperation.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ReconcileWorkingCopyOperation.java,v
retrieving revision 1.27
diff -u -r1.27 ReconcileWorkingCopyOperation.java
--- model/org/eclipse/jdt/internal/core/ReconcileWorkingCopyOperation.java	6 Oct 2005 15:13:24 -0000	1.27
+++ model/org/eclipse/jdt/internal/core/ReconcileWorkingCopyOperation.java	3 Nov 2005 17:04:15 -0000
@@ -79,7 +79,7 @@
 					    try {
 							problemRequestor.beginReporting();
 							char[] contents = workingCopy.getContents();
-							unit = CompilationUnitProblemFinder.process(workingCopy, contents, this.workingCopyOwner, problemRequestor, !this.createAST/*reset env if not creating AST*/, this.progressMonitor);
+							unit = CompilationUnitProblemFinder.process(workingCopy, contents, this.workingCopyOwner, problemRequestor, this.createAST, this.progressMonitor);
 							problemRequestor.endReporting();
 							if (progressMonitor != null) progressMonitor.worked(1);
 							if (this.createAST && unit != null) {
Index: model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java,v
retrieving revision 1.45
diff -u -r1.45 CompilationUnitProblemFinder.java
--- model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java	8 Apr 2005 09:42:36 -0000	1.45
+++ model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java	3 Nov 2005 17:04:15 -0000
@@ -79,9 +79,10 @@
 		IErrorHandlingPolicy policy,
 		Map settings,
 		ICompilerRequestor requestor,
-		IProblemFactory problemFactory) {
+		IProblemFactory problemFactory,
+		boolean parseLiteralExpressionsAsConstants ) {
 
-		super(environment, policy, settings, requestor, problemFactory, true);
+		super(environment, policy, settings, requestor, problemFactory, parseLiteralExpressionsAsConstants );
 	}
 
 	/**
@@ -136,7 +137,7 @@
 		Parser parser,
 		WorkingCopyOwner workingCopyOwner,
 		IProblemRequestor problemRequestor,
-		boolean resetEnvironment,
+		boolean createAST,
 		IProgressMonitor monitor)
 		throws JavaModelException {
 
@@ -152,7 +153,8 @@
 				getHandlingPolicy(),
 				project.getOptions(true),
 				getRequestor(),
-				problemFactory);
+				problemFactory,
+				!createAST);
 			if (parser != null) {
 				problemFinder.parser = parser;
 			}
@@ -197,8 +199,8 @@
 			if (problemFactory != null)
 				problemFactory.monitor = null; // don't hold a reference to this external object
 			// NB: unit.cleanUp() is done by caller
-			if (problemFinder != null && resetEnvironment)
-				problemFinder.lookupEnvironment.reset();			
+			if (problemFinder != null && !createAST)
+				problemFinder.lookupEnvironment.reset();		
 		}
 	}
 
@@ -207,11 +209,11 @@
 		char[] contents,
 		WorkingCopyOwner workingCopyOwner,
 		IProblemRequestor problemRequestor,
-		boolean resetEnvironment,
+		boolean createAST,
 		IProgressMonitor monitor)
 		throws JavaModelException {
 			
-		return process(null/*no CompilationUnitDeclaration*/, unitElement, contents, null/*use default Parser*/, workingCopyOwner, problemRequestor, resetEnvironment, monitor);
+		return process(null/*no CompilationUnitDeclaration*/, unitElement, contents, null/*use default Parser*/, workingCopyOwner, problemRequestor, createAST, monitor);
 	}
 
 	
Index: compiler/org/eclipse/jdt/internal/compiler/Compiler.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/Compiler.java,v
retrieving revision 1.69
diff -u -r1.69 Compiler.java
--- compiler/org/eclipse/jdt/internal/compiler/Compiler.java	19 Jul 2005 11:05:17 -0000	1.69
+++ compiler/org/eclipse/jdt/internal/compiler/Compiler.java	3 Nov 2005 17:04:15 -0000
@@ -158,6 +158,7 @@
 
 		// create a problem handler given a handling policy
 		this.options = new CompilerOptions(settings);
+		this.options.parseLiteralExpressionsAsConstants = parseLiteralExpressionsAsConstants;
 		
 		// wrap requestor in DebugRequestor if one is specified
 		if(DebugRequestor == null) {