Bug 460636 - Sonar: change Integer Instantiation to Integer.valueOf

Change-Id: I11a13d774fbff6731689cc4dcd80f23f67c09b81 Signed-off-by: <gautier.desaintmartinlacaze@gmail.com>
author: gdesaintmartinlacaze 2015-02-18 15:33:06 +0000
committer: vrubezhny 2015-02-26 16:13:48 +0000
commit: 9b373e0dcc12b8af3785377cd0b0dd9742d1140f (patch)
tree: c06a42f2d8469a51fe0e3d66190ab07397142103
parent: 5c72d6cc70b8231bf92b434e4ce03fcb5083193a (diff)
download: webtools.jsdt-9b373e0dcc12b8af3785377cd0b0dd9742d1140f.tar.gz
webtools.jsdt-9b373e0dcc12b8af3785377cd0b0dd9742d1140f.tar.xz
webtools.jsdt-9b373e0dcc12b8af3785377cd0b0dd9742d1140f.zip
133 files changed, 907 insertions, 907 deletions
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/ToolFactory.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/ToolFactory.java
index 072242699..a7303c829 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/ToolFactory.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/ToolFactory.java
@@ -46,7 +46,7 @@ public class ToolFactory {
 	 * @see DefaultCodeFormatterConstants#FORMATTER_NEVER_INDENT_LINE_COMMENTS_ON_FIRST_COLUMN
 	 * @see #createCodeFormatter(Map, int)
 	 */
-	public static final int M_FORMAT_NEW = new Integer(0).intValue();
+	public static final int M_FORMAT_NEW = 0;
 
 	/**
 	 * This mode is used for formatting existing code when all formatter options should be used.
@@ -58,7 +58,7 @@ public class ToolFactory {
 	 * @see DefaultCodeFormatterConstants#FORMATTER_NEVER_INDENT_LINE_COMMENTS_ON_FIRST_COLUMN
 	 * @see #createCodeFormatter(Map, int)
 	 */
-	public static final int M_FORMAT_EXISTING = new Integer(1).intValue();
+	public static final int M_FORMAT_EXISTING = 1;
 
 	/**
 	 * Create an instance of the built-in code formatter.
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/dom/ASTNode.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/dom/ASTNode.java
index 2c7b0b1a4..7d8863ede 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/dom/ASTNode.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/dom/ASTNode.java
@@ -1402,7 +1402,7 @@ public abstract class ASTNode {
 			SimplePropertyDescriptor p = (SimplePropertyDescriptor) property;
 			if (p.getValueType() == int.class) {
 				int result = internalGetSetIntProperty(p, true, 0);
-				return new Integer(result);
+				return Integer.valueOf(result);
 			} else if (p.getValueType() == boolean.class) {
 				boolean result = internalGetSetBooleanProperty(p, true, false);
 				return Boolean.valueOf(result);
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/dom/DefaultBindingResolver.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/dom/DefaultBindingResolver.java
index 3ee916d2e..f049c9f4d 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/dom/DefaultBindingResolver.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/dom/DefaultBindingResolver.java
@@ -485,7 +485,7 @@ class DefaultBindingResolver extends BindingResolver {
 			Constant constant = compilerExpression.constant;
 			if (constant != null && constant != Constant.NotAConstant) {
 				switch (constant.typeID()) {
-					case TypeIds.T_int : return new Integer(constant.intValue());
+					case TypeIds.T_int : return Integer.valueOf(constant.intValue());
 					case TypeIds.T_short : return new Short(constant.shortValue());
 					case TypeIds.T_char : return new Character(constant.charValue());
 					case TypeIds.T_float : return new Float(constant.floatValue());
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/batch/Main.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/batch/Main.java
index a0cafde18..c128364f9 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/batch/Main.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/batch/Main.java
@@ -543,7 +543,7 @@ public class Main implements ProblemSeverities, SuffixConstants {
 		 */
 		public void logNumberOfClassFilesGenerated(int exportedClassFilesCounter) {
 			if ((this.tagBits & Logger.XML) != 0) {
-				this.parameters.put(Logger.VALUE, new Integer(exportedClassFilesCounter));
+				this.parameters.put(Logger.VALUE, Integer.valueOf(exportedClassFilesCounter));
 				this.printTag(Logger.NUMBER_OF_CLASSFILES, this.parameters, true, true);
 			}
 			if (exportedClassFilesCounter == 1) {
@@ -684,10 +684,10 @@ public class Main implements ProblemSeverities, SuffixConstants {
 			int globalErrorsCount, int globalWarningsCount, int globalTasksCount) {
 			if ((this.tagBits & Logger.XML) != 0) {
 				// generate xml
-				this.parameters.put(Logger.NUMBER_OF_PROBLEMS, new Integer(globalProblemsCount));
-				this.parameters.put(Logger.NUMBER_OF_ERRORS, new Integer(globalErrorsCount));
-				this.parameters.put(Logger.NUMBER_OF_WARNINGS, new Integer(globalWarningsCount));
-				this.parameters.put(Logger.NUMBER_OF_TASKS, new Integer(globalTasksCount));
+				this.parameters.put(Logger.NUMBER_OF_PROBLEMS, Integer.valueOf(globalProblemsCount));
+				this.parameters.put(Logger.NUMBER_OF_ERRORS, Integer.valueOf(globalErrorsCount));
+				this.parameters.put(Logger.NUMBER_OF_WARNINGS, Integer.valueOf(globalWarningsCount));
+				this.parameters.put(Logger.NUMBER_OF_TASKS, Integer.valueOf(globalTasksCount));
 				this.printTag(Logger.PROBLEM_SUMMARY, this.parameters, true, true);
 			}
 			if (globalProblemsCount == 1) {
@@ -843,19 +843,19 @@ public class Main implements ProblemSeverities, SuffixConstants {
 			final int sourceEnd = problem.getSourceEnd();
 			final int id = problem.getID();
 			this.parameters.put(Logger.ID, getFieldName(id)); // ID as field name
-			this.parameters.put(Logger.PROBLEM_ID, new Integer(id)); // ID as numeric value
+			this.parameters.put(Logger.PROBLEM_ID, Integer.valueOf(id)); // ID as numeric value
 			boolean isError = problem.isError();
 			int severity = isError ? ProblemSeverities.Error : ProblemSeverities.Warning;
 			this.parameters.put(Logger.PROBLEM_SEVERITY, isError ? Logger.ERROR : Logger.WARNING);
-			this.parameters.put(Logger.PROBLEM_LINE, new Integer(problem.getSourceLineNumber()));
-			this.parameters.put(Logger.PROBLEM_SOURCE_START, new Integer(sourceStart));
-			this.parameters.put(Logger.PROBLEM_SOURCE_END, new Integer(sourceEnd));
+			this.parameters.put(Logger.PROBLEM_LINE, Integer.valueOf(problem.getSourceLineNumber()));
+			this.parameters.put(Logger.PROBLEM_SOURCE_START, Integer.valueOf(sourceStart));
+			this.parameters.put(Logger.PROBLEM_SOURCE_END, Integer.valueOf(sourceEnd));
 			String problemOptionKey = getProblemOptionKey(id);
 			if (problemOptionKey != null) {
 				this.parameters.put(Logger.PROBLEM_OPTION_KEY, problemOptionKey);
 			}
 			int categoryID = ProblemReporter.getProblemCategory(severity, id);
-			this.parameters.put(Logger.PROBLEM_CATEGORY_ID, new Integer(categoryID));
+			this.parameters.put(Logger.PROBLEM_CATEGORY_ID, Integer.valueOf(categoryID));
 			this.printTag(Logger.PROBLEM_TAG, this.parameters, true, false);
 			this.parameters.put(Logger.VALUE, problem.getMessage());
 			this.printTag(Logger.PROBLEM_MESSAGE, this.parameters, true, true);
@@ -880,9 +880,9 @@ public class Main implements ProblemSeverities, SuffixConstants {
 		 *            the given unit source
 		 */
 		private void logXmlTask(CategorizedProblem problem, char[] unitSource) {
-			this.parameters.put(Logger.PROBLEM_LINE, new Integer(problem.getSourceLineNumber()));
-			this.parameters.put(Logger.PROBLEM_SOURCE_START, new Integer(problem.getSourceStart()));
-			this.parameters.put(Logger.PROBLEM_SOURCE_END, new Integer(problem.getSourceEnd()));
+			this.parameters.put(Logger.PROBLEM_LINE, Integer.valueOf(problem.getSourceLineNumber()));
+			this.parameters.put(Logger.PROBLEM_SOURCE_START, Integer.valueOf(problem.getSourceStart()));
+			this.parameters.put(Logger.PROBLEM_SOURCE_END, Integer.valueOf(problem.getSourceEnd()));
 			String problemOptionKey = getProblemOptionKey(problem.getID());
 			if (problemOptionKey != null) {
 				this.parameters.put(Logger.PROBLEM_OPTION_KEY, problemOptionKey);
@@ -1005,14 +1005,14 @@ public class Main implements ProblemSeverities, SuffixConstants {
 		 * Only use in xml mode.
 		 */
 		private void startLoggingProblems(int errors, int warnings) {
-			this.parameters.put(Logger.NUMBER_OF_PROBLEMS, new Integer(errors + warnings));
-			this.parameters.put(Logger.NUMBER_OF_ERRORS, new Integer(errors));
-			this.parameters.put(Logger.NUMBER_OF_WARNINGS, new Integer(warnings));
+			this.parameters.put(Logger.NUMBER_OF_PROBLEMS, Integer.valueOf(errors + warnings));
+			this.parameters.put(Logger.NUMBER_OF_ERRORS, Integer.valueOf(errors));
+			this.parameters.put(Logger.NUMBER_OF_WARNINGS, Integer.valueOf(warnings));
 			this.printTag(Logger.PROBLEMS, this.parameters, true, false);
 		}
 
 		private void startLoggingExtraProblems(int count) {
-			this.parameters.put(Logger.NUMBER_OF_PROBLEMS, new Integer(count));
+			this.parameters.put(Logger.NUMBER_OF_PROBLEMS, Integer.valueOf(count));
 			this.printTag(Logger.EXTRA_PROBLEMS, this.parameters, true, false);
 		}
 
@@ -1054,7 +1054,7 @@ public class Main implements ProblemSeverities, SuffixConstants {
 		}
 		public void startLoggingTasks(int tasks) {
 			if ((this.tagBits & Logger.XML) != 0) {
-				this.parameters.put(Logger.NUMBER_OF_TASKS, new Integer(tasks));
+				this.parameters.put(Logger.NUMBER_OF_TASKS, Integer.valueOf(tasks));
 				this.printTag(Logger.TASKS, this.parameters, true, false);
 			}
 		}
@@ -1105,9 +1105,9 @@ public class Main implements ProblemSeverities, SuffixConstants {
 			final int sourceEnd = problem.getSourceEnd();
 			boolean isError = problem.isError();
 			this.parameters.put(Logger.PROBLEM_SEVERITY, isError ? Logger.ERROR : Logger.WARNING);
-			this.parameters.put(Logger.PROBLEM_LINE, new Integer(problem.getSourceLineNumber()));
-			this.parameters.put(Logger.PROBLEM_SOURCE_START, new Integer(sourceStart));
-			this.parameters.put(Logger.PROBLEM_SOURCE_END, new Integer(sourceEnd));
+			this.parameters.put(Logger.PROBLEM_LINE, Integer.valueOf(problem.getSourceLineNumber()));
+			this.parameters.put(Logger.PROBLEM_SOURCE_START, Integer.valueOf(sourceStart));
+			this.parameters.put(Logger.PROBLEM_SOURCE_END, Integer.valueOf(sourceEnd));
 			this.printTag(Logger.EXTRA_PROBLEM_TAG, this.parameters, true, false);
 			this.parameters.put(Logger.VALUE, problem.getMessage());
 			this.printTag(Logger.PROBLEM_MESSAGE, this.parameters, true, true);
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java
index cedf049dc..07a2dd59b 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java
@@ -2791,964 +2791,964 @@ protected void consumePostDoc() {
 	}
 }
 
-//This method is part of an automatic generation : do NOT edit-modify  
+//This method is part of an automatic generation : do NOT edit-modify  
 protected void consumeRule(int act) {
-switch ( act ) {
- case 23 : if (DEBUG) { System.out.println("CompilationUnit ::= EnterCompilationUnit..."); }  //$NON-NLS-1$
+switch ( act ) {
+ case 23 : if (DEBUG) { System.out.println("CompilationUnit ::= EnterCompilationUnit..."); }  //$NON-NLS-1$
 		    consumeCompilationUnit();  
 			break;
-
- case 24 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= ProgramElements"); }  //$NON-NLS-1$
+
+ case 24 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= ProgramElements"); }  //$NON-NLS-1$
 		    consumeInternalCompilationUnitWithTypes();  
 			break;
-
- case 25 : if (DEBUG) { System.out.println("InternalCompilationUnit ::="); }  //$NON-NLS-1$
+
+ case 25 : if (DEBUG) { System.out.println("InternalCompilationUnit ::="); }  //$NON-NLS-1$
 		    consumeEmptyInternalCompilationUnit();  
 			break;
-
- case 26 : if (DEBUG) { System.out.println("EnterCompilationUnit ::="); }  //$NON-NLS-1$
+
+ case 26 : if (DEBUG) { System.out.println("EnterCompilationUnit ::="); }  //$NON-NLS-1$
 		    consumeEnterCompilationUnit();  
 			break;
-
- case 30 : if (DEBUG) { System.out.println("CatchHeader ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
+
+ case 30 : if (DEBUG) { System.out.println("CatchHeader ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
 		    consumeCatchHeader();  
 			break;
-
- case 32 : if (DEBUG) { System.out.println("VariableDeclarators ::= VariableDeclarators COMMA..."); }  //$NON-NLS-1$
+
+ case 32 : if (DEBUG) { System.out.println("VariableDeclarators ::= VariableDeclarators COMMA..."); }  //$NON-NLS-1$
 		    consumeVariableDeclarators();  
 			break;
-
- case 34 : if (DEBUG) { System.out.println("VariableDeclaratorsNoIn ::= VariableDeclaratorsNoIn COMMA"); }  //$NON-NLS-1$
+
+ case 34 : if (DEBUG) { System.out.println("VariableDeclaratorsNoIn ::= VariableDeclaratorsNoIn COMMA"); }  //$NON-NLS-1$
 		    consumeVariableDeclarators();  
 			break;
-
- case 39 : if (DEBUG) { System.out.println("EnterVariable ::="); }  //$NON-NLS-1$
+
+ case 39 : if (DEBUG) { System.out.println("EnterVariable ::="); }  //$NON-NLS-1$
 		    consumeEnterVariable();  
 			break;
-
- case 40 : if (DEBUG) { System.out.println("ExitVariableWithInitialization ::="); }  //$NON-NLS-1$
+
+ case 40 : if (DEBUG) { System.out.println("ExitVariableWithInitialization ::="); }  //$NON-NLS-1$
 		    consumeExitVariableWithInitialization();  
 			break;
-
- case 41 : if (DEBUG) { System.out.println("ExitVariableWithoutInitialization ::="); }  //$NON-NLS-1$
+
+ case 41 : if (DEBUG) { System.out.println("ExitVariableWithoutInitialization ::="); }  //$NON-NLS-1$
 		    consumeExitVariableWithoutInitialization();  
 			break;
-
- case 42 : if (DEBUG) { System.out.println("ForceNoDiet ::="); }  //$NON-NLS-1$
+
+ case 42 : if (DEBUG) { System.out.println("ForceNoDiet ::="); }  //$NON-NLS-1$
 		    consumeForceNoDiet();  
 			break;
-
- case 43 : if (DEBUG) { System.out.println("RestoreDiet ::="); }  //$NON-NLS-1$
+
+ case 43 : if (DEBUG) { System.out.println("RestoreDiet ::="); }  //$NON-NLS-1$
 		    consumeRestoreDiet();  
 			break;
-
- case 47 : if (DEBUG) { System.out.println("FunctionExpression ::= FunctionExpressionHeader..."); }  //$NON-NLS-1$
+
+ case 47 : if (DEBUG) { System.out.println("FunctionExpression ::= FunctionExpressionHeader..."); }  //$NON-NLS-1$
 		    // set to true to consume a method with a body
-consumeFunctionExpression();   
+consumeFunctionExpression();   
 			break;
-
- case 48 : if (DEBUG) { System.out.println("FunctionExpressionHeader ::= FunctionExpressionHeaderName"); }  //$NON-NLS-1$
+
+ case 48 : if (DEBUG) { System.out.println("FunctionExpressionHeader ::= FunctionExpressionHeaderName"); }  //$NON-NLS-1$
 		    consumeMethodHeader();  
 			break;
-
- case 49 : if (DEBUG) { System.out.println("FunctionExpressionHeaderName ::= Modifiersopt function..."); }  //$NON-NLS-1$
+
+ case 49 : if (DEBUG) { System.out.println("FunctionExpressionHeaderName ::= Modifiersopt function..."); }  //$NON-NLS-1$
 		    consumeMethodHeaderName(false);  
 			break;
-
- case 50 : if (DEBUG) { System.out.println("FunctionExpressionHeaderName ::= Modifiersopt function..."); }  //$NON-NLS-1$
+
+ case 50 : if (DEBUG) { System.out.println("FunctionExpressionHeaderName ::= Modifiersopt function..."); }  //$NON-NLS-1$
 		    consumeMethodHeaderName(true);  
 			break;
-
- case 52 : if (DEBUG) { System.out.println("MethodDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
+
+ case 52 : if (DEBUG) { System.out.println("MethodDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
 		    // set to true to consume a method with a body
-consumeMethodDeclaration(true);   
+consumeMethodDeclaration(true);   
 			break;
-
- case 53 : if (DEBUG) { System.out.println("AbstractMethodDeclaration ::= MethodHeader SEMICOLON"); }  //$NON-NLS-1$
+
+ case 53 : if (DEBUG) { System.out.println("AbstractMethodDeclaration ::= MethodHeader SEMICOLON"); }  //$NON-NLS-1$
 		    // set to false to consume a method without body
-consumeMethodDeclaration(false);  
+consumeMethodDeclaration(false);  
 			break;
-
- case 54 : if (DEBUG) { System.out.println("MethodHeader ::= MethodHeaderName FormalParameterListopt"); }  //$NON-NLS-1$
+
+ case 54 : if (DEBUG) { System.out.println("MethodHeader ::= MethodHeaderName FormalParameterListopt"); }  //$NON-NLS-1$
 		    consumeMethodHeader();  
 			break;
-
- case 55 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt function Identifier..."); }  //$NON-NLS-1$
+
+ case 55 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt function Identifier..."); }  //$NON-NLS-1$
 		    consumeMethodHeaderName(false);  
 			break;
-
- case 56 : if (DEBUG) { System.out.println("MethodHeaderRightParen ::= RPAREN"); }  //$NON-NLS-1$
+
+ case 56 : if (DEBUG) { System.out.println("MethodHeaderRightParen ::= RPAREN"); }  //$NON-NLS-1$
 		    consumeMethodHeaderRightParen();  
 			break;
-
- case 58 : if (DEBUG) { System.out.println("FormalParameterList ::= FormalParameterList COMMA..."); }  //$NON-NLS-1$
+
+ case 58 : if (DEBUG) { System.out.println("FormalParameterList ::= FormalParameterList COMMA..."); }  //$NON-NLS-1$
 		    consumeFormalParameterList();  
 			break;
-
- case 59 : if (DEBUG) { System.out.println("FormalParameter ::= VariableDeclaratorId"); }  //$NON-NLS-1$
+
+ case 59 : if (DEBUG) { System.out.println("FormalParameter ::= VariableDeclaratorId"); }  //$NON-NLS-1$
 		    consumeFormalParameter(false);  
 			break;
-
- case 60 : if (DEBUG) { System.out.println("MethodBody ::= NestedMethod LBRACE PostDoc..."); }  //$NON-NLS-1$
+
+ case 60 : if (DEBUG) { System.out.println("MethodBody ::= NestedMethod LBRACE PostDoc..."); }  //$NON-NLS-1$
 		    consumeMethodBody();  
 			break;
-
- case 61 : if (DEBUG) { System.out.println("NestedMethod ::="); }  //$NON-NLS-1$
+
+ case 61 : if (DEBUG) { System.out.println("NestedMethod ::="); }  //$NON-NLS-1$
 		    consumeNestedMethod();  
 			break;
-
- case 62 : if (DEBUG) { System.out.println("PostDoc ::="); }  //$NON-NLS-1$
+
+ case 62 : if (DEBUG) { System.out.println("PostDoc ::="); }  //$NON-NLS-1$
 		    consumePostDoc();  
 			break;
-
- case 63 : if (DEBUG) { System.out.println("PushLeftBraceObjectLiteral ::="); }  //$NON-NLS-1$
+
+ case 63 : if (DEBUG) { System.out.println("PushLeftBraceObjectLiteral ::="); }  //$NON-NLS-1$
 		    consumePushLeftBrace();  
 			break;
-
- case 64 : if (DEBUG) { System.out.println("Block ::= OpenBlock LBRACE BlockStatementsopt RBRACE"); }  //$NON-NLS-1$
+
+ case 64 : if (DEBUG) { System.out.println("Block ::= OpenBlock LBRACE BlockStatementsopt RBRACE"); }  //$NON-NLS-1$
 		    consumeBlock();  
 			break;
-
- case 65 : if (DEBUG) { System.out.println("OpenBlock ::="); }  //$NON-NLS-1$
+
+ case 65 : if (DEBUG) { System.out.println("OpenBlock ::="); }  //$NON-NLS-1$
 		    consumeOpenBlock() ;  
 			break;
-
- case 67 : if (DEBUG) { System.out.println("ProgramElements ::= ProgramElements ProgramElement"); }  //$NON-NLS-1$
+
+ case 67 : if (DEBUG) { System.out.println("ProgramElements ::= ProgramElements ProgramElement"); }  //$NON-NLS-1$
 		    consumeProgramElements() ;  
 			break;
-
- case 70 : if (DEBUG) { System.out.println("BlockStatements ::= BlockStatements BlockStatement"); }  //$NON-NLS-1$
+
+ case 70 : if (DEBUG) { System.out.println("BlockStatements ::= BlockStatements BlockStatement"); }  //$NON-NLS-1$
 		    consumeBlockStatements() ;  
 			break;
-
- case 74 : if (DEBUG) { System.out.println("LocalVariableDeclarationStatement ::=..."); }  //$NON-NLS-1$
+
+ case 74 : if (DEBUG) { System.out.println("LocalVariableDeclarationStatement ::=..."); }  //$NON-NLS-1$
 		    consumeLocalVariableDeclarationStatement();  
 			break;
-
- case 75 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= var PushModifiers..."); }  //$NON-NLS-1$
+
+ case 75 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= var PushModifiers..."); }  //$NON-NLS-1$
 		    consumeLocalVariableDeclaration();  
 			break;
-
- case 76 : if (DEBUG) { System.out.println("LocalVariableDeclarationNoIn ::= var PushModifiers..."); }  //$NON-NLS-1$
+
+ case 76 : if (DEBUG) { System.out.println("LocalVariableDeclarationNoIn ::= var PushModifiers..."); }  //$NON-NLS-1$
 		    consumeLocalVariableDeclaration();  
 			break;
-
- case 77 : if (DEBUG) { System.out.println("PushModifiers ::="); }  //$NON-NLS-1$
+
+ case 77 : if (DEBUG) { System.out.println("PushModifiers ::="); }  //$NON-NLS-1$
 		    consumePushModifiers();  
 			break;
-
- case 102 : if (DEBUG) { System.out.println("EmptyStatement ::= PushPosition SEMICOLON"); }  //$NON-NLS-1$
+
+ case 102 : if (DEBUG) { System.out.println("EmptyStatement ::= PushPosition SEMICOLON"); }  //$NON-NLS-1$
 		    consumeEmptyStatement();  
 			break;
-
- case 103 : if (DEBUG) { System.out.println("LabeledStatement ::= Label COLON Statement"); }  //$NON-NLS-1$
+
+ case 103 : if (DEBUG) { System.out.println("LabeledStatement ::= Label COLON Statement"); }  //$NON-NLS-1$
 		    consumeStatementLabel() ;  
 			break;
-
- case 104 : if (DEBUG) { System.out.println("LabeledStatementNoShortIf ::= Label COLON..."); }  //$NON-NLS-1$
+
+ case 104 : if (DEBUG) { System.out.println("LabeledStatementNoShortIf ::= Label COLON..."); }  //$NON-NLS-1$
 		    consumeStatementLabel() ;  
 			break;
-
- case 105 : if (DEBUG) { System.out.println("Label ::= Identifier"); }  //$NON-NLS-1$
+
+ case 105 : if (DEBUG) { System.out.println("Label ::= Identifier"); }  //$NON-NLS-1$
 		    consumeLabel() ;  
 			break;
-
-  case 106 : if (DEBUG) { System.out.println("ExpressionStatement ::= StatementExpression SEMICOLON"); }  //$NON-NLS-1$
+
+  case 106 : if (DEBUG) { System.out.println("ExpressionStatement ::= StatementExpression SEMICOLON"); }  //$NON-NLS-1$
 		    consumeExpressionStatement();  
 			break;
-
- case 108 : if (DEBUG) { System.out.println("IfThenStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
+
+ case 108 : if (DEBUG) { System.out.println("IfThenStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
 		    consumeStatementIfNoElse();  
 			break;
-
- case 109 : if (DEBUG) { System.out.println("IfThenElseStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
+
+ case 109 : if (DEBUG) { System.out.println("IfThenElseStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
 		    consumeStatementIfWithElse();  
 			break;
-
- case 110 : if (DEBUG) { System.out.println("IfThenElseStatementNoShortIf ::= if LPAREN Expression..."); }  //$NON-NLS-1$
+
+ case 110 : if (DEBUG) { System.out.println("IfThenElseStatementNoShortIf ::= if LPAREN Expression..."); }  //$NON-NLS-1$
 		    consumeStatementIfWithElse();  
 			break;
-
- case 111 : if (DEBUG) { System.out.println("IfThenElseStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
+
+ case 111 : if (DEBUG) { System.out.println("IfThenElseStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
 		    consumeStatementIfWithElse();  
 			break;
-
- case 112 : if (DEBUG) { System.out.println("IfThenElseStatementNoShortIf ::= if LPAREN Expression..."); }  //$NON-NLS-1$
+
+ case 112 : if (DEBUG) { System.out.println("IfThenElseStatementNoShortIf ::= if LPAREN Expression..."); }  //$NON-NLS-1$
 		    consumeStatementIfWithElse();  
 			break;
-
- case 113 : if (DEBUG) { System.out.println("SwitchStatement ::= switch LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
+
+ case 113 : if (DEBUG) { System.out.println("SwitchStatement ::= switch LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
 		    consumeStatementSwitch() ;  
 			break;
-
- case 114 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE RBRACE"); }  //$NON-NLS-1$
+
+ case 114 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE RBRACE"); }  //$NON-NLS-1$
 		    consumeEmptySwitchBlock() ;  
 			break;
-
- case 117 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE SwitchBlockStatements..."); }  //$NON-NLS-1$
+
+ case 117 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE SwitchBlockStatements..."); }  //$NON-NLS-1$
 		    consumeSwitchBlock() ;  
 			break;
-
- case 119 : if (DEBUG) { System.out.println("SwitchBlockStatements ::= SwitchBlockStatements..."); }  //$NON-NLS-1$
+
+ case 119 : if (DEBUG) { System.out.println("SwitchBlockStatements ::= SwitchBlockStatements..."); }  //$NON-NLS-1$
 		    consumeSwitchBlockStatements() ;  
 			break;
-
- case 120 : if (DEBUG) { System.out.println("SwitchBlockStatement ::= SwitchLabels BlockStatements"); }  //$NON-NLS-1$
+
+ case 120 : if (DEBUG) { System.out.println("SwitchBlockStatement ::= SwitchLabels BlockStatements"); }  //$NON-NLS-1$
 		    consumeSwitchBlockStatement() ;  
 			break;
-
- case 122 : if (DEBUG) { System.out.println("SwitchLabels ::= SwitchLabels SwitchLabel"); }  //$NON-NLS-1$
+
+ case 122 : if (DEBUG) { System.out.println("SwitchLabels ::= SwitchLabels SwitchLabel"); }  //$NON-NLS-1$
 		    consumeSwitchLabels() ;  
 			break;
-
-  case 123 : if (DEBUG) { System.out.println("SwitchLabel ::= case ConstantExpression COLON"); }  //$NON-NLS-1$
+
+  case 123 : if (DEBUG) { System.out.println("SwitchLabel ::= case ConstantExpression COLON"); }  //$NON-NLS-1$
 		    consumeCaseLabel();  
 			break;
-
-  case 124 : if (DEBUG) { System.out.println("SwitchLabel ::= default COLON"); }  //$NON-NLS-1$
+
+  case 124 : if (DEBUG) { System.out.println("SwitchLabel ::= default COLON"); }  //$NON-NLS-1$
 		    consumeDefaultLabel();  
 			break;
-
- case 125 : if (DEBUG) { System.out.println("WhileStatement ::= while LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
+
+ case 125 : if (DEBUG) { System.out.println("WhileStatement ::= while LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
 		    consumeStatementWhile() ;  
 			break;
-
- case 126 : if (DEBUG) { System.out.println("WhileStatementNoShortIf ::= while LPAREN Expression..."); }  //$NON-NLS-1$
+
+ case 126 : if (DEBUG) { System.out.println("WhileStatementNoShortIf ::= while LPAREN Expression..."); }  //$NON-NLS-1$
 		    consumeStatementWhile() ;  
 			break;
-
- case 127 : if (DEBUG) { System.out.println("WithStatement ::= with LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
+
+ case 127 : if (DEBUG) { System.out.println("WithStatement ::= with LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
 		    consumeStatementWith() ;  
 			break;
-
- case 128 : if (DEBUG) { System.out.println("WithStatementNoShortIf ::= with LPAREN Expression RPAREN"); }  //$NON-NLS-1$
+
+ case 128 : if (DEBUG) { System.out.println("WithStatementNoShortIf ::= with LPAREN Expression RPAREN"); }  //$NON-NLS-1$
 		    consumeStatementWith() ;  
 			break;
-
- case 129 : if (DEBUG) { System.out.println("DoStatement ::= do Statement while LPAREN Expression..."); }  //$NON-NLS-1$
+
+ case 129 : if (DEBUG) { System.out.println("DoStatement ::= do Statement while LPAREN Expression..."); }  //$NON-NLS-1$
 		    consumeStatementDo() ;  
 			break;
-
- case 130 : if (DEBUG) { System.out.println("ForStatement ::= for LPAREN ForInitopt SEMICOLON..."); }  //$NON-NLS-1$
+
+ case 130 : if (DEBUG) { System.out.println("ForStatement ::= for LPAREN ForInitopt SEMICOLON..."); }  //$NON-NLS-1$
 		    consumeStatementFor() ;  
 			break;
-
- case 131 : if (DEBUG) { System.out.println("ForStatement ::= for LPAREN ForInInit in Expression..."); }  //$NON-NLS-1$
+
+ case 131 : if (DEBUG) { System.out.println("ForStatement ::= for LPAREN ForInInit in Expression..."); }  //$NON-NLS-1$
 		    consumeStatementForIn() ;  
 			break;
-
- case 132 : if (DEBUG) { System.out.println("ForStatementNoShortIf ::= for LPAREN ForInitopt..."); }  //$NON-NLS-1$
+
+ case 132 : if (DEBUG) { System.out.println("ForStatementNoShortIf ::= for LPAREN ForInitopt..."); }  //$NON-NLS-1$
 		    consumeStatementFor() ;  
 			break;
-
- case 133 : if (DEBUG) { System.out.println("ForStatementNoShortIf ::= for LPAREN ForInInit in..."); }  //$NON-NLS-1$
+
+ case 133 : if (DEBUG) { System.out.println("ForStatementNoShortIf ::= for LPAREN ForInInit in..."); }  //$NON-NLS-1$
 		    consumeStatementForIn() ;  
 			break;
-
- case 134 : if (DEBUG) { System.out.println("ForInInit ::= LeftHandSideExpression"); }  //$NON-NLS-1$
+
+ case 134 : if (DEBUG) { System.out.println("ForInInit ::= LeftHandSideExpression"); }  //$NON-NLS-1$
 		    consumeForInInit() ;  
 			break;
-
- case 136 : if (DEBUG) { System.out.println("ForInit ::= ExpressionNoIn"); }  //$NON-NLS-1$
+
+ case 136 : if (DEBUG) { System.out.println("ForInit ::= ExpressionNoIn"); }  //$NON-NLS-1$
 		    consumeForInit() ;  
 			break;
-
- case 140 : if (DEBUG) { System.out.println("StatementExpressionList ::= StatementExpressionList..."); }  //$NON-NLS-1$
+
+ case 140 : if (DEBUG) { System.out.println("StatementExpressionList ::= StatementExpressionList..."); }  //$NON-NLS-1$
 		    consumeStatementExpressionList() ;  
 			break;
-
- case 141 : if (DEBUG) { System.out.println("BreakStatement ::= break SEMICOLON"); }  //$NON-NLS-1$
+
+ case 141 : if (DEBUG) { System.out.println("BreakStatement ::= break SEMICOLON"); }  //$NON-NLS-1$
 		    consumeStatementBreak() ;  
 			break;
-
- case 142 : if (DEBUG) { System.out.println("BreakStatement ::= break Identifier SEMICOLON"); }  //$NON-NLS-1$
+
+ case 142 : if (DEBUG) { System.out.println("BreakStatement ::= break Identifier SEMICOLON"); }  //$NON-NLS-1$
 		    consumeStatementBreakWithLabel() ;  
 			break;
-
- case 143 : if (DEBUG) { System.out.println("ContinueStatement ::= continue SEMICOLON"); }  //$NON-NLS-1$
+
+ case 143 : if (DEBUG) { System.out.println("ContinueStatement ::= continue SEMICOLON"); }  //$NON-NLS-1$
 		    consumeStatementContinue() ;  
 			break;
-
- case 144 : if (DEBUG) { System.out.println("ContinueStatement ::= continue Identifier SEMICOLON"); }  //$NON-NLS-1$
+
+ case 144 : if (DEBUG) { System.out.println("ContinueStatement ::= continue Identifier SEMICOLON"); }  //$NON-NLS-1$
 		    consumeStatementContinueWithLabel() ;  
 			break;
-
- case 145 : if (DEBUG) { System.out.println("ReturnStatement ::= return Expressionopt SEMICOLON"); }  //$NON-NLS-1$
+
+ case 145 : if (DEBUG) { System.out.println("ReturnStatement ::= return Expressionopt SEMICOLON"); }  //$NON-NLS-1$
 		    consumeStatementReturn() ;  
 			break;
-
- case 146 : if (DEBUG) { System.out.println("ThrowStatement ::= throw Expression SEMICOLON"); }  //$NON-NLS-1$
+
+ case 146 : if (DEBUG) { System.out.println("ThrowStatement ::= throw Expression SEMICOLON"); }  //$NON-NLS-1$
 		    consumeStatementThrow();  
 			break;
-
- case 147 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catches"); }  //$NON-NLS-1$
+
+ case 147 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catches"); }  //$NON-NLS-1$
 		    consumeStatementTry(false);  
 			break;
-
- case 148 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catchesopt Finally"); }  //$NON-NLS-1$
+
+ case 148 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catchesopt Finally"); }  //$NON-NLS-1$
 		    consumeStatementTry(true);  
 			break;
-
- case 150 : if (DEBUG) { System.out.println("ExitTryBlock ::="); }  //$NON-NLS-1$
+
+ case 150 : if (DEBUG) { System.out.println("ExitTryBlock ::="); }  //$NON-NLS-1$
 		    consumeExitTryBlock();  
 			break;
-
- case 152 : if (DEBUG) { System.out.println("Catches ::= Catches CatchClause"); }  //$NON-NLS-1$
+
+ case 152 : if (DEBUG) { System.out.println("Catches ::= Catches CatchClause"); }  //$NON-NLS-1$
 		    consumeCatches();  
 			break;
-
- case 153 : if (DEBUG) { System.out.println("CatchClause ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
+
+ case 153 : if (DEBUG) { System.out.println("CatchClause ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
 		    consumeStatementCatch() ;  
 			break;
-
- case 155 : if (DEBUG) { System.out.println("DebuggerStatement ::= debugger SEMICOLON"); }  //$NON-NLS-1$
+
+ case 155 : if (DEBUG) { System.out.println("DebuggerStatement ::= debugger SEMICOLON"); }  //$NON-NLS-1$
 		    consumeDebuggerStatement() ;  
 			break;
-
- case 156 : if (DEBUG) { System.out.println("PushLPAREN ::= LPAREN"); }  //$NON-NLS-1$
+
+ case 156 : if (DEBUG) { System.out.println("PushLPAREN ::= LPAREN"); }  //$NON-NLS-1$
 		    consumeLeftParen();  
 			break;
-
- case 157 : if (DEBUG) { System.out.println("PushRPAREN ::= RPAREN"); }  //$NON-NLS-1$
+
+ case 157 : if (DEBUG) { System.out.println("PushRPAREN ::= RPAREN"); }  //$NON-NLS-1$
 		    consumeRightParen();  
 			break;
-
- case 162 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= SimpleName"); }  //$NON-NLS-1$
+
+ case 162 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= SimpleName"); }  //$NON-NLS-1$
 		    consumePrimarySimpleName();  
 			break;
-
- case 163 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= this"); }  //$NON-NLS-1$
+
+ case 163 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= this"); }  //$NON-NLS-1$
 		    consumePrimaryNoNewArrayThis();  
 			break;
-
- case 164 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Expression PushRPAREN"); }  //$NON-NLS-1$
+
+ case 164 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Expression PushRPAREN"); }  //$NON-NLS-1$
 		    consumePrimaryNoNewArray();  
 			break;
-
- case 165 : if (DEBUG) { System.out.println("ObjectLiteral ::= LBRACE PushLeftBraceObjectLiteral..."); }  //$NON-NLS-1$
+
+ case 165 : if (DEBUG) { System.out.println("ObjectLiteral ::= LBRACE PushLeftBraceObjectLiteral..."); }  //$NON-NLS-1$
 		    consumeEmptyObjectLiteral();  
 			break;
-
- case 166 : if (DEBUG) { System.out.println("ObjectLiteral ::= LBRACE PushLeftBraceObjectLiteral..."); }  //$NON-NLS-1$
+
+ case 166 : if (DEBUG) { System.out.println("ObjectLiteral ::= LBRACE PushLeftBraceObjectLiteral..."); }  //$NON-NLS-1$
 		    consumeObjectLiteral();  
 			break;
-
- case 167 : if (DEBUG) { System.out.println("ObjectLiteral ::= LBRACE PushLeftBraceObjectLiteral..."); }  //$NON-NLS-1$
+
+ case 167 : if (DEBUG) { System.out.println("ObjectLiteral ::= LBRACE PushLeftBraceObjectLiteral..."); }  //$NON-NLS-1$
 		    consumeObjectLiteral();  
 			break;
-
- case 169 : if (DEBUG) { System.out.println("PropertyNameAndValueList ::= PropertyNameAndValueList..."); }  //$NON-NLS-1$
+
+ case 169 : if (DEBUG) { System.out.println("PropertyNameAndValueList ::= PropertyNameAndValueList..."); }  //$NON-NLS-1$
 		    consumePropertyNameAndValueList();  
 			break;
-
- case 170 : if (DEBUG) { System.out.println("PropertyAssignment ::= PropertyName COLON..."); }  //$NON-NLS-1$
+
+ case 170 : if (DEBUG) { System.out.println("PropertyAssignment ::= PropertyName COLON..."); }  //$NON-NLS-1$
 		    consumePropertyAssignment();  
 			break;
-
- case 171 : if (DEBUG) { System.out.println("PropertyAssignment ::= PropertyName PropertyName LPAREN"); }  //$NON-NLS-1$
+
+ case 171 : if (DEBUG) { System.out.println("PropertyAssignment ::= PropertyName PropertyName LPAREN"); }  //$NON-NLS-1$
 		    consumeGetSetPropertyAssignment(false);  
 			break;
-
- case 172 : if (DEBUG) { System.out.println("PropertyAssignment ::= PropertyName PropertyName LPAREN"); }  //$NON-NLS-1$
+
+ case 172 : if (DEBUG) { System.out.println("PropertyAssignment ::= PropertyName PropertyName LPAREN"); }  //$NON-NLS-1$
 		    consumeGetSetPropertyAssignment(true);  
 			break;
-
- case 173 : if (DEBUG) { System.out.println("PropertySetParameterList ::= SimpleName"); }  //$NON-NLS-1$
+
+ case 173 : if (DEBUG) { System.out.println("PropertySetParameterList ::= SimpleName"); }  //$NON-NLS-1$
 		    consumePropertySetParameterList();  
 			break;
-
- case 174 : if (DEBUG) { System.out.println("FunctionBody ::= NestedMethod LBRACE PostDoc..."); }  //$NON-NLS-1$
+
+ case 174 : if (DEBUG) { System.out.println("FunctionBody ::= NestedMethod LBRACE PostDoc..."); }  //$NON-NLS-1$
 		    consumeMethodBody();  
 			break;
-
- case 175 : if (DEBUG) { System.out.println("ProgramElementsopt ::="); }  //$NON-NLS-1$
+
+ case 175 : if (DEBUG) { System.out.println("ProgramElementsopt ::="); }  //$NON-NLS-1$
 		    consumeEmptyProgramElements();  
 			break;
-
- case 177 : if (DEBUG) { System.out.println("PropertyName ::= SimpleName"); }  //$NON-NLS-1$
+
+ case 177 : if (DEBUG) { System.out.println("PropertyName ::= SimpleName"); }  //$NON-NLS-1$
 		    consumePropertyName();  
 			break;
-
- case 181 : if (DEBUG) { System.out.println("ArrayLiteral ::= ArrayLiteralHeader ElisionOpt RBRACKET"); }  //$NON-NLS-1$
+
+ case 181 : if (DEBUG) { System.out.println("ArrayLiteral ::= ArrayLiteralHeader ElisionOpt RBRACKET"); }  //$NON-NLS-1$
 		    consumeArrayLiteral(false);  
 			break;
-
- case 182 : if (DEBUG) { System.out.println("ArrayLiteral ::= ArrayLiteralHeader..."); }  //$NON-NLS-1$
+
+ case 182 : if (DEBUG) { System.out.println("ArrayLiteral ::= ArrayLiteralHeader..."); }  //$NON-NLS-1$
 		    consumeArrayLiteral(false);  
 			break;
-
- case 183 : if (DEBUG) { System.out.println("ArrayLiteral ::= ArrayLiteralHeader..."); }  //$NON-NLS-1$
+
+ case 183 : if (DEBUG) { System.out.println("ArrayLiteral ::= ArrayLiteralHeader..."); }  //$NON-NLS-1$
 		    consumeArrayLiteral(true);  
 			break;
-
- case 184 : if (DEBUG) { System.out.println("ArrayLiteralHeader ::= LBRACKET"); }  //$NON-NLS-1$
+
+ case 184 : if (DEBUG) { System.out.println("ArrayLiteralHeader ::= LBRACKET"); }  //$NON-NLS-1$
 		    consumeArrayLiteralHeader();  
 			break;
-
- case 185 : if (DEBUG) { System.out.println("ElisionOpt ::="); }  //$NON-NLS-1$
+
+ case 185 : if (DEBUG) { System.out.println("ElisionOpt ::="); }  //$NON-NLS-1$
 		    consumeElisionEmpty();  
 			break;
-
- case 187 : if (DEBUG) { System.out.println("Elision ::= COMMA"); }  //$NON-NLS-1$
+
+ case 187 : if (DEBUG) { System.out.println("Elision ::= COMMA"); }  //$NON-NLS-1$
 		    consumeElisionOne();  
 			break;
-
- case 188 : if (DEBUG) { System.out.println("Elision ::= Elision COMMA"); }  //$NON-NLS-1$
+
+ case 188 : if (DEBUG) { System.out.println("Elision ::= Elision COMMA"); }  //$NON-NLS-1$
 		    consumeElisionList();  
 			break;
-
- case 189 : if (DEBUG) { System.out.println("ArrayLiteralElementList ::= ElisionOpt..."); }  //$NON-NLS-1$
+
+ case 189 : if (DEBUG) { System.out.println("ArrayLiteralElementList ::= ElisionOpt..."); }  //$NON-NLS-1$
 		    consumeArrayLiteralListOne();  
 			break;
-
- case 190 : if (DEBUG) { System.out.println("ArrayLiteralElementList ::= ArrayLiteralElementList..."); }  //$NON-NLS-1$
+
+ case 190 : if (DEBUG) { System.out.println("ArrayLiteralElementList ::= ArrayLiteralElementList..."); }  //$NON-NLS-1$
 		    consumeArrayLiteralList();  
 			break;
-
- case 191 : if (DEBUG) { System.out.println("ArrayLiteralElement ::= AssignmentExpression"); }  //$NON-NLS-1$
+
+ case 191 : if (DEBUG) { System.out.println("ArrayLiteralElement ::= AssignmentExpression"); }  //$NON-NLS-1$
 		    consumeArrayLiteralElement();  
 			break;
-
- case 194 : if (DEBUG) { System.out.println("MemberExpression ::= MemberExpression LBRACKET..."); }  //$NON-NLS-1$
+
+ case 194 : if (DEBUG) { System.out.println("MemberExpression ::= MemberExpression LBRACKET..."); }  //$NON-NLS-1$
 		    consumeMemberExpressionWithArrayReference();  
 			break;
-
- case 195 : if (DEBUG) { System.out.println("MemberExpression ::= MemberExpression DOT SimpleName"); }  //$NON-NLS-1$
+
+ case 195 : if (DEBUG) { System.out.println("MemberExpression ::= MemberExpression DOT SimpleName"); }  //$NON-NLS-1$
 		    consumeMemberExpressionWithSimpleName();  
 			break;
-
- case 196 : if (DEBUG) { System.out.println("MemberExpression ::= new MemberExpression Arguments"); }  //$NON-NLS-1$
+
+ case 196 : if (DEBUG) { System.out.println("MemberExpression ::= new MemberExpression Arguments"); }  //$NON-NLS-1$
 		    consumeNewMemberExpressionWithArguments();  
 			break;
-
- case 198 : if (DEBUG) { System.out.println("NewExpression ::= new NewExpression"); }  //$NON-NLS-1$
+
+ case 198 : if (DEBUG) { System.out.println("NewExpression ::= new NewExpression"); }  //$NON-NLS-1$
 		    consumeNewExpression();  
 			break;
-
- case 199 : if (DEBUG) { System.out.println("CallExpression ::= MemberExpression Arguments"); }  //$NON-NLS-1$
+
+ case 199 : if (DEBUG) { System.out.println("CallExpression ::= MemberExpression Arguments"); }  //$NON-NLS-1$
 		    consumeCallExpressionWithArguments();  
 			break;
-
- case 200 : if (DEBUG) { System.out.println("CallExpression ::= CallExpression Arguments"); }  //$NON-NLS-1$
+
+ case 200 : if (DEBUG) { System.out.println("CallExpression ::= CallExpression Arguments"); }  //$NON-NLS-1$
 		    consumeCallExpressionWithArguments();  
 			break;
-
- case 201 : if (DEBUG) { System.out.println("CallExpression ::= CallExpression LBRACKET Expression..."); }  //$NON-NLS-1$
+
+ case 201 : if (DEBUG) { System.out.println("CallExpression ::= CallExpression LBRACKET Expression..."); }  //$NON-NLS-1$
 		    consumeCallExpressionWithArrayReference();  
 			break;
-
- case 202 : if (DEBUG) { System.out.println("CallExpression ::= CallExpression DOT SimpleName"); }  //$NON-NLS-1$
+
+ case 202 : if (DEBUG) { System.out.println("CallExpression ::= CallExpression DOT SimpleName"); }  //$NON-NLS-1$
 		    consumeCallExpressionWithSimpleName();  
 			break;
-
- case 206 : if (DEBUG) { System.out.println("PostfixExpression ::= LeftHandSideExpression PLUS_PLUS"); }  //$NON-NLS-1$
+
+ case 206 : if (DEBUG) { System.out.println("PostfixExpression ::= LeftHandSideExpression PLUS_PLUS"); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.PLUS, true);  
 			break;
-
- case 207 : if (DEBUG) { System.out.println("PostfixExpression ::= LeftHandSideExpression MINUS_MINUS"); }  //$NON-NLS-1$
+
+ case 207 : if (DEBUG) { System.out.println("PostfixExpression ::= LeftHandSideExpression MINUS_MINUS"); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.MINUS, true);  
 			break;
-
- case 209 : if (DEBUG) { System.out.println("ListExpression ::= ListExpression COMMA..."); }  //$NON-NLS-1$
+
+ case 209 : if (DEBUG) { System.out.println("ListExpression ::= ListExpression COMMA..."); }  //$NON-NLS-1$
 		    consumeListExpression();  
 			break;
-
- case 211 : if (DEBUG) { System.out.println("ListExpressionNoIn ::= ListExpressionNoIn COMMA..."); }  //$NON-NLS-1$
+
+ case 211 : if (DEBUG) { System.out.println("ListExpressionNoIn ::= ListExpressionNoIn COMMA..."); }  //$NON-NLS-1$
 		    consumeListExpression();  
 			break;
-
- case 213 : if (DEBUG) { System.out.println("ListExpressionStmt ::= ListExpressionStmt COMMA..."); }  //$NON-NLS-1$
+
+ case 213 : if (DEBUG) { System.out.println("ListExpressionStmt ::= ListExpressionStmt COMMA..."); }  //$NON-NLS-1$
 		    consumeListExpression();  
 			break;
-
- case 215 : if (DEBUG) { System.out.println("ArgumentList ::= ArgumentList COMMA AssignmentExpression"); }  //$NON-NLS-1$
+
+ case 215 : if (DEBUG) { System.out.println("ArgumentList ::= ArgumentList COMMA AssignmentExpression"); }  //$NON-NLS-1$
 		    consumeArgumentList();  
 			break;
-
- case 216 : if (DEBUG) { System.out.println("PushPosition ::="); }  //$NON-NLS-1$
+
+ case 216 : if (DEBUG) { System.out.println("PushPosition ::="); }  //$NON-NLS-1$
 		    consumePushPosition();  
 			break;
-
- case 219 : if (DEBUG) { System.out.println("UnaryExpression ::= PLUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
+
+ case 219 : if (DEBUG) { System.out.println("UnaryExpression ::= PLUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.PLUS);  
 			break;
-
- case 220 : if (DEBUG) { System.out.println("UnaryExpression ::= MINUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
+
+ case 220 : if (DEBUG) { System.out.println("UnaryExpression ::= MINUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.MINUS);  
 			break;
-
- case 222 : if (DEBUG) { System.out.println("PreIncrementExpression ::= PLUS_PLUS PushPosition..."); }  //$NON-NLS-1$
+
+ case 222 : if (DEBUG) { System.out.println("PreIncrementExpression ::= PLUS_PLUS PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.PLUS, false);  
 			break;
-
- case 223 : if (DEBUG) { System.out.println("PreDecrementExpression ::= MINUS_MINUS PushPosition..."); }  //$NON-NLS-1$
+
+ case 223 : if (DEBUG) { System.out.println("PreDecrementExpression ::= MINUS_MINUS PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.MINUS, false);  
 			break;
-
- case 225 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= TWIDDLE PushPosition..."); }  //$NON-NLS-1$
+
+ case 225 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= TWIDDLE PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.TWIDDLE);  
 			break;
-
- case 226 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= NOT PushPosition..."); }  //$NON-NLS-1$
+
+ case 226 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= NOT PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.NOT);  
 			break;
-
- case 227 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= delete PushPosition..."); }  //$NON-NLS-1$
+
+ case 227 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= delete PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.DELETE);  
 			break;
-
- case 228 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= void PushPosition..."); }  //$NON-NLS-1$
+
+ case 228 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= void PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.VOID);  
 			break;
-
- case 229 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= typeof PushPosition..."); }  //$NON-NLS-1$
+
+ case 229 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= typeof PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.TYPEOF);  
 			break;
-
- case 231 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
+
+ case 231 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.MULTIPLY);  
 			break;
-
- case 232 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
+
+ case 232 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.DIVIDE);  
 			break;
-
- case 233 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
+
+ case 233 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.REMAINDER);  
 			break;
-
- case 235 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression PLUS..."); }  //$NON-NLS-1$
+
+ case 235 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression PLUS..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.PLUS);  
 			break;
-
- case 236 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression MINUS..."); }  //$NON-NLS-1$
+
+ case 236 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression MINUS..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.MINUS);  
 			break;
-
- case 238 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression LEFT_SHIFT..."); }  //$NON-NLS-1$
+
+ case 238 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression LEFT_SHIFT..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.LEFT_SHIFT);  
 			break;
-
- case 239 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression RIGHT_SHIFT..."); }  //$NON-NLS-1$
+
+ case 239 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression RIGHT_SHIFT..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.RIGHT_SHIFT);  
 			break;
-
- case 240 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
+
+ case 240 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.UNSIGNED_RIGHT_SHIFT);  
 			break;
-
- case 242 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS..."); }  //$NON-NLS-1$
+
+ case 242 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.LESS);  
 			break;
-
- case 243 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression GREATER..."); }  //$NON-NLS-1$
+
+ case 243 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression GREATER..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.GREATER);  
 			break;
-
- case 244 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS_EQUAL"); }  //$NON-NLS-1$
+
+ case 244 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS_EQUAL"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.LESS_EQUAL);  
 			break;
-
- case 245 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression..."); }  //$NON-NLS-1$
+
+ case 245 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.GREATER_EQUAL);  
 			break;
-
- case 246 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression instanceof"); }  //$NON-NLS-1$
+
+ case 246 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression instanceof"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.INSTANCEOF);  
 			break;
-
- case 247 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression in..."); }  //$NON-NLS-1$
+
+ case 247 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression in..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.IN);  
 			break;
-
- case 249 : if (DEBUG) { System.out.println("RelationalExpressionNoIn ::= RelationalExpressionNoIn..."); }  //$NON-NLS-1$
+
+ case 249 : if (DEBUG) { System.out.println("RelationalExpressionNoIn ::= RelationalExpressionNoIn..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.LESS);  
 			break;
-
- case 250 : if (DEBUG) { System.out.println("RelationalExpressionNoIn ::= RelationalExpressionNoIn..."); }  //$NON-NLS-1$
+
+ case 250 : if (DEBUG) { System.out.println("RelationalExpressionNoIn ::= RelationalExpressionNoIn..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.GREATER);  
 			break;
-
- case 251 : if (DEBUG) { System.out.println("RelationalExpressionNoIn ::= RelationalExpressionNoIn..."); }  //$NON-NLS-1$
+
+ case 251 : if (DEBUG) { System.out.println("RelationalExpressionNoIn ::= RelationalExpressionNoIn..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.LESS_EQUAL);  
 			break;
-
- case 252 : if (DEBUG) { System.out.println("RelationalExpressionNoIn ::= RelationalExpressionNoIn..."); }  //$NON-NLS-1$
+
+ case 252 : if (DEBUG) { System.out.println("RelationalExpressionNoIn ::= RelationalExpressionNoIn..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.GREATER_EQUAL);  
 			break;
-
- case 253 : if (DEBUG) { System.out.println("RelationalExpressionNoIn ::= RelationalExpressionNoIn..."); }  //$NON-NLS-1$
+
+ case 253 : if (DEBUG) { System.out.println("RelationalExpressionNoIn ::= RelationalExpressionNoIn..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.INSTANCEOF);  
 			break;
-
- case 255 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression EQUAL_EQUAL..."); }  //$NON-NLS-1$
+
+ case 255 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression EQUAL_EQUAL..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL);  
 			break;
-
- case 256 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression NOT_EQUAL..."); }  //$NON-NLS-1$
+
+ case 256 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression NOT_EQUAL..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.NOT_EQUAL);  
 			break;
-
- case 257 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression..."); }  //$NON-NLS-1$
+
+ case 257 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL_EQUAL);  
 			break;
-
- case 258 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression..."); }  //$NON-NLS-1$
+
+ case 258 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.NOT_EQUAL_EQUAL);  
 			break;
-
- case 260 : if (DEBUG) { System.out.println("EqualityExpressionNoIn ::= EqualityExpressionNoIn..."); }  //$NON-NLS-1$
+
+ case 260 : if (DEBUG) { System.out.println("EqualityExpressionNoIn ::= EqualityExpressionNoIn..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL);  
 			break;
-
- case 261 : if (DEBUG) { System.out.println("EqualityExpressionNoIn ::= EqualityExpressionNoIn..."); }  //$NON-NLS-1$
+
+ case 261 : if (DEBUG) { System.out.println("EqualityExpressionNoIn ::= EqualityExpressionNoIn..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.NOT_EQUAL);  
 			break;
-
- case 262 : if (DEBUG) { System.out.println("EqualityExpressionNoIn ::= EqualityExpressionNoIn..."); }  //$NON-NLS-1$
+
+ case 262 : if (DEBUG) { System.out.println("EqualityExpressionNoIn ::= EqualityExpressionNoIn..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL_EQUAL);  
 			break;
-
- case 263 : if (DEBUG) { System.out.println("EqualityExpressionNoIn ::= EqualityExpressionNoIn..."); }  //$NON-NLS-1$
+
+ case 263 : if (DEBUG) { System.out.println("EqualityExpressionNoIn ::= EqualityExpressionNoIn..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.NOT_EQUAL_EQUAL);  
 			break;
-
- case 265 : if (DEBUG) { System.out.println("AndExpression ::= AndExpression AND EqualityExpression"); }  //$NON-NLS-1$
+
+ case 265 : if (DEBUG) { System.out.println("AndExpression ::= AndExpression AND EqualityExpression"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.AND);  
 			break;
-
- case 267 : if (DEBUG) { System.out.println("AndExpressionNoIn ::= AndExpressionNoIn AND..."); }  //$NON-NLS-1$
+
+ case 267 : if (DEBUG) { System.out.println("AndExpressionNoIn ::= AndExpressionNoIn AND..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.AND);  
 			break;
-
- case 269 : if (DEBUG) { System.out.println("ExclusiveOrExpression ::= ExclusiveOrExpression XOR..."); }  //$NON-NLS-1$
+
+ case 269 : if (DEBUG) { System.out.println("ExclusiveOrExpression ::= ExclusiveOrExpression XOR..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.XOR);  
 			break;
-
- case 271 : if (DEBUG) { System.out.println("ExclusiveOrExpressionNoIn ::= ExclusiveOrExpressionNoIn"); }  //$NON-NLS-1$
+
+ case 271 : if (DEBUG) { System.out.println("ExclusiveOrExpressionNoIn ::= ExclusiveOrExpressionNoIn"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.XOR);  
 			break;
-
- case 273 : if (DEBUG) { System.out.println("InclusiveOrExpression ::= InclusiveOrExpression OR..."); }  //$NON-NLS-1$
+
+ case 273 : if (DEBUG) { System.out.println("InclusiveOrExpression ::= InclusiveOrExpression OR..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.OR);  
 			break;
-
- case 275 : if (DEBUG) { System.out.println("InclusiveOrExpressionNoIn ::= InclusiveOrExpressionNoIn"); }  //$NON-NLS-1$
+
+ case 275 : if (DEBUG) { System.out.println("InclusiveOrExpressionNoIn ::= InclusiveOrExpressionNoIn"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.OR);  
 			break;
-
- case 277 : if (DEBUG) { System.out.println("ConditionalAndExpression ::= ConditionalAndExpression..."); }  //$NON-NLS-1$
+
+ case 277 : if (DEBUG) { System.out.println("ConditionalAndExpression ::= ConditionalAndExpression..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.AND_AND);  
 			break;
-
- case 279 : if (DEBUG) { System.out.println("ConditionalAndExpressionNoIn ::=..."); }  //$NON-NLS-1$
+
+ case 279 : if (DEBUG) { System.out.println("ConditionalAndExpressionNoIn ::=..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.AND_AND);  
 			break;
-
- case 281 : if (DEBUG) { System.out.println("ConditionalOrExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
+
+ case 281 : if (DEBUG) { System.out.println("ConditionalOrExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.OR_OR);  
 			break;
-
- case 283 : if (DEBUG) { System.out.println("ConditionalOrExpressionNoIn ::=..."); }  //$NON-NLS-1$
+
+ case 283 : if (DEBUG) { System.out.println("ConditionalOrExpressionNoIn ::=..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.OR_OR);  
 			break;
-
- case 285 : if (DEBUG) { System.out.println("ConditionalExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
+
+ case 285 : if (DEBUG) { System.out.println("ConditionalExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
 		    consumeConditionalExpression(OperatorIds.QUESTIONCOLON);  
 			break;
-
- case 287 : if (DEBUG) { System.out.println("ConditionalExpressionNoIn ::=..."); }  //$NON-NLS-1$
+
+ case 287 : if (DEBUG) { System.out.println("ConditionalExpressionNoIn ::=..."); }  //$NON-NLS-1$
 		    consumeConditionalExpression(OperatorIds.QUESTIONCOLON);  
 			break;
-
- case 292 : if (DEBUG) { System.out.println("Assignment ::= PostfixExpression AssignmentOperator..."); }  //$NON-NLS-1$
+
+ case 292 : if (DEBUG) { System.out.println("Assignment ::= PostfixExpression AssignmentOperator..."); }  //$NON-NLS-1$
 		    consumeAssignment();  
 			break;
-
- case 293 : if (DEBUG) { System.out.println("AssignmentNoIn ::= PostfixExpression AssignmentOperator"); }  //$NON-NLS-1$
+
+ case 293 : if (DEBUG) { System.out.println("AssignmentNoIn ::= PostfixExpression AssignmentOperator"); }  //$NON-NLS-1$
 		    consumeAssignment();  
 			break;
-
- case 294 : if (DEBUG) { System.out.println("AssignmentOperator ::= EQUAL"); }  //$NON-NLS-1$
+
+ case 294 : if (DEBUG) { System.out.println("AssignmentOperator ::= EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(EQUAL);  
 			break;
-
- case 295 : if (DEBUG) { System.out.println("AssignmentOperator ::= MULTIPLY_EQUAL"); }  //$NON-NLS-1$
+
+ case 295 : if (DEBUG) { System.out.println("AssignmentOperator ::= MULTIPLY_EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(MULTIPLY);  
 			break;
-
- case 296 : if (DEBUG) { System.out.println("AssignmentOperator ::= DIVIDE_EQUAL"); }  //$NON-NLS-1$
+
+ case 296 : if (DEBUG) { System.out.println("AssignmentOperator ::= DIVIDE_EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(DIVIDE);  
 			break;
-
- case 297 : if (DEBUG) { System.out.println("AssignmentOperator ::= REMAINDER_EQUAL"); }  //$NON-NLS-1$
+
+ case 297 : if (DEBUG) { System.out.println("AssignmentOperator ::= REMAINDER_EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(REMAINDER);  
 			break;
-
- case 298 : if (DEBUG) { System.out.println("AssignmentOperator ::= PLUS_EQUAL"); }  //$NON-NLS-1$
+
+ case 298 : if (DEBUG) { System.out.println("AssignmentOperator ::= PLUS_EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(PLUS);  
 			break;
-
- case 299 : if (DEBUG) { System.out.println("AssignmentOperator ::= MINUS_EQUAL"); }  //$NON-NLS-1$
+
+ case 299 : if (DEBUG) { System.out.println("AssignmentOperator ::= MINUS_EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(MINUS);  
 			break;
-
- case 300 : if (DEBUG) { System.out.println("AssignmentOperator ::= LEFT_SHIFT_EQUAL"); }  //$NON-NLS-1$
+
+ case 300 : if (DEBUG) { System.out.println("AssignmentOperator ::= LEFT_SHIFT_EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(LEFT_SHIFT);  
 			break;
-
- case 301 : if (DEBUG) { System.out.println("AssignmentOperator ::= RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
+
+ case 301 : if (DEBUG) { System.out.println("AssignmentOperator ::= RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(RIGHT_SHIFT);  
 			break;
-
- case 302 : if (DEBUG) { System.out.println("AssignmentOperator ::= UNSIGNED_RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
+
+ case 302 : if (DEBUG) { System.out.println("AssignmentOperator ::= UNSIGNED_RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(UNSIGNED_RIGHT_SHIFT);  
 			break;
-
- case 303 : if (DEBUG) { System.out.println("AssignmentOperator ::= AND_EQUAL"); }  //$NON-NLS-1$
+
+ case 303 : if (DEBUG) { System.out.println("AssignmentOperator ::= AND_EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(AND);  
 			break;
-
- case 304 : if (DEBUG) { System.out.println("AssignmentOperator ::= XOR_EQUAL"); }  //$NON-NLS-1$
+
+ case 304 : if (DEBUG) { System.out.println("AssignmentOperator ::= XOR_EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(XOR);  
 			break;
-
- case 305 : if (DEBUG) { System.out.println("AssignmentOperator ::= OR_EQUAL"); }  //$NON-NLS-1$
+
+ case 305 : if (DEBUG) { System.out.println("AssignmentOperator ::= OR_EQUAL"); }  //$NON-NLS-1$
 		    consumeAssignmentOperator(OR);  
 			break;
-
- case 308 : if (DEBUG) { System.out.println("Expressionopt ::="); }  //$NON-NLS-1$
+
+ case 308 : if (DEBUG) { System.out.println("Expressionopt ::="); }  //$NON-NLS-1$
 		    consumeEmptyExpression();  
 			break;
-
- case 314 : if (DEBUG) { System.out.println("PrimaryNoNewArrayStmt ::= SimpleName"); }  //$NON-NLS-1$
+
+ case 314 : if (DEBUG) { System.out.println("PrimaryNoNewArrayStmt ::= SimpleName"); }  //$NON-NLS-1$
 		    consumePrimarySimpleName();  
 			break;
-
- case 315 : if (DEBUG) { System.out.println("PrimaryNoNewArrayStmt ::= this"); }  //$NON-NLS-1$
+
+ case 315 : if (DEBUG) { System.out.println("PrimaryNoNewArrayStmt ::= this"); }  //$NON-NLS-1$
 		    consumePrimaryNoNewArrayThis();  
 			break;
-
- case 316 : if (DEBUG) { System.out.println("PrimaryNoNewArrayStmt ::= PushLPAREN Expression..."); }  //$NON-NLS-1$
+
+ case 316 : if (DEBUG) { System.out.println("PrimaryNoNewArrayStmt ::= PushLPAREN Expression..."); }  //$NON-NLS-1$
 		    consumePrimaryNoNewArray();  
 			break;
-
- case 318 : if (DEBUG) { System.out.println("MemberExpressionStmt ::= MemberExpressionStmt LBRACKET"); }  //$NON-NLS-1$
+
+ case 318 : if (DEBUG) { System.out.println("MemberExpressionStmt ::= MemberExpressionStmt LBRACKET"); }  //$NON-NLS-1$
 		    consumeMemberExpressionWithArrayReference();  
 			break;
-
- case 319 : if (DEBUG) { System.out.println("MemberExpressionStmt ::= MemberExpressionStmt DOT..."); }  //$NON-NLS-1$
+
+ case 319 : if (DEBUG) { System.out.println("MemberExpressionStmt ::= MemberExpressionStmt DOT..."); }  //$NON-NLS-1$
 		    consumeMemberExpressionWithSimpleName();  
 			break;
-
- case 320 : if (DEBUG) { System.out.println("MemberExpressionStmt ::= new MemberExpression Arguments"); }  //$NON-NLS-1$
+
+ case 320 : if (DEBUG) { System.out.println("MemberExpressionStmt ::= new MemberExpression Arguments"); }  //$NON-NLS-1$
 		    consumeNewMemberExpressionWithArguments();  
 			break;
-
- case 322 : if (DEBUG) { System.out.println("NewExpressionStmt ::= new NewExpression"); }  //$NON-NLS-1$
+
+ case 322 : if (DEBUG) { System.out.println("NewExpressionStmt ::= new NewExpression"); }  //$NON-NLS-1$
 		    consumeNewExpression();  
 			break;
-
- case 323 : if (DEBUG) { System.out.println("CallExpressionStmt ::= MemberExpressionStmt Arguments"); }  //$NON-NLS-1$
+
+ case 323 : if (DEBUG) { System.out.println("CallExpressionStmt ::= MemberExpressionStmt Arguments"); }  //$NON-NLS-1$
 		    consumeCallExpressionWithArguments();  
 			break;
-
- case 324 : if (DEBUG) { System.out.println("CallExpressionStmt ::= CallExpressionStmt Arguments"); }  //$NON-NLS-1$
+
+ case 324 : if (DEBUG) { System.out.println("CallExpressionStmt ::= CallExpressionStmt Arguments"); }  //$NON-NLS-1$
 		    consumeCallExpressionWithArguments();  
 			break;
-
- case 325 : if (DEBUG) { System.out.println("CallExpressionStmt ::= CallExpressionStmt LBRACKET..."); }  //$NON-NLS-1$
+
+ case 325 : if (DEBUG) { System.out.println("CallExpressionStmt ::= CallExpressionStmt LBRACKET..."); }  //$NON-NLS-1$
 		    consumeCallExpressionWithArrayReference();  
 			break;
-
- case 326 : if (DEBUG) { System.out.println("CallExpressionStmt ::= CallExpressionStmt DOT SimpleName"); }  //$NON-NLS-1$
+
+ case 326 : if (DEBUG) { System.out.println("CallExpressionStmt ::= CallExpressionStmt DOT SimpleName"); }  //$NON-NLS-1$
 		    consumeCallExpressionWithSimpleName();  
 			break;
-
- case 327 : if (DEBUG) { System.out.println("Arguments ::= LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
+
+ case 327 : if (DEBUG) { System.out.println("Arguments ::= LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
 		    consumeArguments();  
 			break;
-
- case 331 : if (DEBUG) { System.out.println("PostfixExpressionStmt ::= LeftHandSideExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 331 : if (DEBUG) { System.out.println("PostfixExpressionStmt ::= LeftHandSideExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.PLUS, true);  
 			break;
-
- case 332 : if (DEBUG) { System.out.println("PostfixExpressionStmt ::= LeftHandSideExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 332 : if (DEBUG) { System.out.println("PostfixExpressionStmt ::= LeftHandSideExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.MINUS, true);  
 			break;
-
- case 333 : if (DEBUG) { System.out.println("PreIncrementExpressionStmt ::= PLUS_PLUS PushPosition..."); }  //$NON-NLS-1$
+
+ case 333 : if (DEBUG) { System.out.println("PreIncrementExpressionStmt ::= PLUS_PLUS PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.PLUS, false);  
 			break;
-
- case 334 : if (DEBUG) { System.out.println("PreDecrementExpressionStmt ::= MINUS_MINUS PushPosition"); }  //$NON-NLS-1$
+
+ case 334 : if (DEBUG) { System.out.println("PreDecrementExpressionStmt ::= MINUS_MINUS PushPosition"); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.MINUS, false);  
 			break;
-
- case 337 : if (DEBUG) { System.out.println("UnaryExpressionStmt ::= PLUS PushPosition..."); }  //$NON-NLS-1$
+
+ case 337 : if (DEBUG) { System.out.println("UnaryExpressionStmt ::= PLUS PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.PLUS);  
 			break;
-
- case 338 : if (DEBUG) { System.out.println("UnaryExpressionStmt ::= MINUS PushPosition..."); }  //$NON-NLS-1$
+
+ case 338 : if (DEBUG) { System.out.println("UnaryExpressionStmt ::= MINUS PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.MINUS);  
 			break;
-
- case 341 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinusStmt ::= TWIDDLE PushPosition"); }  //$NON-NLS-1$
+
+ case 341 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinusStmt ::= TWIDDLE PushPosition"); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.TWIDDLE);  
 			break;
-
- case 342 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinusStmt ::= NOT PushPosition..."); }  //$NON-NLS-1$
+
+ case 342 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinusStmt ::= NOT PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.NOT);  
 			break;
-
- case 343 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinusStmt ::= delete PushPosition"); }  //$NON-NLS-1$
+
+ case 343 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinusStmt ::= delete PushPosition"); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.DELETE);  
 			break;
-
- case 344 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinusStmt ::= void PushPosition..."); }  //$NON-NLS-1$
+
+ case 344 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinusStmt ::= void PushPosition..."); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.VOID);  
 			break;
-
- case 345 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinusStmt ::= typeof PushPosition"); }  //$NON-NLS-1$
+
+ case 345 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinusStmt ::= typeof PushPosition"); }  //$NON-NLS-1$
 		    consumeUnaryExpression(OperatorIds.TYPEOF);  
 			break;
-
- case 347 : if (DEBUG) { System.out.println("MultiplicativeExpressionStmt ::=..."); }  //$NON-NLS-1$
+
+ case 347 : if (DEBUG) { System.out.println("MultiplicativeExpressionStmt ::=..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.MULTIPLY);  
 			break;
-
- case 348 : if (DEBUG) { System.out.println("MultiplicativeExpressionStmt ::=..."); }  //$NON-NLS-1$
+
+ case 348 : if (DEBUG) { System.out.println("MultiplicativeExpressionStmt ::=..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.DIVIDE);  
 			break;
-
- case 349 : if (DEBUG) { System.out.println("MultiplicativeExpressionStmt ::=..."); }  //$NON-NLS-1$
+
+ case 349 : if (DEBUG) { System.out.println("MultiplicativeExpressionStmt ::=..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.REMAINDER);  
 			break;
-
- case 351 : if (DEBUG) { System.out.println("AdditiveExpressionStmt ::= AdditiveExpressionStmt PLUS"); }  //$NON-NLS-1$
+
+ case 351 : if (DEBUG) { System.out.println("AdditiveExpressionStmt ::= AdditiveExpressionStmt PLUS"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.PLUS);  
 			break;
-
- case 352 : if (DEBUG) { System.out.println("AdditiveExpressionStmt ::= AdditiveExpressionStmt MINUS"); }  //$NON-NLS-1$
+
+ case 352 : if (DEBUG) { System.out.println("AdditiveExpressionStmt ::= AdditiveExpressionStmt MINUS"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.MINUS);  
 			break;
-
- case 354 : if (DEBUG) { System.out.println("ShiftExpressionStmt ::= ShiftExpressionStmt LEFT_SHIFT"); }  //$NON-NLS-1$
+
+ case 354 : if (DEBUG) { System.out.println("ShiftExpressionStmt ::= ShiftExpressionStmt LEFT_SHIFT"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.LEFT_SHIFT);  
 			break;
-
- case 355 : if (DEBUG) { System.out.println("ShiftExpressionStmt ::= ShiftExpressionStmt RIGHT_SHIFT"); }  //$NON-NLS-1$
+
+ case 355 : if (DEBUG) { System.out.println("ShiftExpressionStmt ::= ShiftExpressionStmt RIGHT_SHIFT"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.RIGHT_SHIFT);  
 			break;
-
- case 356 : if (DEBUG) { System.out.println("ShiftExpressionStmt ::= ShiftExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 356 : if (DEBUG) { System.out.println("ShiftExpressionStmt ::= ShiftExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.UNSIGNED_RIGHT_SHIFT);  
 			break;
-
- case 358 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 358 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.LESS);  
 			break;
-
- case 359 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 359 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.GREATER);  
 			break;
-
- case 360 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 360 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.LESS_EQUAL);  
 			break;
-
- case 361 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 361 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.GREATER_EQUAL);  
 			break;
-
- case 362 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 362 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.INSTANCEOF);  
 			break;
-
- case 363 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt in"); }  //$NON-NLS-1$
+
+ case 363 : if (DEBUG) { System.out.println("RelationalExpressionStmt ::= RelationalExpressionStmt in"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.IN);  
 			break;
-
- case 365 : if (DEBUG) { System.out.println("EqualityExpressionStmt ::= EqualityExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 365 : if (DEBUG) { System.out.println("EqualityExpressionStmt ::= EqualityExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL);  
 			break;
-
- case 366 : if (DEBUG) { System.out.println("EqualityExpressionStmt ::= EqualityExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 366 : if (DEBUG) { System.out.println("EqualityExpressionStmt ::= EqualityExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.NOT_EQUAL);  
 			break;
-
- case 367 : if (DEBUG) { System.out.println("EqualityExpressionStmt ::= EqualityExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 367 : if (DEBUG) { System.out.println("EqualityExpressionStmt ::= EqualityExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL_EQUAL);  
 			break;
-
- case 368 : if (DEBUG) { System.out.println("EqualityExpressionStmt ::= EqualityExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 368 : if (DEBUG) { System.out.println("EqualityExpressionStmt ::= EqualityExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeEqualityExpression(OperatorIds.NOT_EQUAL_EQUAL);  
 			break;
-
- case 370 : if (DEBUG) { System.out.println("AndExpressionStmt ::= AndExpressionStmt AND..."); }  //$NON-NLS-1$
+
+ case 370 : if (DEBUG) { System.out.println("AndExpressionStmt ::= AndExpressionStmt AND..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.AND);  
 			break;
-
- case 372 : if (DEBUG) { System.out.println("ExclusiveOrExpressionStmt ::= ExclusiveOrExpressionStmt"); }  //$NON-NLS-1$
+
+ case 372 : if (DEBUG) { System.out.println("ExclusiveOrExpressionStmt ::= ExclusiveOrExpressionStmt"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.XOR);  
 			break;
-
- case 374 : if (DEBUG) { System.out.println("InclusiveOrExpressionStmt ::= InclusiveOrExpressionStmt"); }  //$NON-NLS-1$
+
+ case 374 : if (DEBUG) { System.out.println("InclusiveOrExpressionStmt ::= InclusiveOrExpressionStmt"); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.OR);  
 			break;
-
- case 376 : if (DEBUG) { System.out.println("ConditionalAndExpressionStmt ::=..."); }  //$NON-NLS-1$
+
+ case 376 : if (DEBUG) { System.out.println("ConditionalAndExpressionStmt ::=..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.AND_AND);  
 			break;
-
- case 378 : if (DEBUG) { System.out.println("ConditionalOrExpressionStmt ::=..."); }  //$NON-NLS-1$
+
+ case 378 : if (DEBUG) { System.out.println("ConditionalOrExpressionStmt ::=..."); }  //$NON-NLS-1$
 		    consumeBinaryExpression(OperatorIds.OR_OR);  
 			break;
-
- case 380 : if (DEBUG) { System.out.println("ConditionalExpressionStmt ::=..."); }  //$NON-NLS-1$
+
+ case 380 : if (DEBUG) { System.out.println("ConditionalExpressionStmt ::=..."); }  //$NON-NLS-1$
 		    consumeConditionalExpression(OperatorIds.QUESTIONCOLON) ;  
 			break;
-
- case 383 : if (DEBUG) { System.out.println("AssignmentStmt ::= PostfixExpressionStmt..."); }  //$NON-NLS-1$
+
+ case 383 : if (DEBUG) { System.out.println("AssignmentStmt ::= PostfixExpressionStmt..."); }  //$NON-NLS-1$
 		    consumeAssignment();  
 			break;
-
-  case 384 : if (DEBUG) { System.out.println("Modifiersopt ::="); }  //$NON-NLS-1$
+
+  case 384 : if (DEBUG) { System.out.println("Modifiersopt ::="); }  //$NON-NLS-1$
 		    consumeDefaultModifiers();  
 			break;
-
- case 385 : if (DEBUG) { System.out.println("BlockStatementsopt ::="); }  //$NON-NLS-1$
+
+ case 385 : if (DEBUG) { System.out.println("BlockStatementsopt ::="); }  //$NON-NLS-1$
 		    consumeEmptyBlockStatementsopt();  
 			break;
-
-  case 387 : if (DEBUG) { System.out.println("ArgumentListopt ::="); }  //$NON-NLS-1$
+
+  case 387 : if (DEBUG) { System.out.println("ArgumentListopt ::="); }  //$NON-NLS-1$
 		    consumeEmptyArgumentListopt();  
 			break;
-
- case 389 : if (DEBUG) { System.out.println("FormalParameterListopt ::="); }  //$NON-NLS-1$
+
+ case 389 : if (DEBUG) { System.out.println("FormalParameterListopt ::="); }  //$NON-NLS-1$
 		    consumeFormalParameterListopt();  
 			break;
-
-  case 391 : if (DEBUG) { System.out.println("ForInitopt ::="); }  //$NON-NLS-1$
+
+  case 391 : if (DEBUG) { System.out.println("ForInitopt ::="); }  //$NON-NLS-1$
 		    consumeEmptyForInitopt();  
 			break;
-
-  case 393 : if (DEBUG) { System.out.println("ForUpdateopt ::="); }  //$NON-NLS-1$
+
+  case 393 : if (DEBUG) { System.out.println("ForUpdateopt ::="); }  //$NON-NLS-1$
 		    consumeEmptyForUpdateopt();  
 			break;
-
-  case 395 : if (DEBUG) { System.out.println("Catchesopt ::="); }  //$NON-NLS-1$
+
+  case 395 : if (DEBUG) { System.out.println("Catchesopt ::="); }  //$NON-NLS-1$
 		    consumeEmptyCatchesopt();  
 			break;
-
- case 397 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt function..."); }  //$NON-NLS-1$
+
+ case 397 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt function..."); }  //$NON-NLS-1$
 		    consumeRecoveryMethodHeaderName();  
 			break;
-
- case 398 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
+
+ case 398 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
 		    consumeMethodHeader();  
 			break;
-
+
 	}
 }
 
@@ -6786,7 +6786,7 @@ public void recoveryTokenCheck() {
 }
 
 protected boolean shouldInsertSemicolon(int prevpos, int prevtoken) {
-	Integer position = new Integer(prevpos);
+	Integer position = Integer.valueOf(prevpos);
 	if (this.errorAction.contains(position)) {
 		// should not insert a semi-colon at a location that has already be tried
 		return false;
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/JavaProject.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/JavaProject.java
index 04e4044c4..5f43daa05 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/JavaProject.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/JavaProject.java
@@ -903,13 +903,13 @@ public class JavaProject
 				},
 				new Object[] {
 					status.getMessage(),
-					new Integer(severity),
+					Integer.valueOf(severity),
 					Messages.classpath_buildPath,
 					isCycleProblem ? "true" : "false",//$NON-NLS-1$ //$NON-NLS-2$
 					isClasspathFileFormatProblem ? "true" : "false",//$NON-NLS-1$ //$NON-NLS-2$
-					new Integer(status.getCode()),
+					Integer.valueOf(status.getCode()),
 					Util.getProblemArgumentsForMarker(arguments) ,
-					new Integer(CategorizedProblem.CAT_BUILDPATH),
+					Integer.valueOf(CategorizedProblem.CAT_BUILDPATH),
 					JavaBuilder.SOURCE_ID,
 				}
 			);
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/Member.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/Member.java
index 326580987..372884a49 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/Member.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/Member.java
@@ -87,7 +87,7 @@ protected static Object convertConstant(Constant constant) {
 		case TypeIds.T_float :
 			return new Float(constant.floatValue());
 		case TypeIds.T_int :
-			return new Integer(constant.intValue());
+			return Integer.valueOf(constant.intValue());
 		case TypeIds.T_long :
 			return new Long(constant.longValue());
 		case TypeIds.T_short :
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SortElementsOperation.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SortElementsOperation.java
index 7a2bc2bb8..6ff1b196a 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SortElementsOperation.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SortElementsOperation.java
@@ -189,7 +189,7 @@ public class SortElementsOperation extends JavaModelOperation {
 				List types = compilationUnit.types();
 				for (Iterator iter = types.iterator(); iter.hasNext();) {
 					AbstractTypeDeclaration typeDeclaration = (AbstractTypeDeclaration) iter.next();
-					typeDeclaration.setProperty(JavaScriptUnitSorter.RELATIVE_ORDER, new Integer(typeDeclaration.getStartPosition()));
+					typeDeclaration.setProperty(JavaScriptUnitSorter.RELATIVE_ORDER, Integer.valueOf(typeDeclaration.getStartPosition()));
 					compilationUnit.setProperty(CONTAINS_MALFORMED_NODES, Boolean.valueOf(isMalformed(typeDeclaration)));
 				}
 				return true;
@@ -199,7 +199,7 @@ public class SortElementsOperation extends JavaModelOperation {
 				List bodyDeclarations = anonymousClassDeclaration.bodyDeclarations();
 				for (Iterator iter = bodyDeclarations.iterator(); iter.hasNext();) {
 					BodyDeclaration bodyDeclaration = (BodyDeclaration) iter.next();
-					bodyDeclaration.setProperty(JavaScriptUnitSorter.RELATIVE_ORDER, new Integer(bodyDeclaration.getStartPosition()));
+					bodyDeclaration.setProperty(JavaScriptUnitSorter.RELATIVE_ORDER, Integer.valueOf(bodyDeclaration.getStartPosition()));
 					anonymousClassDeclaration.setProperty(CONTAINS_MALFORMED_NODES, Boolean.valueOf(isMalformed(bodyDeclaration)));
 				}
 				return true;
@@ -209,7 +209,7 @@ public class SortElementsOperation extends JavaModelOperation {
 				List bodyDeclarations = typeDeclaration.bodyDeclarations();
 				for (Iterator iter = bodyDeclarations.iterator(); iter.hasNext();) {
 					BodyDeclaration bodyDeclaration = (BodyDeclaration) iter.next();
-					bodyDeclaration.setProperty(JavaScriptUnitSorter.RELATIVE_ORDER, new Integer(bodyDeclaration.getStartPosition()));
+					bodyDeclaration.setProperty(JavaScriptUnitSorter.RELATIVE_ORDER, Integer.valueOf(bodyDeclaration.getStartPosition()));
 					typeDeclaration.setProperty(CONTAINS_MALFORMED_NODES, Boolean.valueOf(isMalformed(bodyDeclaration)));
 				}
 				return true;
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SourceField.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SourceField.java
index a7ae0bd36..f38a21950 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SourceField.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SourceField.java
@@ -57,7 +57,7 @@ public Object getConstant() throws JavaScriptModelException {
 	String signature = info.getTypeSignature();
 	try {
 //		if (signature.equals(Signature.SIG_INT)) {
-//			constant = new Integer(constantSource);
+//			constant = Integer.valueOf(constantSource);
 //		} else if (signature.equals(Signature.SIG_SHORT)) {
 //			constant = new Short(constantSource);
 //		} else if (signature.equals(Signature.SIG_BYTE)) {
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SourceMapper.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SourceMapper.java
index c52b1e572..945d5d4da 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SourceMapper.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/SourceMapper.java
@@ -249,7 +249,7 @@ public class SourceMapper
 		}
 		imports[importsCounter++] = name;
 		this.importsTable.put(this.binaryType, imports);
-		this.importsCounterTable.put(this.binaryType, new Integer(importsCounter));
+		this.importsCounterTable.put(this.binaryType, Integer.valueOf(importsCounter));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/AbstractImageBuilder.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/AbstractImageBuilder.java
index 71b8713b2..e205863a6 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/AbstractImageBuilder.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/AbstractImageBuilder.java
@@ -88,11 +88,11 @@ public final static String[] JAVA_TASK_MARKER_ATTRIBUTE_NAMES = {
 	IMarker.USER_EDITABLE,
 	IMarker.SOURCE_ID,
 };
-public final static Integer S_ERROR = new Integer(IMarker.SEVERITY_ERROR);
-public final static Integer S_WARNING = new Integer(IMarker.SEVERITY_WARNING);
-public final static Integer P_HIGH = new Integer(IMarker.PRIORITY_HIGH);
-public final static Integer P_NORMAL = new Integer(IMarker.PRIORITY_NORMAL);
-public final static Integer P_LOW = new Integer(IMarker.PRIORITY_LOW);
+public final static Integer S_ERROR = Integer.valueOf(IMarker.SEVERITY_ERROR);
+public final static Integer S_WARNING = Integer.valueOf(IMarker.SEVERITY_WARNING);
+public final static Integer P_HIGH = Integer.valueOf(IMarker.PRIORITY_HIGH);
+public final static Integer P_NORMAL = Integer.valueOf(IMarker.PRIORITY_NORMAL);
+public final static Integer P_LOW = Integer.valueOf(IMarker.PRIORITY_LOW);
 
 protected AbstractImageBuilder(JavaBuilder javaBuilder, boolean buildStarting, State newState) {
 	// local copies
@@ -307,7 +307,7 @@ protected void createProblemFor(IResource resource, IMember javaElement, String
 		int end = range == null ? 1 : start + range.getLength();
 		marker.setAttributes(
 			new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IMarker.CHAR_START, IMarker.CHAR_END, IMarker.SOURCE_ID},
-			new Object[] {message, new Integer(severity), new Integer(start), new Integer(end), JavaBuilder.SOURCE_ID});
+			new Object[] {message, Integer.valueOf(severity), Integer.valueOf(start), Integer.valueOf(end), JavaBuilder.SOURCE_ID});
 	} catch (CoreException e) {
 		throw internalException(e);
 	}
@@ -549,8 +549,8 @@ protected void storeProblemsFor(SourceFile sourceFile, CategorizedProblem[] prob
 				new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IJavaScriptModelMarker.CATEGORY_ID, IMarker.SOURCE_ID},
 				new Object[] {
 					Messages.bind(Messages.build_incompleteClassPath, missingClassfileName),
-					new Integer(isInvalidClasspathError ? IMarker.SEVERITY_ERROR : IMarker.SEVERITY_WARNING),
-					new Integer(CategorizedProblem.CAT_BUILDPATH),
+					Integer.valueOf(isInvalidClasspathError ? IMarker.SEVERITY_ERROR : IMarker.SEVERITY_WARNING),
+					Integer.valueOf(CategorizedProblem.CAT_BUILDPATH),
 					JavaBuilder.SOURCE_ID
 				}
 			);
@@ -583,12 +583,12 @@ protected void storeProblemsFor(SourceFile sourceFile, CategorizedProblem[] prob
 			int index = 0;
 			allValues[index++] = problem.getMessage(); // message
 			allValues[index++] = problem.isError() ? S_ERROR : S_WARNING; // severity
-			allValues[index++] = new Integer(id); // ID
-			allValues[index++] = new Integer(problem.getSourceStart()); // start
-			allValues[index++] = new Integer(problem.getSourceEnd() + 1); // end
-			allValues[index++] = new Integer(problem.getSourceLineNumber()); // line
+			allValues[index++] = Integer.valueOf(id); // ID
+			allValues[index++] = Integer.valueOf(problem.getSourceStart()); // start
+			allValues[index++] = Integer.valueOf(problem.getSourceEnd() + 1); // end
+			allValues[index++] = Integer.valueOf(problem.getSourceLineNumber()); // line
 			allValues[index++] = Util.getProblemArgumentsForMarker(problem.getArguments()); // arguments
-			allValues[index++] = new Integer(problem.getCategoryID()); // category ID
+			allValues[index++] = Integer.valueOf(problem.getCategoryID()); // category ID
 			// GENERATED_BY attribute for JDT problems
 			if (managedLength > 0)
 				allValues[index++] = JavaBuilder.SOURCE_ID;
@@ -634,10 +634,10 @@ protected void storeTasksFor(SourceFile sourceFile, CategorizedProblem[] tasks)
 			int index = 0;
 			allValues[index++] = task.getMessage();
 			allValues[index++] = priority;
-			allValues[index++] = new Integer(task.getID());
-			allValues[index++] = new Integer(task.getSourceStart());
-			allValues[index++] = new Integer(task.getSourceEnd() + 1);
-			allValues[index++] = new Integer(task.getSourceLineNumber());
+			allValues[index++] = Integer.valueOf(task.getID());
+			allValues[index++] = Integer.valueOf(task.getSourceStart());
+			allValues[index++] = Integer.valueOf(task.getSourceEnd() + 1);
+			allValues[index++] = Integer.valueOf(task.getSourceLineNumber());
 			allValues[index++] = Boolean.FALSE;
 			allValues[index++] = JavaBuilder.SOURCE_ID;
 			// optional extra attributes
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/JavaBuilder.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/JavaBuilder.java
index 5daa39ce9..1ee783add 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/JavaBuilder.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/JavaBuilder.java
@@ -236,8 +236,8 @@ protected IProject[] build(int kind, Map ignored, IProgressMonitor monitor) thro
 			new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IJavaScriptModelMarker.CATEGORY_ID, IMarker.SOURCE_ID},
 			new Object[] {
 				Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage()),
-				new Integer(IMarker.SEVERITY_ERROR),
-				new Integer(CategorizedProblem.CAT_BUILDPATH),
+				Integer.valueOf(IMarker.SEVERITY_ERROR),
+				Integer.valueOf(CategorizedProblem.CAT_BUILDPATH),
 				JavaBuilder.SOURCE_ID
 			}
 		);
@@ -248,8 +248,8 @@ protected IProject[] build(int kind, Map ignored, IProgressMonitor monitor) thro
 			new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IJavaScriptModelMarker.CATEGORY_ID, IMarker.SOURCE_ID},
 			new Object[] {
 				Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage()),
-				new Integer(IMarker.SEVERITY_ERROR),
-				new Integer(CategorizedProblem.CAT_BUILDPATH),
+				Integer.valueOf(IMarker.SEVERITY_ERROR),
+				Integer.valueOf(CategorizedProblem.CAT_BUILDPATH),
 				JavaBuilder.SOURCE_ID
 			}
 		);
@@ -263,7 +263,7 @@ protected IProject[] build(int kind, Map ignored, IProgressMonitor monitor) thro
 			new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IMarker.SOURCE_ID},
 			new Object[] {
 				Messages.bind(Messages.build_missingSourceFile, e.missingSourceFile),
-				new Integer(IMarker.SEVERITY_ERROR),
+				Integer.valueOf(IMarker.SEVERITY_ERROR),
 				JavaBuilder.SOURCE_ID
 			}
 		);
@@ -333,7 +333,7 @@ protected void clean(IProgressMonitor monitor) throws CoreException {
 			new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IMarker.SOURCE_ID},
 			new Object[] {
 				Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage()),
-				new Integer(IMarker.SEVERITY_ERROR),
+				Integer.valueOf(IMarker.SEVERITY_ERROR),
 				JavaBuilder.SOURCE_ID
 			}
 		);
@@ -666,8 +666,8 @@ private boolean isWorthBuilding() throws CoreException {
 			new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IJavaScriptModelMarker.CATEGORY_ID, IMarker.SOURCE_ID},
 			new Object[] {
 				Messages.build_abortDueToClasspathProblems,
-				new Integer(IMarker.SEVERITY_ERROR),
-				new Integer(CategorizedProblem.CAT_BUILDPATH),
+				Integer.valueOf(IMarker.SEVERITY_ERROR),
+				Integer.valueOf(CategorizedProblem.CAT_BUILDPATH),
 				JavaBuilder.SOURCE_ID
 			}
 		);
@@ -709,8 +709,8 @@ private boolean isWorthBuilding() throws CoreException {
 					isClasspathBroken(prereq.getRawIncludepath(), p)
 						? Messages.bind(Messages.build_prereqProjectHasClasspathProblems, p.getName())
 						: Messages.bind(Messages.build_prereqProjectMustBeRebuilt, p.getName()),
-					new Integer(IMarker.SEVERITY_ERROR),
-					new Integer(CategorizedProblem.CAT_BUILDPATH),
+					Integer.valueOf(IMarker.SEVERITY_ERROR),
+					Integer.valueOf(CategorizedProblem.CAT_BUILDPATH),
 					JavaBuilder.SOURCE_ID
 				}
 			);
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/State.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/State.java
index 1bc55b573..885f9584b 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/State.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/State.java
@@ -485,7 +485,7 @@ void write(DataOutputStream out) throws IOException {
 				length--;
 				String key = (String) keyTable[i];
 				out.writeUTF(key);
-				internedTypeLocators.put(key, new Integer(internedTypeLocators.elementSize));
+				internedTypeLocators.put(key, Integer.valueOf(internedTypeLocators.elementSize));
 			}
 		}
 		if (JavaBuilder.DEBUG && length != 0)
@@ -527,11 +527,11 @@ void write(DataOutputStream out) throws IOException {
 			for (int j = 0, m = qNames.length; j < m; j++) {
 				char[][] qName = qNames[j];
 				if (!internedQualifiedNames.containsKey(qName)) { // remember the names have been interned
-					internedQualifiedNames.put(qName, new Integer(internedQualifiedNames.elementSize));
+					internedQualifiedNames.put(qName, Integer.valueOf(internedQualifiedNames.elementSize));
 					for (int k = 0, n = qName.length; k < n; k++) {
 						char[] sName = qName[k];
 						if (!internedSimpleNames.containsKey(sName)) // remember the names have been interned
-							internedSimpleNames.put(sName, new Integer(internedSimpleNames.elementSize));
+							internedSimpleNames.put(sName, Integer.valueOf(internedSimpleNames.elementSize));
 					}
 				}
 			}
@@ -539,7 +539,7 @@ void write(DataOutputStream out) throws IOException {
 			for (int j = 0, m = sNames.length; j < m; j++) {
 				char[] sName = sNames[j];
 				if (!internedSimpleNames.containsKey(sName)) // remember the names have been interned
-					internedSimpleNames.put(sName, new Integer(internedSimpleNames.elementSize));
+					internedSimpleNames.put(sName, Integer.valueOf(internedSimpleNames.elementSize));
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/hierarchy/TypeHierarchy.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/hierarchy/TypeHierarchy.java
index 4eb34dfc3..dd69812ee 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/hierarchy/TypeHierarchy.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/hierarchy/TypeHierarchy.java
@@ -257,7 +257,7 @@ public class TypeHierarchy implements ITypeHierarchy, IElementChangedListener {
 
 	private static Integer bytesToFlags(byte[] bytes) {
 		if (bytes != null && bytes.length > 0) {
-			return new Integer(new String(bytes));
+			return Integer.valueOf(new String(bytes));
 		}
 		else {
 			return null;
@@ -268,7 +268,7 @@ public class TypeHierarchy implements ITypeHierarchy, IElementChangedListener {
 	 * cacheFlags.
 	 */
 	public void cacheFlags(IType type, int flags) {
-		this.typeFlags.put(type, new Integer(flags));
+		this.typeFlags.put(type, Integer.valueOf(flags));
 	}
 
 	/**
@@ -964,11 +964,11 @@ public class TypeHierarchy implements ITypeHierarchy, IElementChangedListener {
 			while ((b = (byte) input.read()) != SEPARATOR1 && b != -1) {
 				bytes = readUntil(input, SEPARATOR3, 1);
 				bytes[0] = b;
-				int subClass = new Integer(new String(bytes)).intValue();
+				int subClass = Integer.valueOf(new String(bytes)).intValue();
 
 				// read super type
 				bytes = readUntil(input, SEPARATOR1);
-				int superClass = new Integer(new String(bytes)).intValue();
+				int superClass = Integer.valueOf(new String(bytes)).intValue();
 
 				typeHierarchy.cacheSuperclass(types[subClass], types[superClass]);
 			}
@@ -1079,7 +1079,7 @@ public class TypeHierarchy implements ITypeHierarchy, IElementChangedListener {
 			int count = 0;
 
 			if (this.focusType != null) {
-				Integer index = new Integer(count++);
+				Integer index = Integer.valueOf(count++);
 				hashtable.put(this.focusType, index);
 				hashtable2.put(index, this.focusType);
 			}
@@ -1088,13 +1088,13 @@ public class TypeHierarchy implements ITypeHierarchy, IElementChangedListener {
 				Map.Entry entry = (Map.Entry) types[i];
 				Object t = entry.getKey();
 				if (hashtable.get(t) == null) {
-					Integer index = new Integer(count++);
+					Integer index = Integer.valueOf(count++);
 					hashtable.put(t, index);
 					hashtable2.put(index, t);
 				}
 				Object superClass = entry.getValue();
 				if (superClass != null && hashtable.get(superClass) == null) {
-					Integer index = new Integer(count++);
+					Integer index = Integer.valueOf(count++);
 					hashtable.put(superClass, index);
 					hashtable2.put(index, superClass);
 				}
@@ -1127,7 +1127,7 @@ public class TypeHierarchy implements ITypeHierarchy, IElementChangedListener {
 
 			// save types
 			for (int i = 0; i < count; i++) {
-				IType t = (IType) hashtable2.get(new Integer(i));
+				IType t = (IType) hashtable2.get(Integer.valueOf(i));
 
 				// n bytes
 				output.write(t.getHandleIdentifier().getBytes());
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/index/DiskIndex.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/index/DiskIndex.java
index 52ecd1f34..04f2a7c63 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/index/DiskIndex.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/index/DiskIndex.java
@@ -267,7 +267,7 @@ private String[] computeDocumentNames(String[] onDiskNames, int[] positions, Sim
 				newDocNames[count++] = (String) added[i];
 		Util.sort(newDocNames);
 		for (int i = 0, l = newDocNames.length; i < l; i++)
-			indexedDocuments.put(newDocNames[i], new Integer(i));
+			indexedDocuments.put(newDocNames[i], Integer.valueOf(i));
 		return newDocNames;
 	}
 
@@ -313,7 +313,7 @@ private String[] computeDocumentNames(String[] onDiskNames, int[] positions, Sim
 		Util.sort(newDocNames);
 		for (int i = 0, l = newDocNames.length; i < l; i++)
 			if (indexedDocuments.containsKey(newDocNames[i]))
-				indexedDocuments.put(newDocNames[i], new Integer(i)); // remember the position for each new document
+				indexedDocuments.put(newDocNames[i], Integer.valueOf(i)); // remember the position for each new document
 	}
 
 	// need to be able to look up an old position (ref# from a ref[]) and map it to its new position
@@ -328,7 +328,7 @@ private String[] computeDocumentNames(String[] onDiskNames, int[] positions, Sim
 			case RE_INDEXED :
 				String newName = newDocNames[++count];
 				if (newName.equals(onDiskNames[i])) {
-					indexedDocuments.put(newName, new Integer(count)); // the reindexed docName that was at position i is now at position count
+					indexedDocuments.put(newName, Integer.valueOf(count)); // the reindexed docName that was at position i is now at position count
 					i++;
 				}
 				break;
@@ -648,7 +648,7 @@ private synchronized HashtableOfObject readCategoryTable(char[] categoryName, bo
 						firstOffset = arrayOffset;
 					matchingWords[count++] = word;
 				}
-				categoryTable.put(word, new Integer(arrayOffset)); // offset to array in the file
+				categoryTable.put(word, Integer.valueOf(arrayOffset)); // offset to array in the file
 			}
 		}
 		this.categoryTables.put(INTERNED_CATEGORY_NAMES.get(categoryName), categoryTable);
@@ -1074,7 +1074,7 @@ private void writeCategoryTable(char[] categoryName, HashtableOfObject wordsToDo
 				o = values[i] = ((IntList) values[i]).asArray();
 			int[] documentNumbers = (int[]) o;
 			if (documentNumbers.length >= largeArraySize) {
-				values[i] = new Integer(this.streamEnd);
+				values[i] = Integer.valueOf(this.streamEnd);
 				writeDocumentNumbers(documentNumbers, stream);
 			}
 		}
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/indexing/IndexManager.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/indexing/IndexManager.java
index c590828cd..3bb0f17d7 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/indexing/IndexManager.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/indexing/IndexManager.java
@@ -76,10 +76,10 @@ public class IndexManager extends JobManager implements IIndexConstants {
 	// key = indexLocation path, value = index state integer
 	private SimpleLookupTable indexStates = null;
 	private File savedIndexNamesFile = new File(getSavedIndexesDirectory(), "savedIndexNames.txt"); //$NON-NLS-1$
-	public static Integer SAVED_STATE = new Integer(0);
-	public static Integer UPDATING_STATE = new Integer(1);
-	public static Integer UNKNOWN_STATE = new Integer(2);
-	public static Integer REBUILDING_STATE = new Integer(3);
+	public static Integer SAVED_STATE = Integer.valueOf(0);
+	public static Integer UPDATING_STATE = Integer.valueOf(1);
+	public static Integer UNKNOWN_STATE = Integer.valueOf(2);
+	public static Integer REBUILDING_STATE = Integer.valueOf(3);
 	private static final String INDEX_FILE_SUFFIX = ".index";
 
 
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/matching/MatchingNodeSet.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/matching/MatchingNodeSet.java
index 05d15637b..606ea4696 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/matching/MatchingNodeSet.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/matching/MatchingNodeSet.java
@@ -31,9 +31,9 @@ public class MatchingNodeSet {
  */
 SimpleLookupTable matchingNodes = new SimpleLookupTable(3); // node -> accuracy
 private HashtableOfLong matchingNodesKeys = new HashtableOfLong(3); // sourceRange -> node
-static Integer EXACT_MATCH = new Integer(SearchMatch.A_ACCURATE);
-static Integer POTENTIAL_MATCH = new Integer(SearchMatch.A_INACCURATE);
-static Integer ERASURE_MATCH = new Integer(SearchPattern.R_ERASURE_MATCH);
+static Integer EXACT_MATCH = Integer.valueOf(SearchMatch.A_ACCURATE);
+static Integer POTENTIAL_MATCH = Integer.valueOf(SearchMatch.A_INACCURATE);
+static Integer ERASURE_MATCH = Integer.valueOf(SearchPattern.R_ERASURE_MATCH);
 
 /**
  * Tell whether locators need to resolve or not for current matching node set.
@@ -58,7 +58,7 @@ public int addMatch(ASTNode node, int matchLevel) {
 	switch (maskedLevel) {
 		case PatternLocator.INACCURATE_MATCH:
 			if (matchLevel != maskedLevel) {
-				addTrustedMatch(node, new Integer(SearchMatch.A_INACCURATE+(matchLevel & PatternLocator.FLAVORS_MASK)));
+				addTrustedMatch(node, Integer.valueOf(SearchMatch.A_INACCURATE+(matchLevel & PatternLocator.FLAVORS_MASK)));
 			} else {
 				addTrustedMatch(node, POTENTIAL_MATCH);
 			}
@@ -68,14 +68,14 @@ public int addMatch(ASTNode node, int matchLevel) {
 			break;
 		case PatternLocator.ERASURE_MATCH:
 			if (matchLevel != maskedLevel) {
-				addTrustedMatch(node, new Integer(SearchPattern.R_ERASURE_MATCH+(matchLevel & PatternLocator.FLAVORS_MASK)));
+				addTrustedMatch(node, Integer.valueOf(SearchPattern.R_ERASURE_MATCH+(matchLevel & PatternLocator.FLAVORS_MASK)));
 			} else {
 				addTrustedMatch(node, ERASURE_MATCH);
 			}
 			break;
 		case PatternLocator.ACCURATE_MATCH:
 			if (matchLevel != maskedLevel) {
-				addTrustedMatch(node, new Integer(SearchMatch.A_ACCURATE+(matchLevel & PatternLocator.FLAVORS_MASK)));
+				addTrustedMatch(node, Integer.valueOf(SearchMatch.A_ACCURATE+(matchLevel & PatternLocator.FLAVORS_MASK)));
 			} else {
 				addTrustedMatch(node, EXACT_MATCH);
 			}
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/formatter/BinaryExpressionFragmentBuilder.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/formatter/BinaryExpressionFragmentBuilder.java
index 691b69c1c..b859c1832 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/formatter/BinaryExpressionFragmentBuilder.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/formatter/BinaryExpressionFragmentBuilder.java
@@ -125,7 +125,7 @@ class BinaryExpressionFragmentBuilder
 			addRealFragment(and_and_Expression);
 		} else {
 			and_and_Expression.left.traverse(this, scope);
-			this.operatorsList.add(new Integer(TerminalTokens.TokenNameAND_AND));
+			this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameAND_AND));
 			and_and_Expression.right.traverse(this, scope);
 		}
 		return false;
@@ -196,56 +196,56 @@ class BinaryExpressionFragmentBuilder
 				case OperatorIds.PLUS :
 					if (buildFragments(binaryExpression)) {
 						binaryExpression.left.traverse(this, scope);
-						this.operatorsList.add(new Integer(TerminalTokens.TokenNamePLUS));
+						this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNamePLUS));
 						binaryExpression.right.traverse(this, scope);
 					}
 					return false;
 				case OperatorIds.MINUS :
 					if (buildFragments(binaryExpression)) {
 						binaryExpression.left.traverse(this, scope);
-						this.operatorsList.add(new Integer(TerminalTokens.TokenNameMINUS));
+						this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameMINUS));
 						binaryExpression.right.traverse(this, scope);
 					}
 					return false;
 				case OperatorIds.MULTIPLY :
 					if (buildFragments(binaryExpression)) {
 						binaryExpression.left.traverse(this, scope);
-						this.operatorsList.add(new Integer(TerminalTokens.TokenNameMULTIPLY));
+						this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameMULTIPLY));
 						binaryExpression.right.traverse(this, scope);
 					}
 					return false;
 				case OperatorIds.REMAINDER :
 					if (buildFragments(binaryExpression)) {
 						binaryExpression.left.traverse(this, scope);
-						this.operatorsList.add(new Integer(TerminalTokens.TokenNameREMAINDER));
+						this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameREMAINDER));
 						binaryExpression.right.traverse(this, scope);
 					}
 					return false;
 				case OperatorIds.XOR :
 					if (buildFragments(binaryExpression)) {
 						binaryExpression.left.traverse(this, scope);
-						this.operatorsList.add(new Integer(TerminalTokens.TokenNameXOR));
+						this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameXOR));
 						binaryExpression.right.traverse(this, scope);
 					}
 					return false;
 				case OperatorIds.DIVIDE :
 					if (buildFragments(binaryExpression)) {
 						binaryExpression.left.traverse(this, scope);
-						this.operatorsList.add(new Integer(TerminalTokens.TokenNameDIVIDE));
+						this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameDIVIDE));
 						binaryExpression.right.traverse(this, scope);
 					}
 					return false;
 				case OperatorIds.OR :
 					if (buildFragments(binaryExpression)) {
 						binaryExpression.left.traverse(this, scope);
-						this.operatorsList.add(new Integer(TerminalTokens.TokenNameOR));
+						this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameOR));
 						binaryExpression.right.traverse(this, scope);
 					}
 					return false;
 				case OperatorIds.AND :
 					if (buildFragments(binaryExpression)) {
 						binaryExpression.left.traverse(this, scope);
-						this.operatorsList.add(new Integer(TerminalTokens.TokenNameAND));
+						this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameAND));
 						binaryExpression.right.traverse(this, scope);
 					}
 					return false;
@@ -260,7 +260,7 @@ class BinaryExpressionFragmentBuilder
 		// keep implementation in sync with BinaryExpression#resolveType
 		if (combinedBinaryExpression.referencesTable == null) {
 			this.addRealFragment(combinedBinaryExpression.left);
-			this.operatorsList.add(new Integer(TerminalTokens.TokenNamePLUS));
+			this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNamePLUS));
 			this.addRealFragment(combinedBinaryExpression.right);
 			return false;
 		}
@@ -271,10 +271,10 @@ class BinaryExpressionFragmentBuilder
 			this.addRealFragment(cursor.left);
 		}
 		for (int i = 0, end = combinedBinaryExpression.arity; i < end; i ++) {
-			this.operatorsList.add(new Integer(TerminalTokens.TokenNamePLUS));
+			this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNamePLUS));
 			this.addRealFragment(combinedBinaryExpression.referencesTable[i].right);
 		}
-		this.operatorsList.add(new Integer(TerminalTokens.TokenNamePLUS));
+		this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNamePLUS));
 		this.addRealFragment(combinedBinaryExpression.right);
 		return false;
 	}
@@ -375,7 +375,7 @@ class BinaryExpressionFragmentBuilder
 			for (int i = 0, max = stringLiteral.counter; i < max; i++) {
 				this.addRealFragment(stringLiteral.literals[i]);
 				if (i < max - 1) {
-					this.operatorsList.add(new Integer(TerminalTokens.TokenNamePLUS));
+					this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNamePLUS));
 				}
 			}
 			return false;
@@ -392,7 +392,7 @@ class BinaryExpressionFragmentBuilder
 			addRealFragment(or_or_Expression);
 		} else {
 			or_or_Expression.left.traverse(this, scope);
-			this.operatorsList.add(new Integer(TerminalTokens.TokenNameOR_OR));
+			this.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameOR_OR));
 			or_or_Expression.right.traverse(this, scope);
 		}
 		return false;
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/formatter/CodeFormatterVisitor.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/formatter/CodeFormatterVisitor.java
index 105fc04af..1619f55c2 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/formatter/CodeFormatterVisitor.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/formatter/CodeFormatterVisitor.java
@@ -195,52 +195,52 @@ public class CodeFormatterVisitor extends ASTVisitor {
 		switch((binaryExpression.bits & ASTNode.OperatorMASK) >> ASTNode.OperatorSHIFT) {
 			case OperatorIds.MULTIPLY :
 				binaryExpression.left.traverse(builder, scope);
-				builder.operatorsList.add(new Integer(TerminalTokens.TokenNameMULTIPLY));
+				builder.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameMULTIPLY));
 				binaryExpression.right.traverse(builder, scope);
 				break;
 			case OperatorIds.PLUS :
 				binaryExpression.left.traverse(builder, scope);
-				builder.operatorsList.add(new Integer(TerminalTokens.TokenNamePLUS));
+				builder.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNamePLUS));
 				binaryExpression.right.traverse(builder, scope);
 				break;
 			case OperatorIds.DIVIDE :
 				binaryExpression.left.traverse(builder, scope);
-				builder.operatorsList.add(new Integer(TerminalTokens.TokenNameDIVIDE));
+				builder.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameDIVIDE));
 				binaryExpression.right.traverse(builder, scope);
 				break;
 			case OperatorIds.REMAINDER :
 				binaryExpression.left.traverse(builder, scope);
-				builder.operatorsList.add(new Integer(TerminalTokens.TokenNameREMAINDER));
+				builder.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameREMAINDER));
 				binaryExpression.right.traverse(builder, scope);
 				break;
 			case OperatorIds.XOR :
 				binaryExpression.left.traverse(builder, scope);
-				builder.operatorsList.add(new Integer(TerminalTokens.TokenNameXOR));
+				builder.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameXOR));
 				binaryExpression.right.traverse(builder, scope);
 				break;
 			case OperatorIds.MINUS :
 				binaryExpression.left.traverse(builder, scope);
-				builder.operatorsList.add(new Integer(TerminalTokens.TokenNameMINUS));
+				builder.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameMINUS));
 				binaryExpression.right.traverse(builder, scope);
 				break;
 			case OperatorIds.OR :
 				binaryExpression.left.traverse(builder, scope);
-				builder.operatorsList.add(new Integer(TerminalTokens.TokenNameOR));
+				builder.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameOR));
 				binaryExpression.right.traverse(builder, scope);
 				break;
 			case OperatorIds.AND :
 				binaryExpression.left.traverse(builder, scope);
-				builder.operatorsList.add(new Integer(TerminalTokens.TokenNameAND));
+				builder.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameAND));
 				binaryExpression.right.traverse(builder, scope);
 				break;
 			case OperatorIds.AND_AND :
 				binaryExpression.left.traverse(builder, scope);
-				builder.operatorsList.add(new Integer(TerminalTokens.TokenNameAND_AND));
+				builder.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameAND_AND));
 				binaryExpression.right.traverse(builder, scope);
 				break;
 			case OperatorIds.OR_OR :
 				binaryExpression.left.traverse(builder, scope);
-				builder.operatorsList.add(new Integer(TerminalTokens.TokenNameOR_OR));
+				builder.operatorsList.add(Integer.valueOf(TerminalTokens.TokenNameOR_OR));
 				binaryExpression.right.traverse(builder, scope);
 				break;
 		}
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/oaametadata/MetadataReader.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/oaametadata/MetadataReader.java
index 575335401..9085c3579 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/oaametadata/MetadataReader.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/oaametadata/MetadataReader.java
@@ -134,66 +134,66 @@ public class MetadataReader extends DefaultHandler implements IOAAMetaDataConsta
 	static final ArrayList EMPTY_LIST=new ArrayList();
 
 	{
-		states.put(TAG_ABOUTME, new Integer(STATE_ABOUTME));
-		states.put(TAG_API, new Integer(STATE_API));
-		states.put(TAG_AUTHOR, new Integer(STATE_AUTHOR));
-		states.put(TAG_AVAILABLE, new Integer(STATE_AVAILABLE));
-		states.put(TAG_CLASS, new Integer(STATE_CLASS));
-		states.put(TAG_CLASSES, new Integer(STATE_CLASSES));
-		states.put(TAG_ENUM, new Integer(STATE_ENUM));
-		states.put(TAG_ENUMS, new Integer(STATE_ENUMS));
-		states.put(TAG_EXAMPLE, new Integer(STATE_EXAMPLE));
-		states.put(TAG_EXAMPLES, new Integer(STATE_EXAMPLES));
-		states.put(TAG_GLOBALS, new Integer(STATE_GLOBALS));
-		states.put(TAG_METHOD, new Integer(STATE_METHOD));
-		states.put(TAG_PROPERTY, new Integer(STATE_PROPERTY));
-		states.put(TAG_PROPERTIES, new Integer(STATE_PROPERTIES));
-		states.put(TAG_ALIAS, new Integer(STATE_ALIAS));
-		states.put(TAG_ALIASES, new Integer(STATE_ALAISES));
-		states.put(TAG_ANCESTORS, new Integer(STATE_ANCESTORS));
-		states.put(TAG_ANCESTOR, new Integer(STATE_ANCESTOR));
-		states.put(TAG_AUTHORS, new Integer(STATE_AUTHORS));
-		states.put(TAG_AUTHOR, new Integer(STATE_AUTHOR));
-		states.put(TAG_CONSTRUCTORS, new Integer(STATE_CONSTRUCTORS));
-		states.put(TAG_CONSTRUCTOR, new Integer(STATE_CONSTRUCTOR));
-
-
-		states.put(TAG_DEPRECIATED, new Integer(STATE_DEPRECIATED));
-		states.put(TAG_DESCRIPTION, new Integer(STATE_DESCRIPTION ));
-	    states.put(TAG_ENUM, new Integer(STATE_ENUM ));
-	    states.put(TAG_EVENT, new Integer(STATE_EVENT ));
-	    states.put(TAG_EVENTS, new Integer(STATE_EVENTS));
-	    states.put(TAG_EXAMPLE, new Integer(STATE_EXAMPLE ));
-	    states.put(TAG_EXAMPLES, new Integer(STATE_EXAMPLES ));
-	    states.put(TAG_EXCEPTION, new Integer(STATE_EXCEPTION ));
-	    states.put(TAG_EXCEPTIONS, new Integer(STATE_EXCEPTIONS));
-	    states.put(TAG_FIELD, new Integer(STATE_FIELD ));
-	    states.put(TAG_FIELDS, new Integer(STATE_FIELDS ));
-	    states.put(TAG_INTERFACE, new Integer(STATE_INTERFACE ));
-	    states.put(TAG_INTERFACES, new Integer(STATE_INTERFACES ));
-	    states.put(TAG_LICENSE, new Integer(STATE_LICENSE));
-	    states.put(TAG_METHODS, new Integer(STATE_METHODS ));
-	    states.put(TAG_MIX, new Integer(STATE_MIX ));
-	    states.put(TAG_MIXES, new Integer(STATE_MIXES ));
-	    states.put(TAG_MIXIN, new Integer(STATE_MIXIN));
-		states.put(TAG_MIXINS, new Integer(STATE_MIXINS ));
-		states.put(TAG_NAMESPACE, new Integer(STATE_NAMESPACE ));
-		states.put(TAG_NAMESPACES, new Integer(STATE_NAMESPACES ));
-	    states.put(TAG_OPTION, new Integer(STATE_OPTION ));
-		states.put(TAG_OPTIONS, new Integer(STATE_OPTIONS ));
-	    states.put(TAG_PARAMETER, new Integer(STATE_PARAMETER ));
-	    states.put(TAG_PARAMETERS, new Integer(STATE_PARAMETERS ));
-		states.put(TAG_QOUTE, new Integer(STATE_QOUTE ));
-	    states.put(TAG_REMARKS, new Integer(STATE_REMARKS ));
-	    states.put(TAG_RETURNS, new Integer(STATE_RETURNS ));
-		states.put(TAG_SEEALSO, new Integer(STATE_SEEALSO ));
-		states.put(TAG_TITLE, new Integer(STATE_TITLE));
-		states.put(TAG_TOPIC, new Integer(STATE_TOPIC));
-		states.put(TAG_TOPICS, new Integer(STATE_TOPICS ));
-		states.put(TAG_USERAGENT, new Integer(STATE_USERAGENT ));
-		states.put(TAG_USERAGENTS, new Integer(STATE_USERAGENTS ));
-
-		states.put(TAG_INCLUDE, new Integer(STATE_INCLUDE ));
+		states.put(TAG_ABOUTME, Integer.valueOf(STATE_ABOUTME));
+		states.put(TAG_API, Integer.valueOf(STATE_API));
+		states.put(TAG_AUTHOR, Integer.valueOf(STATE_AUTHOR));
+		states.put(TAG_AVAILABLE, Integer.valueOf(STATE_AVAILABLE));
+		states.put(TAG_CLASS, Integer.valueOf(STATE_CLASS));
+		states.put(TAG_CLASSES, Integer.valueOf(STATE_CLASSES));
+		states.put(TAG_ENUM, Integer.valueOf(STATE_ENUM));
+		states.put(TAG_ENUMS, Integer.valueOf(STATE_ENUMS));
+		states.put(TAG_EXAMPLE, Integer.valueOf(STATE_EXAMPLE));
+		states.put(TAG_EXAMPLES, Integer.valueOf(STATE_EXAMPLES));
+		states.put(TAG_GLOBALS, Integer.valueOf(STATE_GLOBALS));
+		states.put(TAG_METHOD, Integer.valueOf(STATE_METHOD));
+		states.put(TAG_PROPERTY, Integer.valueOf(STATE_PROPERTY));
+		states.put(TAG_PROPERTIES, Integer.valueOf(STATE_PROPERTIES));
+		states.put(TAG_ALIAS, Integer.valueOf(STATE_ALIAS));
+		states.put(TAG_ALIASES, Integer.valueOf(STATE_ALAISES));
+		states.put(TAG_ANCESTORS, Integer.valueOf(STATE_ANCESTORS));
+		states.put(TAG_ANCESTOR, Integer.valueOf(STATE_ANCESTOR));
+		states.put(TAG_AUTHORS, Integer.valueOf(STATE_AUTHORS));
+		states.put(TAG_AUTHOR, Integer.valueOf(STATE_AUTHOR));
+		states.put(TAG_CONSTRUCTORS, Integer.valueOf(STATE_CONSTRUCTORS));
+		states.put(TAG_CONSTRUCTOR, Integer.valueOf(STATE_CONSTRUCTOR));
+
+
+		states.put(TAG_DEPRECIATED, Integer.valueOf(STATE_DEPRECIATED));
+		states.put(TAG_DESCRIPTION, Integer.valueOf(STATE_DESCRIPTION ));
+	    states.put(TAG_ENUM, Integer.valueOf(STATE_ENUM ));
+	    states.put(TAG_EVENT, Integer.valueOf(STATE_EVENT ));
+	    states.put(TAG_EVENTS, Integer.valueOf(STATE_EVENTS));
+	    states.put(TAG_EXAMPLE, Integer.valueOf(STATE_EXAMPLE ));
+	    states.put(TAG_EXAMPLES, Integer.valueOf(STATE_EXAMPLES ));
+	    states.put(TAG_EXCEPTION, Integer.valueOf(STATE_EXCEPTION ));
+	    states.put(TAG_EXCEPTIONS, Integer.valueOf(STATE_EXCEPTIONS));
+	    states.put(TAG_FIELD, Integer.valueOf(STATE_FIELD ));
+	    states.put(TAG_FIELDS, Integer.valueOf(STATE_FIELDS ));
+	    states.put(TAG_INTERFACE, Integer.valueOf(STATE_INTERFACE ));
+	    states.put(TAG_INTERFACES, Integer.valueOf(STATE_INTERFACES ));
+	    states.put(TAG_LICENSE, Integer.valueOf(STATE_LICENSE));
+	    states.put(TAG_METHODS, Integer.valueOf(STATE_METHODS ));
+	    states.put(TAG_MIX, Integer.valueOf(STATE_MIX ));
+	    states.put(TAG_MIXES, Integer.valueOf(STATE_MIXES ));
+	    states.put(TAG_MIXIN, Integer.valueOf(STATE_MIXIN));
+		states.put(TAG_MIXINS, Integer.valueOf(STATE_MIXINS ));
+		states.put(TAG_NAMESPACE, Integer.valueOf(STATE_NAMESPACE ));
+		states.put(TAG_NAMESPACES, Integer.valueOf(STATE_NAMESPACES ));
+	    states.put(TAG_OPTION, Integer.valueOf(STATE_OPTION ));
+		states.put(TAG_OPTIONS, Integer.valueOf(STATE_OPTIONS ));
+	    states.put(TAG_PARAMETER, Integer.valueOf(STATE_PARAMETER ));
+	    states.put(TAG_PARAMETERS, Integer.valueOf(STATE_PARAMETERS ));
+		states.put(TAG_QOUTE, Integer.valueOf(STATE_QOUTE ));
+	    states.put(TAG_REMARKS, Integer.valueOf(STATE_REMARKS ));
+	    states.put(TAG_RETURNS, Integer.valueOf(STATE_RETURNS ));
+		states.put(TAG_SEEALSO, Integer.valueOf(STATE_SEEALSO ));
+		states.put(TAG_TITLE, Integer.valueOf(STATE_TITLE));
+		states.put(TAG_TOPIC, Integer.valueOf(STATE_TOPIC));
+		states.put(TAG_TOPICS, Integer.valueOf(STATE_TOPICS ));
+		states.put(TAG_USERAGENT, Integer.valueOf(STATE_USERAGENT ));
+		states.put(TAG_USERAGENTS, Integer.valueOf(STATE_USERAGENTS ));
+
+		states.put(TAG_INCLUDE, Integer.valueOf(STATE_INCLUDE ));
 	
 	}
 	
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/launching/JavaRuntime.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/launching/JavaRuntime.java
index 5b4348aa7..9975ec097 100644
--- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/launching/JavaRuntime.java
+++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/launching/JavaRuntime.java
@@ -1092,11 +1092,11 @@ throw new org.eclipse.wst.jsdt.core.UnimplementedException();
 ////		if (projects == null) {
 ////			projects = new ArrayList();
 ////			fgProjects.set(projects);
-////			count = new Integer(0);
+////			count = Integer.valueOf(0);
 ////		}
 ////		int intCount = count.intValue();
 ////		intCount++;
-////		fgEntryCount.set(new Integer(intCount));
+////		fgEntryCount.set(Integer.valueOf(intCount));
 ////		try {
 ////			for (int i = 0; i < cpes.length; i++) {
 ////				IIncludePathEntry cpe = cpes[i];
@@ -1127,7 +1127,7 @@ throw new org.eclipse.wst.jsdt.core.UnimplementedException();
 ////				fgProjects.set(null);
 ////				fgEntryCount.set(null);
 ////			} else {
-////				fgEntryCount.set(new Integer(intCount));
+////				fgEntryCount.set(Integer.valueOf(intCount));
 ////			}
 ////		}
 ////		// set includepath property
diff --git a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptExceptionBreakpoint.java b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptExceptionBreakpoint.java
index 385d1f8eb..f4781e556 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptExceptionBreakpoint.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptExceptionBreakpoint.java
@@ -66,7 +66,7 @@ public class JavaScriptExceptionBreakpoint extends JavaScriptBreakpoint {
 				// add attributes
 				attributes.put(IBreakpoint.ID, getModelIdentifier());
 				attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(true));
-				Integer nochar = new Integer(-1);
+				Integer nochar = Integer.valueOf(-1);
 				attributes.put(IMarker.CHAR_START, nochar);
 				attributes.put(IMarker.CHAR_END, nochar);
 
diff --git a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptFunctionBreakpoint.java b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptFunctionBreakpoint.java
index e173002a2..4eff58d2a 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptFunctionBreakpoint.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptFunctionBreakpoint.java
@@ -74,8 +74,8 @@ public class JavaScriptFunctionBreakpoint extends JavaScriptLineBreakpoint imple
 				attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(true));
 				attributes.put(FUNCTION_NAME, name);
 				attributes.put(FUNCTION_SIGNAURE, signature);
-				attributes.put(IMarker.CHAR_START, new Integer(charstart));
-				attributes.put(IMarker.CHAR_END, new Integer(charend));
+				attributes.put(IMarker.CHAR_START, Integer.valueOf(charstart));
+				attributes.put(IMarker.CHAR_END, Integer.valueOf(charend));
 				attributes.put(ENTRY, Boolean.valueOf(true));
 
 				ensureMarker().setAttributes(attributes);
diff --git a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptLineBreakpoint.java b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptLineBreakpoint.java
index d8e53cf79..939389563 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptLineBreakpoint.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptLineBreakpoint.java
@@ -74,9 +74,9 @@ public class JavaScriptLineBreakpoint extends JavaScriptBreakpoint implements IJ
 				// add attributes
 				attributes.put(IBreakpoint.ID, getModelIdentifier());
 				attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(true));
-				attributes.put(IMarker.LINE_NUMBER, new Integer(linenumber));
-				attributes.put(IMarker.CHAR_START, new Integer(charstart));
-				attributes.put(IMarker.CHAR_END, new Integer(charend));
+				attributes.put(IMarker.LINE_NUMBER, Integer.valueOf(linenumber));
+				attributes.put(IMarker.CHAR_START, Integer.valueOf(charstart));
+				attributes.put(IMarker.CHAR_END, Integer.valueOf(charend));
 
 				ensureMarker().setAttributes(attributes);
 
diff --git a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptLoadBreakpoint.java b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptLoadBreakpoint.java
index 2dd7d85c5..cdef74eb3 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptLoadBreakpoint.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/breakpoints/JavaScriptLoadBreakpoint.java
@@ -82,8 +82,8 @@ public class JavaScriptLoadBreakpoint extends JavaScriptLineBreakpoint implement
 				// add attributes
 				attributes.put(IBreakpoint.ID, getModelIdentifier());
 				attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(true));
-				attributes.put(IMarker.CHAR_START, new Integer(charstart));
-				attributes.put(IMarker.CHAR_END, new Integer(charend));
+				attributes.put(IMarker.CHAR_START, Integer.valueOf(charstart));
+				attributes.put(IMarker.CHAR_END, Integer.valueOf(charend));
 
 				ensureMarker().setAttributes(attributes);
 
diff --git a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptThread.java b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptThread.java
index 8222d9587..b18130672 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptThread.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptThread.java
@@ -464,7 +464,7 @@ public class JavaScriptThread extends JavaScriptDebugElement implements IJavaScr
 						}
 					}
 					if (!suspended) {
-						IStatus status = new Status(IStatus.ERROR, JavaScriptDebugPlugin.PLUGIN_ID, 100, NLS.bind(ModelMessages.thread_timed_out_trying_to_suspend, new String[] { new Integer(VirtualMachine.DEFAULT_TIMEOUT).toString() }), null);
+						IStatus status = new Status(IStatus.ERROR, JavaScriptDebugPlugin.PLUGIN_ID, 100, NLS.bind(ModelMessages.thread_timed_out_trying_to_suspend, new String[] { Integer.valueOf(VirtualMachine.DEFAULT_TIMEOUT).toString() }), null);
 						JavaScriptDebugPlugin.log(status);
 					}
 					markSuspended();
diff --git a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/TimeoutArgument.java b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/TimeoutArgument.java
index c622e8bab..6ce12510c 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/TimeoutArgument.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/TimeoutArgument.java
@@ -26,7 +26,7 @@ public class TimeoutArgument implements IntegerArgument {
 	/**
 	 * default connecting timeout
 	 */
-	public static final Integer CONNECT_TIMEOUT = new Integer(30000);
+	public static final Integer CONNECT_TIMEOUT = Integer.valueOf(30000);
 	
 	/**
 	 * The timeout
diff --git a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFStackFrame.java b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFStackFrame.java
index e7d676ccb..3c91c393d 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFStackFrame.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFStackFrame.java
@@ -169,7 +169,7 @@ public class CFStackFrame extends CFMirror implements StackFrame {
 	 */
 	public Value evaluate(String expression) {
 		CFRequestPacket request = new CFRequestPacket(Commands.EVALUATE, thread.id());
-		request.setArgument(Attributes.FRAME_INDEX, new Integer(index));
+		request.setArgument(Attributes.FRAME_INDEX, Integer.valueOf(index));
 		request.setArgument(Attributes.EXPRESSION, expression);
 		CFResponsePacket response = crossfire().sendRequest(request);
 		if(response.isSuccess()) {
@@ -293,7 +293,7 @@ public class CFStackFrame extends CFMirror implements StackFrame {
 	 */
 	void allScopes() {
 		CFRequestPacket request = new CFRequestPacket(Commands.SCOPES, thread.id());
-		request.setArgument(Attributes.FRAME_INDEX, new Integer(index));
+		request.setArgument(Attributes.FRAME_INDEX, Integer.valueOf(index));
 		CFResponsePacket response = crossfire().sendRequest(request);
 		if(response.isSuccess()) {
 			List list = (List) response.getBody().get(Attributes.SCOPES);
@@ -311,8 +311,8 @@ public class CFStackFrame extends CFMirror implements StackFrame {
 	 */
 	void scope(int frameindex, int scopeindex) {
 		CFRequestPacket request = new CFRequestPacket(Commands.SCOPES, thread.id());
-		request.setArgument(Attributes.FRAME_INDEX, new Integer(frameindex));
-		request.setArgument(Attributes.SCOPE_INDEXES, Arrays.asList(new Number[] {new Integer(scopeindex)}));
+		request.setArgument(Attributes.FRAME_INDEX, Integer.valueOf(frameindex));
+		request.setArgument(Attributes.SCOPE_INDEXES, Arrays.asList(new Number[] {Integer.valueOf(scopeindex)}));
 		CFResponsePacket response = crossfire().sendRequest(request);
 		if(response.isSuccess()) {
 			if(vars == null) {
diff --git a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFThreadReference.java b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFThreadReference.java
index cb0521899..02585457d 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFThreadReference.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFThreadReference.java
@@ -97,7 +97,7 @@ public class CFThreadReference extends CFMirror implements ThreadReference {
 	public synchronized List frames() {
 		if(frames == null) {
 			CFRequestPacket request = new CFRequestPacket(Commands.BACKTRACE, id);
-			request.setArgument(Attributes.FROM_FRAME, new Integer(0));
+			request.setArgument(Attributes.FROM_FRAME, Integer.valueOf(0));
 			request.setArgument(Attributes.INCLUDE_SCOPES, Boolean.TRUE);
 			CFResponsePacket response = crossfire().sendRequest(request);
 			if(response.isSuccess()) {
diff --git a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFVirtualMachine.java b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFVirtualMachine.java
index 10ff092b7..d2b8731ac 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFVirtualMachine.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFVirtualMachine.java
@@ -109,7 +109,7 @@ public class CFVirtualMachine extends CFMirror implements VirtualMachine {
 					
 					if (url != null) {
 						Map location = new HashMap();
-						location.put(Attributes.LINE, new Integer(breakpoint.getLineNumber()));
+						location.put(Attributes.LINE, Integer.valueOf(breakpoint.getLineNumber()));
 						location.put(Attributes.URL, url);
 						Map attributes = new HashMap();
 						if (breakpoint.isConditionEnabled()) {
@@ -121,7 +121,7 @@ public class CFVirtualMachine extends CFMirror implements VirtualMachine {
 						attributes.put(Attributes.ENABLED, new Boolean(breakpoint.isEnabled()));
 						int hitCount = breakpoint.getHitCount();
 						if (hitCount != -1) {
-							attributes.put(Attributes.HIT_COUNT, new Integer(hitCount));
+							attributes.put(Attributes.HIT_COUNT, Integer.valueOf(hitCount));
 						}
 						Map bpMap = new HashMap();
 						bpMap.put(Attributes.TYPE, Attributes.LINE);
@@ -242,7 +242,7 @@ public class CFVirtualMachine extends CFMirror implements VirtualMachine {
 			CFThreadReference thread = findThread(contextid);
 			if(thread != null) {
 				CFRequestPacket request = new CFRequestPacket(Commands.FRAME, thread.id());
-				request.setArgument(Attributes.INDEX, new Integer(index));
+				request.setArgument(Attributes.INDEX, Integer.valueOf(index));
 				request.setArgument(Attributes.INCLUDE_SCOPES, new Boolean(includescopes));
 				CFResponsePacket response = sendRequest(request);
 				if(response.isSuccess()) {
diff --git a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/request/CFBreakpointRequest.java b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/request/CFBreakpointRequest.java
index dba809e1e..229ac50fe 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/request/CFBreakpointRequest.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/request/CFBreakpointRequest.java
@@ -108,7 +108,7 @@ public class CFBreakpointRequest extends CFThreadEventRequest implements Breakpo
 			Map bp = new HashMap();
 			bp.put(Attributes.TYPE, Attributes.LINE);
 			Map loc = new HashMap();
-			loc.put(Attributes.LINE, new Integer(location.lineNumber()));
+			loc.put(Attributes.LINE, Integer.valueOf(location.lineNumber()));
 			loc.put(Attributes.URL, script.url());
 			bp.put(Attributes.LOCATION, loc);
 			Map attribs = new HashMap();
diff --git a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/CFRequestPacket.java b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/CFRequestPacket.java
index fe122e295..a09c05196 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/CFRequestPacket.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/CFRequestPacket.java
@@ -125,7 +125,7 @@ public class CFRequestPacket extends CFPacket implements Request {
 	 */
 	public Map toJSON() {
 		Map json = super.toJSON();
-		json.put(Attributes.SEQ, new Integer(sequence));
+		json.put(Attributes.SEQ, Integer.valueOf(sequence));
 		json.put(Attributes.COMMAND, command);
 		if(!arguments.isEmpty()) {
 			json.put(Attributes.ARGUMENTS, arguments);
diff --git a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/CFResponsePacket.java b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/CFResponsePacket.java
index 353d978c3..29fe32e2b 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/CFResponsePacket.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/CFResponsePacket.java
@@ -41,14 +41,14 @@ public class CFResponsePacket extends CFPacket implements Response {
 	static final Map failed_attributes;
 	static {
 		failed_attributes = new HashMap();
-		Integer value = new Integer(-1);
+		Integer value = Integer.valueOf(-1);
 		failed_attributes.put(Attributes.SEQ, value);
 		failed_attributes.put(Attributes.TYPE, RESPONSE);
 		failed_attributes.put(Attributes.REQUEST_SEQ, value);
 		failed_attributes.put(Attributes.COMMAND, "failed"); //$NON-NLS-1$
 		Map status = new HashMap();
 		failed_attributes.put(Attributes.STATUS, status);
-		status.put(Attributes.CODE, new Integer(CODE_UNEXPECTED_EXCEPTION));
+		status.put(Attributes.CODE, Integer.valueOf(CODE_UNEXPECTED_EXCEPTION));
 		status.put(Attributes.RUNNING, Boolean.FALSE);
 		status.put(Attributes.MESSAGE, "failed"); //$NON-NLS-1$
 	}
@@ -220,7 +220,7 @@ public class CFResponsePacket extends CFPacket implements Response {
 	 */
 	public Map toJSON() {
 		Map json = super.toJSON();
-		json.put(Attributes.REQUEST_SEQ, new Integer(requestSequence));
+		json.put(Attributes.REQUEST_SEQ, Integer.valueOf(requestSequence));
 		json.put(Attributes.COMMAND, command);
 		if(body != null && body.size() > 0) {
 			json.put(Attributes.BODY, body);
@@ -228,7 +228,7 @@ public class CFResponsePacket extends CFPacket implements Response {
 		Map status = new HashMap();
 		json.put(Attributes.STATUS, status);
 		status.put(Attributes.RUNNING, new Boolean(running));
-		status.put(Attributes.CODE, new Integer(code));
+		status.put(Attributes.CODE, Integer.valueOf(code));
 		if (message != null) {
 			status.put(Attributes.MESSAGE, message);
 		}
diff --git a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/RequestHandler.java b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/RequestHandler.java
index 417c84348..ff50dfbc1 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/RequestHandler.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/RequestHandler.java
@@ -428,7 +428,7 @@ public class RequestHandler {
 		if (number == null) {
 			return null;
 		}
-		return new Integer(number.intValue());
+		return Integer.valueOf(number.intValue());
 	}
 
 	/**
diff --git a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/ScriptSource.java b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/ScriptSource.java
index d201f7fe7..c979b6515 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/ScriptSource.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/ScriptSource.java
@@ -107,7 +107,7 @@ public class ScriptSource {
 			if(line < min) {
 				min = line;
 			}
-			lineNumbers.add(new Integer(line));
+			lineNumbers.add(Integer.valueOf(line));
 		}
 		//dump in the line numbers from the expanded set of functions
 		if(flength > 0) {
@@ -133,7 +133,7 @@ public class ScriptSource {
 						else if(currentLine > end) {
 							end = currentLine;
 						}
-						lineNumbers.add(new Integer(currentLine));
+						lineNumbers.add(Integer.valueOf(currentLine));
 					}
 				}
 				String name = functions[i].getFunctionName();
@@ -157,7 +157,7 @@ public class ScriptSource {
 			}
 			lineNumbers = null;
 		}
-		this.firstLine = new Integer(min);
+		this.firstLine = Integer.valueOf(min);
 	}
 
 	/**
@@ -282,7 +282,7 @@ public class ScriptSource {
 			HashSet lineNumbers = new HashSet();
 			for (int i = 0; i < lines.length; i++) {
 				if(lines[i] != null) {
-					lineNumbers.add(new Integer(i));
+					lineNumbers.add(Integer.valueOf(i));
 				}
 			}
 			result.put(JSONConstants.LINES, (lineNumbers == null ? Collections.EMPTY_SET : lineNumbers));
diff --git a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/StackFrame.java b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/StackFrame.java
index 250df2746..82967c4ea 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/StackFrame.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/StackFrame.java
@@ -96,7 +96,7 @@ public class StackFrame implements DebugFrame {
 	 * @return the frame line number
 	 */
 	public Integer getLineNumber() {
-		return new Integer(lineNumber);
+		return Integer.valueOf(lineNumber);
 	}
 
 	/*
@@ -107,7 +107,7 @@ public class StackFrame implements DebugFrame {
 	public void onDebuggerStatement(Context cx) {
 		initializeHandles();
 		this.lineNumber = 1+lineNumber;
-		contextData.debuggerStatement(script, new Integer(lineNumber));
+		contextData.debuggerStatement(script, Integer.valueOf(lineNumber));
 	}
 
 	/*
@@ -119,7 +119,7 @@ public class StackFrame implements DebugFrame {
 		this.activation = activation;
 		this.thisObj = thisObj;
 		initializeHandles();
-		contextData.pushFrame(this, this.script, new Integer(lineNumber), getFunctionName());
+		contextData.pushFrame(this, this.script, Integer.valueOf(lineNumber), getFunctionName());
 	}
 
 	/*
@@ -154,7 +154,7 @@ public class StackFrame implements DebugFrame {
 			return;
 		initializeHandles();
 		this.lineNumber = lineNumber;
-		Integer line = new Integer(this.lineNumber);
+		Integer line = Integer.valueOf(this.lineNumber);
 		if(this.script.isValid(line, getFunctionName())) {
 			this.contextData.lineChange(this.script, line);
 		}
@@ -258,8 +258,8 @@ public class StackFrame implements DebugFrame {
 		result.put(JSONConstants.CONTEXT_ID, contextData.getId());
 		result.put(JSONConstants.FRAME_ID, id);
 		result.put(JSONConstants.SCRIPT_ID, script.getId());
-		result.put(JSONConstants.LINE, new Integer(lineNumber));
-		result.put(JSONConstants.REF, new Integer(0));
+		result.put(JSONConstants.LINE, Integer.valueOf(lineNumber));
+		result.put(JSONConstants.REF, Integer.valueOf(0));
 		//TODO update this
 		result.put(JSONConstants.SCOPE_NAME, null);
 		return result;
diff --git a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/transport/RhinoRequest.java b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/transport/RhinoRequest.java
index 480d4291e..337c7a9a1 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/transport/RhinoRequest.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/transport/RhinoRequest.java
@@ -107,7 +107,7 @@ public class RhinoRequest extends RhinoPacket implements Request {
 	 */
 	public Map toJSON() {
 		Map json = super.toJSON();
-		json.put(JSONConstants.SEQ, new Integer(sequence));
+		json.put(JSONConstants.SEQ, Integer.valueOf(sequence));
 		json.put(JSONConstants.COMMAND, command);
 		json.put(JSONConstants.ARGUMENTS, arguments);
 		return json;
diff --git a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/transport/RhinoResponse.java b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/transport/RhinoResponse.java
index 9d58a7fbe..e6e0dce55 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/transport/RhinoResponse.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/transport/RhinoResponse.java
@@ -146,7 +146,7 @@ public class RhinoResponse extends RhinoPacket implements Response {
 	 */
 	public Map toJSON() {
 		Map json = super.toJSON();
-		json.put(JSONConstants.REQUEST_SEQ, new Integer(requestSequence));
+		json.put(JSONConstants.REQUEST_SEQ, Integer.valueOf(requestSequence));
 		json.put(JSONConstants.COMMAND, command);
 		json.put(JSONConstants.BODY, body);
 		json.put(JSONConstants.SUCCESS, new Boolean(success));
diff --git a/bundles/org.eclipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ArrayReferenceImpl.java b/bundles/org.eclipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ArrayReferenceImpl.java
index 061e2fd45..ce80be0b8 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ArrayReferenceImpl.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ArrayReferenceImpl.java
@@ -83,7 +83,7 @@ public class ArrayReferenceImpl extends ObjectReferenceImpl implements ArrayRefe
 			}
 			values = new ArrayList(length);
 			for (int i = 0; i < length; i++) {
-				Object value = members.get(new Integer(i));
+				Object value = members.get(Integer.valueOf(i));
 				if (value == null) {
 					value = new UndefinedValueImpl(vm);
 				}
diff --git a/bundles/org.eclipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/request/BreakpointRequestImpl.java b/bundles/org.eclipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/request/BreakpointRequestImpl.java
index 7f11c0e30..8299d51b1 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/request/BreakpointRequestImpl.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/request/BreakpointRequestImpl.java
@@ -125,7 +125,7 @@ public class BreakpointRequestImpl extends EventRequestImpl implements Breakpoin
 				request.getArguments().put(JSONConstants.FUNCTION, this.location.functionName());
 			}
 			else{
-				request.getArguments().put(JSONConstants.LINE, new Integer(this.location.lineNumber()));
+				request.getArguments().put(JSONConstants.LINE, Integer.valueOf(this.location.lineNumber()));
 			}
 			try {
 				RhinoResponse response = this.vm.sendRequest(request);
diff --git a/bundles/org.eclipse.wst.jsdt.debug.transport/src/org/eclipse/wst/jsdt/debug/transport/packet/PacketReceiveManager.java b/bundles/org.eclipse.wst.jsdt.debug.transport/src/org/eclipse/wst/jsdt/debug/transport/packet/PacketReceiveManager.java
index e594bad6c..f07268130 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.transport/src/org/eclipse/wst/jsdt/debug/transport/packet/PacketReceiveManager.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.transport/src/org/eclipse/wst/jsdt/debug/transport/packet/PacketReceiveManager.java
@@ -181,7 +181,7 @@ public final class PacketReceiveManager extends PacketManager {
 		}
 
 		synchronized (this.responsePackets) {
-			this.timedOutPackets.add(new Integer(requestSequence));
+			this.timedOutPackets.add(Integer.valueOf(requestSequence));
 		}
 		throw new TimeoutException("Timed out waiting for packet: " + requestSequence); //$NON-NLS-1$
 	}
@@ -263,7 +263,7 @@ public final class PacketReceiveManager extends PacketManager {
 		}
 		synchronized (this.responsePackets) {
 			if (!this.timedOutPackets.isEmpty()) {
-				Integer requestSeq = new Integer(response.getRequestSequence());
+				Integer requestSeq = Integer.valueOf(response.getRequestSequence());
 				if (this.timedOutPackets.remove(requestSeq)) {
 					return; // already timed out. No need to keep this one
 				}
diff --git a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/ToggleBreakpointAdapter.java b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/ToggleBreakpointAdapter.java
index ab03639c6..640ec214a 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/ToggleBreakpointAdapter.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/ToggleBreakpointAdapter.java
@@ -354,7 +354,7 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTargetExtensio
 						//nothing else we can do
 						attributes.put(IJavaScriptBreakpoint.TYPE_NAME, getTypeName(element));
 						attributes.put(IJavaScriptBreakpoint.SCRIPT_PATH, getScriptPath(element));
-						attributes.put(IMarker.LINE_NUMBER, new Integer(line));
+						attributes.put(IMarker.LINE_NUMBER, Integer.valueOf(line));
 						IJavaScriptFunctionBreakpoint breakpoint = JavaScriptDebugModel.createFunctionBreakpoint(resource, method.getElementName(), method.getSignature(), start, end, attributes, true);
 						breakpoint.setJavaScriptElementHandle(element.getHandleIdentifier());
 						return Status.OK_STATUS;
diff --git a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/details/AbstractDetailPane.java b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/details/AbstractDetailPane.java
index 7354b4d68..a9eb67517 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/details/AbstractDetailPane.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/details/AbstractDetailPane.java
@@ -140,7 +140,7 @@ public abstract class AbstractDetailPane implements IDetailPane3 {
 	 */
 	protected void addAutosaveProperties(int[] autosave) {
 		for (int i = 0; i < autosave.length; i++) {
-			fAutoSaveProperties.add(new Integer(autosave[i]));
+			fAutoSaveProperties.add(Integer.valueOf(autosave[i]));
 		}
 	}
 
@@ -153,7 +153,7 @@ public abstract class AbstractDetailPane implements IDetailPane3 {
 		fEditor.setMnemonics(false);
 		fEditor.addPropertyListener(new IPropertyListener() {
 			public void propertyChanged(Object source, int propId) {
-				if (fAutoSaveProperties.contains(new Integer(propId))) {
+				if (fAutoSaveProperties.contains(Integer.valueOf(propId))) {
 					try {
 						fEditor.doSave();
 						return;
diff --git a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/editors/StandardJavaScriptBreakpointEditor.java b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/editors/StandardJavaScriptBreakpointEditor.java
index a87307ba3..4e1a426bd 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/editors/StandardJavaScriptBreakpointEditor.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/editors/StandardJavaScriptBreakpointEditor.java
@@ -153,7 +153,7 @@ public class StandardJavaScriptBreakpointEditor extends AbstractJavaScriptBreakp
 			enabled = true;
 			int hitCount = breakpoint.getHitCount();
 			if (hitCount > 0) {
-				text = new Integer(hitCount).toString();
+				text = Integer.valueOf(hitCount).toString();
 				hasHitCount = true;
 			}
 			suspendThread= breakpoint.getSuspendPolicy() == IJavaScriptBreakpoint.SUSPEND_THREAD;
diff --git a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/launching/JavaScriptConnectTab.java b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/launching/JavaScriptConnectTab.java
index 2821de653..4e5afa406 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/launching/JavaScriptConnectTab.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/launching/JavaScriptConnectTab.java
@@ -371,7 +371,7 @@ public class JavaScriptConnectTab extends AbstractLaunchConfigurationTab impleme
 										editor.getPreferenceStore().setValue(key, Boolean.valueOf(value).booleanValue());
 									}
 									else if (argument instanceof IntegerArgument) {
-										editor.getPreferenceStore().setValue(key, new Integer(value).intValue());
+										editor.getPreferenceStore().setValue(key, Integer.valueOf(value).intValue());
 									}
 									editor.load();
 								}
@@ -421,7 +421,7 @@ public class JavaScriptConnectTab extends AbstractLaunchConfigurationTab impleme
 					argmap.put(key, Boolean.valueOf(editor.getPreferenceStore().getBoolean(key)).toString());
 				} 
 				else if (argument instanceof IntegerArgument) {
-					argmap.put(key, new Integer(editor.getPreferenceStore().getInt(key)).toString());
+					argmap.put(key, Integer.valueOf(editor.getPreferenceStore().getInt(key)).toString());
 				}
 			}
 			configuration.setAttribute(ILaunchConstants.ARGUMENT_MAP, argmap);
diff --git a/bundles/org.eclipse.wst.jsdt.manipulation/src/org/eclipse/wst/jsdt/core/refactoring/descriptors/MoveDescriptor.java b/bundles/org.eclipse.wst.jsdt.manipulation/src/org/eclipse/wst/jsdt/core/refactoring/descriptors/MoveDescriptor.java
index af4c528c4..cf0ad97c1 100644
--- a/bundles/org.eclipse.wst.jsdt.manipulation/src/org/eclipse/wst/jsdt/core/refactoring/descriptors/MoveDescriptor.java
+++ b/bundles/org.eclipse.wst.jsdt.manipulation/src/org/eclipse/wst/jsdt/core/refactoring/descriptors/MoveDescriptor.java
@@ -144,25 +144,25 @@ public final class MoveDescriptor extends JavaScriptRefactoringDescriptor {
 			fArguments.put(ATTRIBUTE_QUALIFIED, Boolean.toString(fQualified));
 			if (fPatterns != null && !"".equals(fPatterns)) //$NON-NLS-1$
 				fArguments.put(ATTRIBUTE_PATTERNS, fPatterns);
-			fArguments.put(ATTRIBUTE_FILES, new Integer(fFiles.length).toString());
+			fArguments.put(ATTRIBUTE_FILES, Integer.valueOf(fFiles.length).toString());
 			for (int offset= 0; offset < fFiles.length; offset++)
 				fArguments.put(JavaScriptRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + 1), JavaScriptRefactoringDescriptor.resourceToHandle(project, fFiles[offset]));
-			fArguments.put(ATTRIBUTE_FOLDERS, new Integer(fFolders.length).toString());
+			fArguments.put(ATTRIBUTE_FOLDERS, Integer.valueOf(fFolders.length).toString());
 			for (int offset= 0; offset < fFolders.length; offset++)
 				fArguments.put(JavaScriptRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + fFiles.length + 1), JavaScriptRefactoringDescriptor.resourceToHandle(project, fFolders[offset]));
-			fArguments.put(ATTRIBUTE_UNITS, new Integer(fUnits.length).toString());
+			fArguments.put(ATTRIBUTE_UNITS, Integer.valueOf(fUnits.length).toString());
 			for (int offset= 0; offset < fUnits.length; offset++)
 				fArguments.put(JavaScriptRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + fFolders.length + fFiles.length + 1), JavaScriptRefactoringDescriptor.elementToHandle(project, fUnits[offset]));
 		} else if (POLICY_MOVE_ROOTS.equals(fMovePolicy)) {
-			fArguments.put(ATTRIBUTE_ROOTS, new Integer(fRoots.length).toString());
+			fArguments.put(ATTRIBUTE_ROOTS, Integer.valueOf(fRoots.length).toString());
 			for (int offset= 0; offset < fRoots.length; offset++)
 				fArguments.put(JavaScriptRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + 1), JavaScriptRefactoringDescriptor.elementToHandle(project, fRoots[offset]));
 		} else if (POLICY_MOVE_PACKAGES.equals(fMovePolicy)) {
-			fArguments.put(ATTRIBUTE_FRAGMENTS, new Integer(fFragments.length).toString());
+			fArguments.put(ATTRIBUTE_FRAGMENTS, Integer.valueOf(fFragments.length).toString());
 			for (int offset= 0; offset < fFragments.length; offset++)
 				fArguments.put(JavaScriptRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + 1), JavaScriptRefactoringDescriptor.elementToHandle(project, fFragments[offset]));
 		} else if (POLICY_MOVE_MEMBERS.equals(fMovePolicy)) {
-			fArguments.put(ATTRIBUTE_MEMBERS, new Integer(fMembers.length).toString());
+			fArguments.put(ATTRIBUTE_MEMBERS, Integer.valueOf(fMembers.length).toString());
 			for (int offset= 0; offset < fMembers.length; offset++)
 				fArguments.put(JavaScriptRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + 1), JavaScriptRefactoringDescriptor.elementToHandle(project, fMembers[offset]));
 		}
diff --git a/bundles/org.eclipse.wst.jsdt.manipulation/src/org/eclipse/wst/jsdt/core/refactoring/descriptors/RenameLocalVariableDescriptor.java b/bundles/org.eclipse.wst.jsdt.manipulation/src/org/eclipse/wst/jsdt/core/refactoring/descriptors/RenameLocalVariableDescriptor.java
index c4492d4c3..eb94d44dc 100644
--- a/bundles/org.eclipse.wst.jsdt.manipulation/src/org/eclipse/wst/jsdt/core/refactoring/descriptors/RenameLocalVariableDescriptor.java
+++ b/bundles/org.eclipse.wst.jsdt.manipulation/src/org/eclipse/wst/jsdt/core/refactoring/descriptors/RenameLocalVariableDescriptor.java
@@ -63,7 +63,7 @@ public final class RenameLocalVariableDescriptor extends JavaScriptRefactoringDe
 		super.populateArgumentMap();
 		fArguments.put(JavaScriptRefactoringDescriptor.ATTRIBUTE_NAME, fName);
 		fArguments.put(JavaScriptRefactoringDescriptor.ATTRIBUTE_INPUT, elementToHandle(getProject(), fUnit));
-		fArguments.put(JavaScriptRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelection.getOffset()).toString() + " " + new Integer(fSelection.getLength()).toString()); //$NON-NLS-1$
+		fArguments.put(JavaScriptRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelection.getOffset()).toString() + " " + Integer.valueOf(fSelection.getLength()).toString()); //$NON-NLS-1$
 		fArguments.put(JavaScriptRefactoringDescriptor.ATTRIBUTE_REFERENCES, Boolean.toString(fReferences));
 	}
 
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/codemanipulation/StubUtility.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/codemanipulation/StubUtility.java
index 4c9913ee2..6197bddba 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/codemanipulation/StubUtility.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/codemanipulation/StubUtility.java
@@ -460,7 +460,7 @@ public class StubUtility {
 				IRegion lineInfo= doc.getLineInformation(line);
 				int offset= lineInfo.getOffset();
 				String str= doc.get(offset, lineInfo.getLength());
-				if (Strings.containsOnlyWhitespaces(str) && nLines > line + 1 && removedLines.add(new Integer(line))) {
+				if (Strings.containsOnlyWhitespaces(str) && nLines > line + 1 && removedLines.add(Integer.valueOf(line))) {
 					int nextStart= doc.getLineOffset(line + 1);
 					edit.addChild(new DeleteEdit(offset, nextStart - offset));
 				}
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/fix/CleanUpRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/fix/CleanUpRefactoring.java
index 430277293..230f9d0a9 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/fix/CleanUpRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/fix/CleanUpRefactoring.java
@@ -168,7 +168,7 @@ public class CleanUpRefactoring extends Refactoring implements IScheduledRefacto
 		
 		public String getSubTaskMessage(IJavaScriptUnit source) {
 			String typeName= source.getElementName();
-			return Messages.format(FixMessages.CleanUpRefactoring_ProcessingCompilationUnit_message, new Object[] {new Integer(getIndex()), new Integer(fSize), typeName});
+			return Messages.format(FixMessages.CleanUpRefactoring_ProcessingCompilationUnit_message, new Object[] {Integer.valueOf(getIndex()), Integer.valueOf(fSize), typeName});
 		}
 	}
 	
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ConvertAnonymousToNestedRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ConvertAnonymousToNestedRefactoring.java
index 2c0db01fd..324d238c0 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ConvertAnonymousToNestedRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ConvertAnonymousToNestedRefactoring.java
@@ -459,10 +459,10 @@ public class ConvertAnonymousToNestedRefactoring extends ScriptableRefactoring {
 		final JDTRefactoringDescriptor descriptor= new JDTRefactoringDescriptor(IJavaScriptRefactorings.CONVERT_ANONYMOUS, projectName, description, comment.asString(), arguments, flags);
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_INPUT, descriptor.elementToHandle(fCu));
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_NAME, fClassName);
-		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelectionStart).toString() + ' ' + new Integer(fSelectionLength).toString());
+		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + ' ' + Integer.valueOf(fSelectionLength).toString());
 		arguments.put(ATTRIBUTE_FINAL, Boolean.valueOf(fDeclareFinal).toString());
 		arguments.put(ATTRIBUTE_STATIC, Boolean.valueOf(fDeclareStatic).toString());
-		arguments.put(ATTRIBUTE_VISIBILITY, new Integer(fVisibility).toString());
+		arguments.put(ATTRIBUTE_VISIBILITY, Integer.valueOf(fVisibility).toString());
 		return new RefactoringChangeDescriptor(descriptor);
 	}
 
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractConstantRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractConstantRefactoring.java
index 74f600763..92089010e 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractConstantRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractConstantRefactoring.java
@@ -546,10 +546,10 @@ public class ExtractConstantRefactoring extends ScriptableRefactoring {
 		final JDTRefactoringDescriptor descriptor= new JDTRefactoringDescriptor(IJavaScriptRefactorings.EXTRACT_CONSTANT, project, description, comment.asString(), arguments, flags);
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_INPUT, descriptor.elementToHandle(fCu));
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_NAME, fConstantName);
-		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelectionStart).toString() + " " + new Integer(fSelectionLength).toString()); //$NON-NLS-1$
+		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + " " + Integer.valueOf(fSelectionLength).toString()); //$NON-NLS-1$
 		arguments.put(ATTRIBUTE_REPLACE, Boolean.valueOf(fReplaceAllOccurrences).toString());
 		arguments.put(ATTRIBUTE_QUALIFY, Boolean.valueOf(fQualifyReferencesWithDeclaringClassName).toString());
-		arguments.put(ATTRIBUTE_VISIBILITY, new Integer(JdtFlags.getVisibilityCode(fVisibility)).toString());
+		arguments.put(ATTRIBUTE_VISIBILITY, Integer.valueOf(JdtFlags.getVisibilityCode(fVisibility)).toString());
 		return new RefactoringDescriptorChange(descriptor, RefactoringCoreMessages.ExtractConstantRefactoring_name, new Change[] { fChange});
 	}
 
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractMethodRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractMethodRefactoring.java
index fe5e40bae..fb904192d 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractMethodRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractMethodRefactoring.java
@@ -460,9 +460,9 @@ public class ExtractMethodRefactoring extends ScriptableRefactoring {
 		final JDTRefactoringDescriptor descriptor= new JDTRefactoringDescriptor(IJavaScriptRefactorings.EXTRACT_METHOD, project, description, comment.asString(), arguments, flags);
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_INPUT, descriptor.elementToHandle(fCUnit));
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_NAME, fMethodName);
-		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelectionStart).toString() + " " + new Integer(fSelectionLength).toString()); //$NON-NLS-1$
-//		arguments.put(ATTRIBUTE_VISIBILITY, new Integer(fVisibility).toString());
-		arguments.put(ATTRIBUTE_DESTINATION, new Integer(fDestinationIndex).toString());
+		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + " " + Integer.valueOf(fSelectionLength).toString()); //$NON-NLS-1$
+//		arguments.put(ATTRIBUTE_VISIBILITY, Integer.valueOf(fVisibility).toString());
+		arguments.put(ATTRIBUTE_DESTINATION, Integer.valueOf(fDestinationIndex).toString());
 //		arguments.put(ATTRIBUTE_EXCEPTIONS, Boolean.valueOf(fThrowRuntimeExceptions).toString());
 		arguments.put(ATTRIBUTE_COMMENTS, Boolean.valueOf(fGenerateJavadoc).toString());
 		arguments.put(ATTRIBUTE_REPLACE, Boolean.valueOf(fReplaceDuplicates).toString());
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractTempRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractTempRefactoring.java
index 2515c6d71..5f7bfd1a7 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractTempRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ExtractTempRefactoring.java
@@ -501,7 +501,7 @@ public class ExtractTempRefactoring extends ScriptableRefactoring {
 		final JDTRefactoringDescriptor descriptor= new JDTRefactoringDescriptor(IJavaScriptRefactorings.EXTRACT_LOCAL_VARIABLE, project, description, comment.asString(), arguments, RefactoringDescriptor.NONE);
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_INPUT, descriptor.elementToHandle(fCu));
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_NAME, fTempName);
-		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelectionStart).toString() + " " + new Integer(fSelectionLength).toString()); //$NON-NLS-1$
+		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + " " + Integer.valueOf(fSelectionLength).toString()); //$NON-NLS-1$
 		arguments.put(ATTRIBUTE_REPLACE, Boolean.valueOf(fReplaceAllOccurrences).toString());
 		arguments.put(ATTRIBUTE_FINAL, Boolean.valueOf(fDeclareFinal).toString());
 		return descriptor;
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/InlineConstantRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/InlineConstantRefactoring.java
index b90ee4146..a0f95d757 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/InlineConstantRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/InlineConstantRefactoring.java
@@ -857,7 +857,7 @@ public class InlineConstantRefactoring extends ScriptableRefactoring {
 				comment.addSetting(RefactoringCoreMessages.InlineConstantRefactoring_replace_references);
 			final JDTRefactoringDescriptor descriptor= new JDTRefactoringDescriptor(IJavaScriptRefactorings.INLINE_CONSTANT, project, description, comment.asString(), arguments, flags);
 			arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_INPUT, descriptor.elementToHandle(fSelectionCu));
-			arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelectionStart).toString() + " " + new Integer(fSelectionLength).toString()); //$NON-NLS-1$
+			arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + " " + Integer.valueOf(fSelectionLength).toString()); //$NON-NLS-1$
 			arguments.put(ATTRIBUTE_REMOVE, Boolean.valueOf(fRemoveDeclaration).toString());
 			arguments.put(ATTRIBUTE_REPLACE, Boolean.valueOf(fReplaceAllReferences).toString());
 			return new DynamicValidationRefactoringChange(descriptor, RefactoringCoreMessages.InlineConstantRefactoring_inline, fChanges);
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/InlineMethodRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/InlineMethodRefactoring.java
index e3db73e7d..d0dd930f8 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/InlineMethodRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/InlineMethodRefactoring.java
@@ -362,9 +362,9 @@ public class InlineMethodRefactoring extends ScriptableRefactoring {
 			comment.addSetting(RefactoringCoreMessages.InlineMethodRefactoring_replace_references);
 		final JDTRefactoringDescriptor descriptor= new JDTRefactoringDescriptor(IJavaScriptRefactorings.INLINE_METHOD, project, description, comment.asString(), arguments, flags);
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_INPUT, descriptor.elementToHandle(fInitialTypeRoot));
-		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelectionStart).toString() + " " + new Integer(fSelectionLength).toString()); //$NON-NLS-1$
+		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + " " + Integer.valueOf(fSelectionLength).toString()); //$NON-NLS-1$
 		arguments.put(ATTRIBUTE_DELETE, Boolean.valueOf(fDeleteSource).toString());
-		arguments.put(ATTRIBUTE_MODE, new Integer(fCurrentMode == Mode.INLINE_ALL ? 1 : 0).toString());
+		arguments.put(ATTRIBUTE_MODE, Integer.valueOf(fCurrentMode == Mode.INLINE_ALL ? 1 : 0).toString());
 		return new DynamicValidationRefactoringChange(descriptor, RefactoringCoreMessages.InlineMethodRefactoring_edit_inlineCall, fChangeManager.getAllChanges());
 	}
 	
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/IntroduceFactoryRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/IntroduceFactoryRefactoring.java
index 04cfd483e..6aac7ff4f 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/IntroduceFactoryRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/IntroduceFactoryRefactoring.java
@@ -987,7 +987,7 @@ public class IntroduceFactoryRefactoring extends ScriptableRefactoring {
 			arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_INPUT, descriptor.elementToHandle(fCUHandle));
 			arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_NAME, fNewMethodName);
 			arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + 1, descriptor.elementToHandle(binding.getJavaElement()));
-			arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelectionStart).toString() + " " + new Integer(fSelectionLength).toString()); //$NON-NLS-1$
+			arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + " " + Integer.valueOf(fSelectionLength).toString()); //$NON-NLS-1$
 			arguments.put(ATTRIBUTE_PROTECT, Boolean.valueOf(fProtectConstructor).toString());
 			final DynamicValidationStateChange result= new DynamicValidationRefactoringChange(descriptor, RefactoringCoreMessages.IntroduceFactory_name);
 			boolean hitInFactoryClass= false;
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/IntroduceParameterRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/IntroduceParameterRefactoring.java
index bc9a766c2..06dcbb41a 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/IntroduceParameterRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/IntroduceParameterRefactoring.java
@@ -503,7 +503,7 @@ public class IntroduceParameterRefactoring extends ScriptableRefactoring impleme
 					final JDTRefactoringDescriptor extended= (JDTRefactoringDescriptor) refactoringDescriptor;
 					final Map arguments= new HashMap();
 					arguments.put(ATTRIBUTE_ARGUMENT, fParameter.getNewName());
-					arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelectionStart).toString() + " " + new Integer(fSelectionLength).toString()); //$NON-NLS-1$
+					arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + " " + Integer.valueOf(fSelectionLength).toString()); //$NON-NLS-1$
 					arguments.putAll(extended.getArguments());
 					String signature= fChangeSignatureRefactoring.getMethodName();
 					try {
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/PromoteTempToFieldRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/PromoteTempToFieldRefactoring.java
index d395b2603..5fba27113 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/PromoteTempToFieldRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/PromoteTempToFieldRefactoring.java
@@ -678,11 +678,11 @@ public class PromoteTempToFieldRefactoring extends ScriptableRefactoring {
 		final JDTRefactoringDescriptor descriptor= new JDTRefactoringDescriptor(IJavaScriptRefactorings.CONVERT_LOCAL_VARIABLE, project, description, comment.asString(), arguments, RefactoringDescriptor.STRUCTURAL_CHANGE);
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_INPUT, descriptor.elementToHandle(fCu));
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_NAME, fFieldName);
-		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelectionStart).toString() + " " + new Integer(fSelectionLength).toString()); //$NON-NLS-1$
+		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + " " + Integer.valueOf(fSelectionLength).toString()); //$NON-NLS-1$
 		arguments.put(ATTRIBUTE_STATIC, Boolean.valueOf(fDeclareStatic).toString());
 		arguments.put(ATTRIBUTE_FINAL, Boolean.valueOf(fDeclareFinal).toString());
-		arguments.put(ATTRIBUTE_VISIBILITY, new Integer(fVisibility).toString());
-		arguments.put(ATTRIBUTE_INITIALIZE, new Integer(fInitializeIn).toString());
+		arguments.put(ATTRIBUTE_VISIBILITY, Integer.valueOf(fVisibility).toString());
+		arguments.put(ATTRIBUTE_INITIALIZE, Integer.valueOf(fInitializeIn).toString());
 		final CompilationUnitChange result= new CompilationUnitChange(RefactoringCoreMessages.PromoteTempToFieldRefactoring_name, fCu);
 		result.setDescriptor(new RefactoringChangeDescriptor(descriptor));
 		TextEdit resultingEdits= rewrite.rewriteAST();
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ReplaceInvocationsRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ReplaceInvocationsRefactoring.java
index f0547f407..435a8d1bb 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ReplaceInvocationsRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/code/ReplaceInvocationsRefactoring.java
@@ -425,8 +425,8 @@ public class ReplaceInvocationsRefactoring extends ScriptableRefactoring {
 			comment.addSetting(RefactoringCoreMessages.ReplaceInvocationsRefactoring_replace_references);
 		final JDTRefactoringDescriptor descriptor= new JDTRefactoringDescriptor(ID_REPLACE_INVOCATIONS, project, description, comment.asString(), arguments, flags);
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_INPUT, descriptor.elementToHandle(fSelectionTypeRoot));
-		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelectionStart).toString() + " " + new Integer(fSelectionLength).toString()); //$NON-NLS-1$
-		arguments.put(ATTRIBUTE_MODE, new Integer(fTargetProvider.isSingle() ? 0 : 1).toString());
+		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + " " + Integer.valueOf(fSelectionLength).toString()); //$NON-NLS-1$
+		arguments.put(ATTRIBUTE_MODE, Integer.valueOf(fTargetProvider.isSingle() ? 0 : 1).toString());
 		return new DynamicValidationRefactoringChange(descriptor, RefactoringCoreMessages.ReplaceInvocationsRefactoring_change_name, fChangeManager.getAllChanges());
 	}
 	
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/nls/NLSHint.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/nls/NLSHint.java
index 58e8d1e36..69f460622 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/nls/NLSHint.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/nls/NLSHint.java
@@ -138,7 +138,7 @@ public class NLSHint {
 					if (superType != null && NLS.class.getName().equals(superType.getQualifiedName())) {
 						Integer line;
 						try {
-							line = new Integer(document.getLineOfOffset(node.getStartPosition()));
+							line = Integer.valueOf(document.getLineOfOffset(node.getStartPosition()));
 						} catch (BadLocationException e) {
 							return true; // ignore and continue
 						}
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/rename/RenameAnalyzeUtil.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/rename/RenameAnalyzeUtil.java
index f2b8790fc..ac888d54d 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/rename/RenameAnalyzeUtil.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/rename/RenameAnalyzeUtil.java
@@ -292,7 +292,7 @@ class RenameAnalyzeUtil {
 		Map updatedOldOffsets= getUpdatedChangeOffsets(change, oldMatches);
 		for (int i= 0; i < newMatches.length; i++) {
 			SearchMatch newMatch= newMatches[i];
-			Integer offsetInNew= new Integer(newMatch.getOffset());
+			Integer offsetInNew= Integer.valueOf(newMatch.getOffset());
 			SearchMatch oldMatch= (SearchMatch) updatedOldOffsets.remove(offsetInNew);
 			if (oldMatch == null) {
 				addReferenceShadowedError(cu, newMatch, newElementName, result);
@@ -311,9 +311,9 @@ class RenameAnalyzeUtil {
 		Map oldToUpdatedOffsets= getEditChangeOffsetUpdates(change);
 		for (int i= 0; i < oldMatches.length; i++) {
 			SearchMatch oldMatch= oldMatches[i];
-			Integer updatedOffset= (Integer) oldToUpdatedOffsets.get(new Integer(oldMatch.getOffset()));
+			Integer updatedOffset= (Integer) oldToUpdatedOffsets.get(Integer.valueOf(oldMatch.getOffset()));
 			if (updatedOffset == null)
-				updatedOffset= new Integer(-1); //match not updated
+				updatedOffset= Integer.valueOf(-1); //match not updated
 			updatedOffsets.put(updatedOffset, oldMatch);
 		}
 		return updatedOffsets;
@@ -332,7 +332,7 @@ class RenameAnalyzeUtil {
 			if (updatedRegion == null)
 				continue;
 			
-			offsetUpdates.put(new Integer(oldRegion.getOffset()), new Integer(updatedRegion.getOffset()));
+			offsetUpdates.put(Integer.valueOf(oldRegion.getOffset()), Integer.valueOf(updatedRegion.getOffset()));
 		}
 		return offsetUpdates;
 	}
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/reorg/JavaDeleteProcessor.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/reorg/JavaDeleteProcessor.java
index 503ee3f3d..bc066c2cd 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/reorg/JavaDeleteProcessor.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/reorg/JavaDeleteProcessor.java
@@ -614,10 +614,10 @@ public final class JavaDeleteProcessor extends DeleteProcessor implements IScrip
 			final JDTRefactoringDescriptor descriptor= new JDTRefactoringDescriptor(IJavaScriptRefactorings.DELETE, project, description, comment.asString(), arguments, flags);
 			arguments.put(ATTRIBUTE_DELETE_SUBPACKAGES, Boolean.valueOf(fDeleteSubPackages).toString());
 			arguments.put(ATTRIBUTE_SUGGEST_ACCESSORS, Boolean.valueOf(fSuggestGetterSetterDeletion).toString());
-			arguments.put(ATTRIBUTE_RESOURCES, new Integer(fResources.length).toString());
+			arguments.put(ATTRIBUTE_RESOURCES, Integer.valueOf(fResources.length).toString());
 			for (int offset= 0; offset < fResources.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + 1), descriptor.resourceToHandle(fResources[offset]));
-			arguments.put(ATTRIBUTE_ELEMENTS, new Integer(fJavaElements.length).toString());
+			arguments.put(ATTRIBUTE_ELEMENTS, Integer.valueOf(fJavaElements.length).toString());
 			for (int offset= 0; offset < fJavaElements.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + fResources.length + 1), descriptor.elementToHandle(fJavaElements[offset]));
 			return new DynamicValidationRefactoringChange(descriptor, RefactoringCoreMessages.DeleteRefactoring_7, new Change[] { fDeleteChange});
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java
index 08d3da7bd..04a86b109 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java
@@ -784,13 +784,13 @@ public final class ReorgPolicyFactory {
 			final JDTRefactoringDescriptorComment comment= new JDTRefactoringDescriptorComment(project, this, header);
 			final JDTRefactoringDescriptor descriptor= createRefactoringDescriptor(comment, arguments, description, project, flags);
 			arguments.put(ATTRIBUTE_POLICY, getPolicyId());
-			arguments.put(ATTRIBUTE_FILES, new Integer(fFiles.length).toString());
+			arguments.put(ATTRIBUTE_FILES, Integer.valueOf(fFiles.length).toString());
 			for (int offset= 0; offset < fFiles.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + 1), descriptor.resourceToHandle(fFiles[offset]));
-			arguments.put(ATTRIBUTE_FOLDERS, new Integer(fFolders.length).toString());
+			arguments.put(ATTRIBUTE_FOLDERS, Integer.valueOf(fFolders.length).toString());
 			for (int offset= 0; offset < fFolders.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + fFiles.length + 1), descriptor.resourceToHandle(fFolders[offset]));
-			arguments.put(ATTRIBUTE_UNITS, new Integer(fCus.length).toString());
+			arguments.put(ATTRIBUTE_UNITS, Integer.valueOf(fCus.length).toString());
 			for (int offset= 0; offset < fCus.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + fFolders.length + fFiles.length + 1), descriptor.elementToHandle(fCus[offset]));
 			arguments.putAll(getRefactoringArguments(project));
@@ -2209,7 +2209,7 @@ public final class ReorgPolicyFactory {
 			final JDTRefactoringDescriptorComment comment= new JDTRefactoringDescriptorComment(project, this, header);
 			final JDTRefactoringDescriptor descriptor= createRefactoringDescriptor(comment, arguments, description, project, flags);
 			arguments.put(ATTRIBUTE_POLICY, getPolicyId());
-			arguments.put(ATTRIBUTE_ROOTS, new Integer(fPackageFragmentRoots.length).toString());
+			arguments.put(ATTRIBUTE_ROOTS, Integer.valueOf(fPackageFragmentRoots.length).toString());
 			for (int offset= 0; offset < fPackageFragmentRoots.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + 1), descriptor.elementToHandle(fPackageFragmentRoots[offset]));
 			arguments.putAll(getRefactoringArguments(project));
@@ -2390,7 +2390,7 @@ public final class ReorgPolicyFactory {
 			final JDTRefactoringDescriptorComment comment= new JDTRefactoringDescriptorComment(project, this, header);
 			final JDTRefactoringDescriptor descriptor= createRefactoringDescriptor(comment, arguments, description, project, flags);
 			arguments.put(ATTRIBUTE_POLICY, getPolicyId());
-			arguments.put(ATTRIBUTE_FRAGMENTS, new Integer(fPackageFragments.length).toString());
+			arguments.put(ATTRIBUTE_FRAGMENTS, Integer.valueOf(fPackageFragments.length).toString());
 			for (int offset= 0; offset < fPackageFragments.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + 1), descriptor.elementToHandle(fPackageFragments[offset]));
 			arguments.putAll(getRefactoringArguments(project));
@@ -3027,7 +3027,7 @@ public final class ReorgPolicyFactory {
 			final JDTRefactoringDescriptorComment comment= new JDTRefactoringDescriptorComment(project, this, header);
 			final JDTRefactoringDescriptor descriptor= createRefactoringDescriptor(comment, arguments, description, project, flags);
 			arguments.put(ATTRIBUTE_POLICY, getPolicyId());
-			arguments.put(ATTRIBUTE_MEMBERS, new Integer(fJavaElements.length).toString());
+			arguments.put(ATTRIBUTE_MEMBERS, Integer.valueOf(fJavaElements.length).toString());
 			for (int offset= 0; offset < fJavaElements.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + 1), descriptor.elementToHandle(fJavaElements[offset]));
 			arguments.putAll(getRefactoringArguments(project));
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/sef/SelfEncapsulateFieldRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/sef/SelfEncapsulateFieldRefactoring.java
index 7337fcebb..260ae8def 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/sef/SelfEncapsulateFieldRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/sef/SelfEncapsulateFieldRefactoring.java
@@ -434,8 +434,8 @@ public class SelfEncapsulateFieldRefactoring extends ScriptableRefactoring {
 			comment.addSetting(RefactoringCoreMessages.SelfEncapsulateField_generate_comments);
 		final JDTRefactoringDescriptor descriptor= new JDTRefactoringDescriptor(IJavaScriptRefactorings.ENCAPSULATE_FIELD, project, description, comment.asString(), arguments, flags);
 		arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_INPUT, descriptor.elementToHandle(fField));
-		arguments.put(ATTRIBUTE_VISIBILITY, new Integer(fVisibility).toString());
-		arguments.put(ATTRIBUTE_INSERTION, new Integer(fInsertionIndex).toString());
+		arguments.put(ATTRIBUTE_VISIBILITY, Integer.valueOf(fVisibility).toString());
+		arguments.put(ATTRIBUTE_INSERTION, Integer.valueOf(fInsertionIndex).toString());
 		arguments.put(ATTRIBUTE_SETTER, fSetterName);
 		arguments.put(ATTRIBUTE_GETTER, fGetterName);
 		arguments.put(ATTRIBUTE_COMMENTS, Boolean.valueOf(fGenerateJavadoc).toString());
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ChangeSignatureRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ChangeSignatureRefactoring.java
index c556ba460..8802e8eae 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ChangeSignatureRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ChangeSignatureRefactoring.java
@@ -1212,7 +1212,7 @@ public class ChangeSignatureRefactoring extends ScriptableRefactoring implements
 					arguments.put(ATTRIBUTE_RETURN, fReturnTypeInfo.getNewTypeName());
 				try {
 					if (!isVisibilitySameAsInitial())
-						arguments.put(ATTRIBUTE_VISIBILITY, new Integer(fVisibility).toString());
+						arguments.put(ATTRIBUTE_VISIBILITY, Integer.valueOf(fVisibility).toString());
 				} catch (JavaScriptModelException exception) {
 					JavaScriptPlugin.log(exception);
 				}
@@ -1241,7 +1241,7 @@ public class ChangeSignatureRefactoring extends ScriptableRefactoring implements
 				for (final Iterator iterator= fExceptionInfos.iterator(); iterator.hasNext();) {
 					final ExceptionInfo info= (ExceptionInfo) iterator.next();
 					arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + count, descriptor.elementToHandle(info.getType()));
-					arguments.put(ATTRIBUTE_KIND + count, new Integer(info.getKind()).toString());
+					arguments.put(ATTRIBUTE_KIND + count, Integer.valueOf(info.getKind()).toString());
 					count++;
 				}
 			} catch (JavaScriptModelException exception) {
@@ -1924,7 +1924,7 @@ public class ChangeSignatureRefactoring extends ScriptableRefactoring implements
 
 		private void removeExtraDimensions(SingleVariableDeclaration oldParam) {
 			if (oldParam.getExtraDimensions() != 0) {		
-				getASTRewrite().set(oldParam, SingleVariableDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(0), fDescription);
+				getASTRewrite().set(oldParam, SingleVariableDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(0), fDescription);
 			}
 		}
 	
@@ -1939,7 +1939,7 @@ public class ChangeSignatureRefactoring extends ScriptableRefactoring implements
 	
 		private void removeExtraDimensions(FunctionDeclaration methDecl) {
 			if (methDecl.getExtraDimensions() != 0)
-				getASTRewrite().set(methDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(0), fDescription);
+				getASTRewrite().set(methDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(0), fDescription);
 		}
 
 		private boolean needsVisibilityUpdate() throws JavaScriptModelException {
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java
index b7bce07a6..774d53236 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java
@@ -468,7 +468,7 @@ public class ChangeTypeRefactoring extends ScriptableRefactoring {
 			comment.addSetting(Messages.format(RefactoringCoreMessages.ChangeTypeRefactoring_refactored_type_pattern, BindingLabelProvider.getBindingLabel(fSelectedType, JavaScriptElementLabels.ALL_FULLY_QUALIFIED)));
 			final JDTRefactoringDescriptor descriptor= new JDTRefactoringDescriptor(IJavaScriptRefactorings.GENERALIZE_TYPE, project, description, comment.asString(), arguments, (RefactoringDescriptor.STRUCTURAL_CHANGE | JavaScriptRefactoringDescriptor.JAR_REFACTORING | JavaScriptRefactoringDescriptor.JAR_SOURCE_ATTACHMENT));
 			arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_INPUT, descriptor.elementToHandle(fCu));
-			arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, new Integer(fSelectionStart).toString() + " " + new Integer(fSelectionLength).toString()); //$NON-NLS-1$
+			arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + " " + Integer.valueOf(fSelectionLength).toString()); //$NON-NLS-1$
 			arguments.put(ATTRIBUTE_TYPE, fSelectedType.getQualifiedName());
 			final DynamicValidationRefactoringChange result= new DynamicValidationRefactoringChange(descriptor, RefactoringCoreMessages.ChangeTypeRefactoring_allChanges);
 			for (Iterator/* <IJavaScriptUnit> */it= relevantVarsByUnit.keySet().iterator(); it.hasNext();) {
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ExtractSupertypeProcessor.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ExtractSupertypeProcessor.java
index e21a2ac16..4b06ee594 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ExtractSupertypeProcessor.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/ExtractSupertypeProcessor.java
@@ -274,16 +274,16 @@ public final class ExtractSupertypeProcessor extends PullUpRefactoringProcessor
 			arguments.put(ATTRIBUTE_REPLACE, Boolean.valueOf(fReplace).toString());
 			arguments.put(ATTRIBUTE_INSTANCEOF, Boolean.valueOf(fInstanceOf).toString());
 			arguments.put(ATTRIBUTE_STUBS, Boolean.valueOf(fCreateMethodStubs).toString());
-			arguments.put(ATTRIBUTE_EXTRACT, new Integer(fMembersToMove.length).toString());
+			arguments.put(ATTRIBUTE_EXTRACT, Integer.valueOf(fMembersToMove.length).toString());
 			for (int offset= 0; offset < fMembersToMove.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + 1), descriptor.elementToHandle(fMembersToMove[offset]));
-			arguments.put(ATTRIBUTE_DELETE, new Integer(fDeletedMethods.length).toString());
+			arguments.put(ATTRIBUTE_DELETE, Integer.valueOf(fDeletedMethods.length).toString());
 			for (int offset= 0; offset < fDeletedMethods.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + fMembersToMove.length + 1), descriptor.elementToHandle(fDeletedMethods[offset]));
-			arguments.put(ATTRIBUTE_ABSTRACT, new Integer(fAbstractMethods.length).toString());
+			arguments.put(ATTRIBUTE_ABSTRACT, Integer.valueOf(fAbstractMethods.length).toString());
 			for (int offset= 0; offset < fAbstractMethods.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + fMembersToMove.length + fDeletedMethods.length + 1), descriptor.elementToHandle(fAbstractMethods[offset]));
-			arguments.put(ATTRIBUTE_TYPES, new Integer(fTypesToExtract.length).toString());
+			arguments.put(ATTRIBUTE_TYPES, Integer.valueOf(fTypesToExtract.length).toString());
 			for (int offset= 0; offset < fTypesToExtract.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + fMembersToMove.length + fDeletedMethods.length + fAbstractMethods.length + 1), descriptor.elementToHandle(fTypesToExtract[offset]));
 			final DynamicValidationRefactoringChange change= new DynamicValidationRefactoringChange(descriptor, RefactoringCoreMessages.ExtractSupertypeProcessor_extract_supertype, fChangeManager.getAllChanges());
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/MoveInstanceMethodProcessor.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/MoveInstanceMethodProcessor.java
index ac0cee96f..0584f7fc5 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/MoveInstanceMethodProcessor.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/MoveInstanceMethodProcessor.java
@@ -1653,7 +1653,7 @@ public final class MoveInstanceMethodProcessor extends MoveProcessor implements
 			arguments.put(ATTRIBUTE_INLINE, Boolean.valueOf(fInline).toString());
 			arguments.put(ATTRIBUTE_USE_GETTER, Boolean.valueOf(fUseGetters).toString());
 			arguments.put(ATTRIBUTE_USE_SETTER, Boolean.valueOf(fUseSetters).toString());
-			arguments.put(ATTRIBUTE_TARGET_INDEX, new Integer(getTargetIndex()).toString());
+			arguments.put(ATTRIBUTE_TARGET_INDEX, Integer.valueOf(getTargetIndex()).toString());
 			return new DynamicValidationRefactoringChange(descriptor, RefactoringCoreMessages.MoveInstanceMethodRefactoring_name, (Change[]) list.toArray(new Change[list.size()]));
 		} finally {
 			monitor.done();
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java
index 91b96d78b..e389e3210 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java
@@ -961,13 +961,13 @@ public class PullUpRefactoringProcessor extends HierarchyProcessor {
 			arguments.put(ATTRIBUTE_REPLACE, Boolean.valueOf(fReplace).toString());
 			arguments.put(ATTRIBUTE_INSTANCEOF, Boolean.valueOf(fInstanceOf).toString());
 			arguments.put(ATTRIBUTE_STUBS, Boolean.valueOf(fCreateMethodStubs).toString());
-			arguments.put(ATTRIBUTE_PULL, new Integer(fMembersToMove.length).toString());
+			arguments.put(ATTRIBUTE_PULL, Integer.valueOf(fMembersToMove.length).toString());
 			for (int offset= 0; offset < fMembersToMove.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + 1), descriptor.elementToHandle(fMembersToMove[offset]));
-			arguments.put(ATTRIBUTE_DELETE, new Integer(fDeletedMethods.length).toString());
+			arguments.put(ATTRIBUTE_DELETE, Integer.valueOf(fDeletedMethods.length).toString());
 			for (int offset= 0; offset < fDeletedMethods.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + fMembersToMove.length + 1), descriptor.elementToHandle(fDeletedMethods[offset]));
-			arguments.put(ATTRIBUTE_ABSTRACT, new Integer(fAbstractMethods.length).toString());
+			arguments.put(ATTRIBUTE_ABSTRACT, Integer.valueOf(fAbstractMethods.length).toString());
 			for (int offset= 0; offset < fAbstractMethods.length; offset++)
 				arguments.put(JDTRefactoringDescriptor.ATTRIBUTE_ELEMENT + (offset + fMembersToMove.length + fDeletedMethods.length + 1), descriptor.elementToHandle(fAbstractMethods[offset]));
 			return new DynamicValidationRefactoringChange(descriptor, RefactoringCoreMessages.PullUpRefactoring_Pull_Up, fChangeManager.getAllChanges());
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/typeconstraints/ConstraintVariableFactory.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/typeconstraints/ConstraintVariableFactory.java
index c49f257dc..2fcb7b688 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/typeconstraints/ConstraintVariableFactory.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/refactoring/typeconstraints/ConstraintVariableFactory.java
@@ -68,7 +68,7 @@ public class ConstraintVariableFactory implements IConstraintVariableFactory {
 		}
 		
 		if (ASTNodes.isLiteral(expression)){
-			Integer nodeType= new Integer(expression.getNodeType());
+			Integer nodeType= Integer.valueOf(expression.getNodeType());
 			if (! fLiteralMap.containsKey(nodeType)){
 				fLiteralMap.put(nodeType, new ExpressionVariable(expression));
 				if (REPORT) nrCreated++;
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/util/History.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/util/History.java
index a8b7781c8..770fd90a1 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/util/History.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/util/History.java
@@ -237,7 +237,7 @@ public abstract class History {
 		int pos=0;
 		for (Iterator iter= values.iterator(); iter.hasNext();) {
 			Object element= iter.next();
-			fPositions.put(getKey(element), new Integer(pos));
+			fPositions.put(getKey(element), Integer.valueOf(pos));
 			pos++;
 		}
 	}
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/dialogs/SourceActionDialog.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/dialogs/SourceActionDialog.java
index b4d59d5a2..ac4ad36f0 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/dialogs/SourceActionDialog.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/dialogs/SourceActionDialog.java
@@ -456,7 +456,7 @@ public class SourceActionDialog extends CheckedTreeSelectionDialog {
 	private List convertToIntegerList(int[] array) {
 		List result= new ArrayList(array.length);
 		for (int i= 0; i < array.length; i++) {
-			result.add(new Integer(array[i]));
+			result.add(Integer.valueOf(array[i]));
 		}
 		return result;
 	}
@@ -505,11 +505,11 @@ public class SourceActionDialog extends CheckedTreeSelectionDialog {
 			ActionMessages.SourceActionDialog_modifier_private, 
 		};
 		Integer[] data= new Integer[] {
-					new Integer(Modifier.PUBLIC),
-					new Integer(Modifier.PROTECTED),
-					new Integer(Modifier.NONE),
-					new Integer(Modifier.PRIVATE)};
-		Integer initialVisibility= new Integer(correctVisibility);
+					Integer.valueOf(Modifier.PUBLIC),
+					Integer.valueOf(Modifier.PROTECTED),
+					Integer.valueOf(Modifier.NONE),
+					Integer.valueOf(Modifier.PRIVATE)};
+		Integer initialVisibility= Integer.valueOf(correctVisibility);
 		for (int i= 0; i < labels.length; i++) {
 			Button radio= new Button(group, SWT.RADIO);
 			Integer visibilityCode= data[i];
@@ -534,7 +534,7 @@ public class SourceActionDialog extends CheckedTreeSelectionDialog {
 		finalCheckboxButton.setText(ActionMessages.SourceActionDialog_modifier_final); 
 		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
 		finalCheckboxButton.setLayoutData(gd);
-		finalCheckboxButton.setData(new Integer(Modifier.FINAL));
+		finalCheckboxButton.setData(Integer.valueOf(Modifier.FINAL));
 		finalCheckboxButton.setEnabled(true);
 		finalCheckboxButton.setSelection(isFinal());
 		finalCheckboxButton.addSelectionListener(new SelectionListener() {
@@ -551,7 +551,7 @@ public class SourceActionDialog extends CheckedTreeSelectionDialog {
 		syncCheckboxButton.setText(ActionMessages.SourceActionDialog_modifier_synchronized); 
 		gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
 		syncCheckboxButton.setLayoutData(gd);
-		syncCheckboxButton.setData(new Integer(Modifier.SYNCHRONIZED));
+		syncCheckboxButton.setData(Integer.valueOf(Modifier.SYNCHRONIZED));
 		syncCheckboxButton.setEnabled(true);
 		syncCheckboxButton.setSelection(isSynchronized());
 		syncCheckboxButton.addSelectionListener(new SelectionListener() {
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/dialogs/TypeInfoViewer.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/dialogs/TypeInfoViewer.java
index 976b38c06..af316cdf1 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/dialogs/TypeInfoViewer.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/dialogs/TypeInfoViewer.java
@@ -457,7 +457,7 @@ public class TypeInfoViewer {
 			} else {
 				return Messages.format(
 					JavaUIMessages.TypeInfoViewer_progress_label,
-					new Object[] { fName, new Integer((int)((fWorked * 100) / fTotalWork)) });
+					new Object[] { fName, Integer.valueOf((int)((fWorked * 100) / fTotalWork)) });
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/fix/CleanUpRefactoringWizard.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/fix/CleanUpRefactoringWizard.java
index bbb3152a6..bd42fc5f5 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/fix/CleanUpRefactoringWizard.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/fix/CleanUpRefactoringWizard.java
@@ -213,9 +213,9 @@ public class CleanUpRefactoringWizard extends RefactoringWizard {
 			if (cus.length == 1) {
 				setMessage(MultiFixMessages.CleanUpRefactoringWizard_CleaningUp11_Title);
 			} else if (projects.length == 1) {
-				setMessage(Messages.format(MultiFixMessages.CleanUpRefactoringWizard_CleaningUpN1_Title, new Integer(cus.length)));
+				setMessage(Messages.format(MultiFixMessages.CleanUpRefactoringWizard_CleaningUpN1_Title, Integer.valueOf(cus.length)));
 			} else {
-				setMessage(Messages.format(MultiFixMessages.CleanUpRefactoringWizard_CleaningUpNN_Title, new Object[] {new Integer(cus.length), new Integer(projects.length)}));
+				setMessage(Messages.format(MultiFixMessages.CleanUpRefactoringWizard_CleaningUpNN_Title, new Object[] {Integer.valueOf(cus.length), Integer.valueOf(projects.length)}));
 			}
         }
 
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/fix/CleanUpSaveParticipantConfigurationModifyDialog.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/fix/CleanUpSaveParticipantConfigurationModifyDialog.java
index 50a0c43ab..81c8a4aa7 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/fix/CleanUpSaveParticipantConfigurationModifyDialog.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/fix/CleanUpSaveParticipantConfigurationModifyDialog.java
@@ -280,6 +280,6 @@ public class CleanUpSaveParticipantConfigurationModifyDialog extends StatusDialo
 			count+= fPages[i].getSelectedCleanUpCount();
 		}
 		
-		fCountLabel.setText(Messages.format(SaveParticipantMessages.CleanUpSaveParticipantConfigurationModifyDialog_XofYSelected_Label, new Object[] {new Integer(count), new Integer(size)}));
+		fCountLabel.setText(Messages.format(SaveParticipantMessages.CleanUpSaveParticipantConfigurationModifyDialog_XofYSelected_Label, new Object[] {Integer.valueOf(count), Integer.valueOf(size)}));
 	}
 }
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/javaeditor/selectionactions/GoToNextPreviousMemberAction.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/javaeditor/selectionactions/GoToNextPreviousMemberAction.java
index 6bd51299f..78a1a58b8 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/javaeditor/selectionactions/GoToNextPreviousMemberAction.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/javaeditor/selectionactions/GoToNextPreviousMemberAction.java
@@ -131,7 +131,7 @@ public class GoToNextPreviousMemberAction extends Action implements IUpdate {
 			if (offsetArray.length == 0)
 				return oldSourceRange;
 			Arrays.sort(offsetArray);
-			Integer oldOffset= new Integer(oldSourceRange.getOffset());
+			Integer oldOffset= Integer.valueOf(oldSourceRange.getOffset());
 			int index= Arrays.binarySearch(offsetArray, oldOffset);
 
 			if (fIsGotoNext)
@@ -236,6 +236,6 @@ public class GoToNextPreviousMemberAction extends Action implements IUpdate {
 
 	private static void addOffset(List result, int offset) {
 		if (offset >= 0)
-			result.add(new Integer(offset));
+			result.add(Integer.valueOf(offset));
 	}
 }
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/navigator/JavaNavigatorViewActionProvider.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/navigator/JavaNavigatorViewActionProvider.java
index b1df68d24..4e604d636 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/navigator/JavaNavigatorViewActionProvider.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/navigator/JavaNavigatorViewActionProvider.java
@@ -129,7 +129,7 @@ public class JavaNavigatorViewActionProvider extends CommonActionProvider {
 		// If no memento try an restore from preference store
 		if (state == null) {
 			IPreferenceStore store= JavaScriptPlugin.getDefault().getPreferenceStore();
-			state= new Integer(store.getInt(TAG_LAYOUT));
+			state= Integer.valueOf(store.getInt(TAG_LAYOUT));
 		}
 
 		if (state.intValue() == FLAT_LAYOUT)
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
index 7a276fd97..1fbef2f2b 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
@@ -671,7 +671,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 					int max= 5000;
 					if (number < min || number > max) {
 						String msgFormat= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_invalidRange;
-						String msg= Messages.format(msgFormat, new Object[] {new Integer(min), new Integer(max)});
+						String msg= Messages.format(msgFormat, new Object[] {Integer.valueOf(min), Integer.valueOf(max)});
 						status.setError(msg);
 					}
 				} catch (NumberFormatException ex) {
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java
index 3aa8ad4cc..4290102d9 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java
@@ -532,7 +532,7 @@ class JavaEditorHoverConfigurationBlock implements IPreferenceConfigurationBlock
 		while (fStatus.isOK() && i < fHoverConfigs.length) {
 			if (fHoverConfigs[i].fIsEnabled) {
 				String label= getContributedHovers()[i].getLabel();
-				Integer stateMask= new Integer(fHoverConfigs[i].fStateMask);
+				Integer stateMask= Integer.valueOf(fHoverConfigs[i].fStateMask);
 				if (fHoverConfigs[i].fStateMask == -1)
 					fStatus= new StatusInfo(IStatus.ERROR, Messages.format(PreferencesMessages.JavaEditorHoverConfigurationBlock_modifierIsNotValidForHover, new String[] {fHoverConfigs[i].fModifierString, label})); 
 				else if (stateMasks.containsKey(stateMask))
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/LineWrappingTabPage.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/LineWrappingTabPage.java
index f640bc671..1af23fa4e 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/LineWrappingTabPage.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/LineWrappingTabPage.java
@@ -255,13 +255,13 @@ public class LineWrappingTabPage extends FormatterTabPage {
             Boolean forceWrapping;
             
             try {
-                wrappingStyle= new Integer(DefaultCodeFormatterConstants.getWrappingStyle(value));
-                indentStyle= new Integer(DefaultCodeFormatterConstants.getIndentStyle(value));
+                wrappingStyle= Integer.valueOf(DefaultCodeFormatterConstants.getWrappingStyle(value));
+                indentStyle= Integer.valueOf(DefaultCodeFormatterConstants.getIndentStyle(value));
                 forceWrapping= new Boolean(DefaultCodeFormatterConstants.getForceWrapping(value));
             } catch (IllegalArgumentException e) {
 				forceWrapping= new Boolean(false);
-				indentStyle= new Integer(DefaultCodeFormatterConstants.INDENT_DEFAULT);
-				wrappingStyle= new Integer(DefaultCodeFormatterConstants.WRAP_NO_SPLIT);
+				indentStyle= Integer.valueOf(DefaultCodeFormatterConstants.INDENT_DEFAULT);
+				wrappingStyle= Integer.valueOf(DefaultCodeFormatterConstants.WRAP_NO_SPLIT);
 			} 
 			
             increaseMapEntry(wrappingMap, wrappingStyle);
@@ -272,9 +272,9 @@ public class LineWrappingTabPage extends FormatterTabPage {
         private void increaseMapEntry(Map map, Object type) {
             Integer count= (Integer)map.get(type);
             if (count == null) // not in map yet -> count == 0
-                map.put(type, new Integer(1));
+                map.put(type, Integer.valueOf(1));
             else
-                map.put(type, new Integer(count.intValue() + 1));
+                map.put(type, Integer.valueOf(count.intValue() + 1));
         }
                 
         private void refreshControls(Map wrappingStyleMap, Map indentStyleMap, Map forceWrappingMap) {
@@ -311,7 +311,7 @@ public class LineWrappingTabPage extends FormatterTabPage {
 		private Integer getWrappingStyleMax(Map wrappingStyleMap) {
             int maxCount= 0, maxStyle= 0;
             for (int i=0; i<WRAPPING_NAMES.length; i++) {
-                Integer count= (Integer)wrappingStyleMap.get(new Integer(i));
+                Integer count= (Integer)wrappingStyleMap.get(Integer.valueOf(i));
                 if (count == null)
                     continue;
                 if (count.intValue() > maxCount) {
@@ -319,7 +319,7 @@ public class LineWrappingTabPage extends FormatterTabPage {
                     maxStyle= i;
                 }
             }
-            return new Integer(maxStyle);
+            return Integer.valueOf(maxStyle);
         }
         
         private void updateButton(Map forceWrappingMap) {
@@ -362,7 +362,7 @@ public class LineWrappingTabPage extends FormatterTabPage {
             int maxCount= 0, maxStyle= 0;
                         
             for(int i = 0; i < items.length; i++) {
-                Integer count= (Integer) map.get(new Integer(i));
+                Integer count= (Integer) map.get(Integer.valueOf(i));
                 int val= (count == null) ? 0 : count.intValue();
                 if (val > maxCount) {
                     maxCount= val;
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java
index e540b1e8f..c4d449f49 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java
@@ -483,7 +483,7 @@ public abstract class ModifyDialogTabPage {
 		public void add(Control control) {
 			control.addFocusListener(this);
 			fItemList.add(fIndex, control);
-			fItemMap.put(control, new Integer(fIndex++));
+			fItemMap.put(control, Integer.valueOf(fIndex++));
 		}
 		
 		public void add(Preference preference) {
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/ProfileManager.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/ProfileManager.java
index 9053cb46c..a4632abbe 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/ProfileManager.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/formatter/ProfileManager.java
@@ -445,7 +445,7 @@ public abstract class ProfileManager extends Observable {
 	 */
 	protected void notifyObservers(int message) {
 		setChanged();
-		notifyObservers(new Integer(message));
+		notifyObservers(Integer.valueOf(message));
 	}
 	
 	public static boolean hasProjectSpecificSettings(IScopeContext context, KeySet[] keySets) {
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/InlineTempWizard.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/InlineTempWizard.java
index c829cd5a1..a4d0d54b7 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/InlineTempWizard.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/InlineTempWizard.java
@@ -60,7 +60,7 @@ public class InlineTempWizard extends RefactoringWizard {
 
 				default:
 					return Messages.format(RefactoringMessages.InlineTempInputPage_message_multi, new Object[] {
-							new Integer(occurrences), identifier });
+							Integer.valueOf(occurrences), identifier });
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/MoveMembersWizard.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/MoveMembersWizard.java
index 60b73633e..ec8e5a5bb 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/MoveMembersWizard.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/MoveMembersWizard.java
@@ -89,7 +89,7 @@ public class MoveMembersWizard extends RefactoringWizard {
 		public void setVisible(boolean visible){
 			if (visible){
 				String message= Messages.format(RefactoringMessages.MoveMembersInputPage_descriptionKey, 
-					new String[]{new Integer(getMoveProcessor().getMembersToMove().length).toString(),
+					new String[]{Integer.valueOf(getMoveProcessor().getMembersToMove().length).toString(),
 								 JavaModelUtil.getFullyQualifiedName(getMoveProcessor().getDeclaringType())});
 				setDescription(message);
 			}	
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PromoteTempWizard.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PromoteTempWizard.java
index ee588069f..2af5e9fe6 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PromoteTempWizard.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PromoteTempWizard.java
@@ -57,9 +57,9 @@ public class PromoteTempWizard extends RefactoringWizard {
 							RefactoringMessages.PromoteTempInputPage_Current_method, 
 							RefactoringMessages.PromoteTempInputPage_constructors}; 
 		private static final Integer[] RADIO_BUTTON_DATA= {
-							new Integer(PromoteTempToFieldRefactoring.INITIALIZE_IN_FIELD),
-							new Integer(PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD),
-							new Integer(PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR)};
+							Integer.valueOf(PromoteTempToFieldRefactoring.INITIALIZE_IN_FIELD),
+							Integer.valueOf(PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD),
+							Integer.valueOf(PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR)};
 		private Button fDeclareStaticCheckbox;
 		private Button fDeclareFinalCheckbox;
 		private Button[] fInitializeInRadioButtons;
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PullUpMemberPage.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PullUpMemberPage.java
index 4dd1b9bb1..2342a8e4f 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PullUpMemberPage.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PullUpMemberPage.java
@@ -101,7 +101,7 @@ public class PullUpMemberPage extends UserInputWizardPage {
 			if (!ACTION_PROPERTY.equals(property))
 				return null;
 			final MemberActionInfo info= (MemberActionInfo) element;
-			return new Integer(info.getAction());
+			return Integer.valueOf(info.getAction());
 		}
 
 		public void modify(final Object element, final String property, final Object value) {
@@ -283,7 +283,7 @@ public class PullUpMemberPage extends UserInputWizardPage {
 	}
 
 	private static void putToStringMapping(final Map result, final String[] actionLabels, final int actionIndex) {
-		result.put(actionLabels[actionIndex], new Integer(actionIndex));
+		result.put(actionLabels[actionIndex], Integer.valueOf(actionIndex));
 	}
 
 	private static void setActionForInfos(final MemberActionInfo[] infos, final int action) {
@@ -912,7 +912,7 @@ public class PullUpMemberPage extends UserInputWizardPage {
 					return;
 				final MemberActionInfo info= (MemberActionInfo) structured.getFirstElement();
 				editor.setItems(info.getAllowedLabels());
-				editor.setValue(new Integer(info.getAction()));
+				editor.setValue(Integer.valueOf(info.getAction()));
 			}
 		});
 
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PushDownWizard.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PushDownWizard.java
index 48d43c17b..c441dd5fa 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PushDownWizard.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/PushDownWizard.java
@@ -145,7 +145,7 @@ public final class PushDownWizard extends RefactoringWizard {
 					return null;
 
 				final MemberActionInfo info= (MemberActionInfo) element;
-				return new Integer(info.getAction());
+				return Integer.valueOf(info.getAction());
 			}
 
 			public void modify(final Object element, final String property, final Object value) {
@@ -399,9 +399,9 @@ public final class PushDownWizard extends RefactoringWizard {
 		private Map createStringMappingForSelectedElements() {
 			final Map result= new HashMap();
 			int action= MemberActionInfo.PUSH_DOWN_ACTION;
-			result.put(MemberActionInfoLabelProvider.getActionLabel(action), new Integer(action));
+			result.put(MemberActionInfoLabelProvider.getActionLabel(action), Integer.valueOf(action));
 			int action1= MemberActionInfo.PUSH_ABSTRACT_ACTION;
-			result.put(MemberActionInfoLabelProvider.getActionLabel(action1), new Integer(action1));
+			result.put(MemberActionInfoLabelProvider.getActionLabel(action1), Integer.valueOf(action1));
 			return result;
 		}
 
@@ -540,7 +540,7 @@ public final class PushDownWizard extends RefactoringWizard {
 						return;
 					final MemberActionInfo mac= (MemberActionInfo) ss.getFirstElement();
 					comboBoxCellEditor.setItems(MemberActionInfoLabelProvider.getAvailableActionLabels(mac));
-					comboBoxCellEditor.setValue(new Integer(mac.getAction()));
+					comboBoxCellEditor.setValue(Integer.valueOf(mac.getAction()));
 				}
 			});
 
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/UseSupertypeWizard.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/UseSupertypeWizard.java
index 627e387fa..cdb7f600a 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/UseSupertypeWizard.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/UseSupertypeWizard.java
@@ -202,7 +202,7 @@ public class UseSupertypeWizard extends RefactoringWizard{
 			fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener(){
 				public void selectionChanged(SelectionChangedEvent event) {
 					IStructuredSelection ss= (IStructuredSelection)event.getSelection();
-					if (new Integer(0).equals(fFileCount.get(ss.getFirstElement()))){
+					if (Integer.valueOf(0).equals(fFileCount.get(ss.getFirstElement()))){
 						setMessage(RefactoringMessages.UseSupertypeInputPage_No_updates, IMessageProvider.INFORMATION); 
 						setPageComplete(false);
 					} else {
@@ -233,7 +233,7 @@ public class UseSupertypeWizard extends RefactoringWizard{
 		private void updateUpdateLabels() {
 			IType selectedType= getSelectedSupertype();
 			final int count= getUseSupertypeProcessor().getChanges();
-			fFileCount.put(selectedType, new Integer(count));
+			fFileCount.put(selectedType, Integer.valueOf(count));
 			if (count == 0) {
 				setMessage(RefactoringMessages.UseSupertypeInputPage_No_updates, IMessageProvider.INFORMATION); 
 				setPageComplete(false);
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/VisibilityControlUtil.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/VisibilityControlUtil.java
index acd431121..ff0fc1aaf 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/VisibilityControlUtil.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/VisibilityControlUtil.java
@@ -47,11 +47,11 @@ public class VisibilityControlUtil {
 			"pri&vate" //$NON-NLS-1$
 		};
 		Integer[] data= new Integer[] {
-					new Integer(Modifier.PUBLIC),
-					new Integer(Modifier.PROTECTED),
-					new Integer(Modifier.NONE),
-					new Integer(Modifier.PRIVATE)};
-		Integer initialVisibility= new Integer(correctVisibility);
+					Integer.valueOf(Modifier.PUBLIC),
+					Integer.valueOf(Modifier.PROTECTED),
+					Integer.valueOf(Modifier.NONE),
+					Integer.valueOf(Modifier.PRIVATE)};
+		Integer initialVisibility= Integer.valueOf(correctVisibility);
 		for (int i= 0; i < labels.length; i++) {
 			Button radio= new Button(group, SWT.RADIO);
 			Integer visibilityCode= data[i];
@@ -72,7 +72,7 @@ public class VisibilityControlUtil {
 	private static List convertToIntegerList(int[] array) {
 		List result= new ArrayList(array.length);
 		for (int i= 0; i < array.length; i++) {
-			result.add(new Integer(array[i]));
+			result.add(Integer.valueOf(array[i]));
 		}
 		return result;
 	}
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/code/ExtractMethodInputPage.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/code/ExtractMethodInputPage.java
index 0423bf35e..42fe35d37 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/code/ExtractMethodInputPage.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/code/ExtractMethodInputPage.java
@@ -138,8 +138,8 @@ public class ExtractMethodInputPage extends UserInputWizardPage {
 //			RefactoringMessages.ExtractMethodInputPage_default, 
 //			RefactoringMessages.ExtractMethodInputPage_private
 //		};
-//		Integer[] data= new Integer[] {new Integer(Modifier.PUBLIC), new Integer(Modifier.PROTECTED), new Integer(Modifier.NONE), new Integer(Modifier.PRIVATE)};
-//		Integer visibility= new Integer(fRefactoring.getVisibility());
+//		Integer[] data= Integer.valueOf[] {Integer.valueOf(Modifier.PUBLIC), Integer.valueOf(Modifier.PROTECTED), Integer.valueOf(Modifier.NONE), Integer.valueOf(Modifier.PRIVATE)};
+//		Integer visibility= Integer.valueOf(fRefactoring.getVisibility());
 //		for (int i= 0; i < labels.length; i++) {
 //			Button radio= new Button(group, SWT.RADIO);
 //			radio.setText(labels[i]);
@@ -205,7 +205,7 @@ public class ExtractMethodInputPage extends UserInputWizardPage {
 		} else {
 			checkBox.setText(Messages.format(
 				RefactoringMessages.ExtractMethodInputPage_duplicates_multi, 
-				new Integer(duplicates))); 
+				Integer.valueOf(duplicates))); 
 		}
 		checkBox.setSelection(fRefactoring.getReplaceDuplicates());
 		checkBox.setEnabled(duplicates > 0);
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java
index c5d2a2338..445cee6e1 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java
@@ -160,7 +160,7 @@ class ExternalizeWizardPage extends UserInputWizardPage {
 				} else if (PROPERTIES[VAL_PROP].equals(property)) {
 					res= substitution.getValue();
 				} else if (PROPERTIES[STATE_PROP].equals(property)) {
-					return new Integer(substitution.getState());
+					return Integer.valueOf(substitution.getState());
 				}
 				if (res != null) {
 					return unwindEscapeChars(res);
@@ -761,7 +761,7 @@ class ExternalizeWizardPage extends UserInputWizardPage {
 							NLSSubstitution substitution= (NLSSubstitution) widgetSel.get(0);
 							Integer value= (Integer) getCellModifier().getValue(substitution, PROPERTIES[STATE_PROP]);
 							int newValue= MultiStateCellEditor.getNextValue(NLSSubstitution.STATE_COUNT, value.intValue());
-							getCellModifier().modify(item, PROPERTIES[STATE_PROP], new Integer(newValue));
+							getCellModifier().modify(item, PROPERTIES[STATE_PROP], Integer.valueOf(newValue));
 						}
 					}
 				});
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/nls/MultiStateCellEditor.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/nls/MultiStateCellEditor.java
index 4bdd9430d..25bf639c7 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/nls/MultiStateCellEditor.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/nls/MultiStateCellEditor.java
@@ -62,7 +62,7 @@ public class MultiStateCellEditor extends CellEditor {
 	 * @return the Integer value
 	 */
 	protected Object doGetValue() {
-		return new Integer(fValue);
+		return Integer.valueOf(fValue);
 	}
 
 	/*
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/reorg/PasteAction.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/reorg/PasteAction.java
index c20d9318b..a03f092b3 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/reorg/PasteAction.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/reorg/PasteAction.java
@@ -591,7 +591,7 @@ public class PasteAction extends SelectionDispatchAction{
 					IProject project;
 					int i= 1;
 					do {
-						String name= Messages.format(ReorgMessages.PasteAction_projectName, i == 1 ? (Object) "" : new Integer(i)); //$NON-NLS-1$
+						String name= Messages.format(ReorgMessages.PasteAction_projectName, i == 1 ? (Object) "" : Integer.valueOf(i)); //$NON-NLS-1$
 						project= JavaScriptPlugin.getWorkspace().getRoot().getProject(name);
 						i++;
 					} while (project.exists());
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java
index dd5d464b8..1ec5bc21d 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java
@@ -278,10 +278,10 @@ public class SelfEncapsulateFieldInputPage extends UserInputWizardPage {
 		Integer[] data= null;
 		if (Flags.isPrivate(visibility)) {
 			labels= new String[] { pub, def, priv };
-			data= new Integer[] {new Integer(Flags.AccPublic), new Integer(0), new Integer(Flags.AccPrivate) };
+			data= new Integer[] {Integer.valueOf(Flags.AccPublic), Integer.valueOf(0), Integer.valueOf(Flags.AccPrivate) };
 		} else {
 			labels= new String[] { pub, def };
-			data= new Integer[] {new Integer(Flags.AccPublic), new Integer(0)};
+			data= new Integer[] {Integer.valueOf(Flags.AccPublic), Integer.valueOf(0)};
 		}
 		return new Object[] {labels, data};
 	}
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/ExceptionOccurrencesFinder.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/ExceptionOccurrencesFinder.java
index 2ad5cf665..ab5f0b8ff 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/ExceptionOccurrencesFinder.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/ExceptionOccurrencesFinder.java
@@ -137,7 +137,7 @@ public class ExceptionOccurrencesFinder extends ASTVisitor implements IOccurrenc
 			try {
 				boolean isException= node == fSelectedName;
 				int line= document.getLineOfOffset(startPosition);
-				Integer lineInteger= new Integer(line);
+				Integer lineInteger= Integer.valueOf(line);
 				ExceptionOccurrencesGroupKey groupKey= (ExceptionOccurrencesGroupKey) lineToLineElement.get(lineInteger);
 				if (groupKey == null) {
 					IRegion region= document.getLineInformation(line);
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchPage.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchPage.java
index c4eb57e8b..bed7a394b 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchPage.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchPage.java
@@ -722,7 +722,7 @@ public class JavaSearchPage extends DialogPage implements ISearchPage {
 	private Button createButton(Composite parent, int style, String text, int data, boolean isSelected) {
 		Button button= new Button(parent, style);
 		button.setText(text);
-		button.setData(new Integer(data));
+		button.setData(Integer.valueOf(data));
 		button.setLayoutData(new GridData());
 		button.setSelection(isSelected);
 		return button;
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchQuery.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchQuery.java
index 5906d054a..93d7ced0a 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchQuery.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchQuery.java
@@ -202,7 +202,7 @@ public class JavaSearchQuery implements ISearchQuery {
 					return Messages.format(SearchMessages.JavaSearchOperation_singularOccurrencesPostfix, args); 
 			}
 		} else {
-			Object[] args= { getSearchPatternDescription(), new Integer(nMatches), fPatternData.getScopeDescription() };
+			Object[] args= { getSearchPatternDescription(), Integer.valueOf(nMatches), fPatternData.getScopeDescription() };
 			switch (fPatternData.getLimitTo()) {
 				case IJavaScriptSearchConstants.IMPLEMENTORS:
 					return Messages.format(SearchMessages.JavaSearchOperation_pluralImplementorsPostfix, args); 
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchResultPage.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchResultPage.java
index baea1a463..38aa709e3 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchResultPage.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/JavaSearchResultPage.java
@@ -143,7 +143,7 @@ public class JavaSearchResultPage extends AbstractTextSearchViewPage implements
 		
 		initSortActions();
 		initGroupingActions();
-		setElementLimit(new Integer(DEFAULT_ELEMENT_LIMIT));
+		setElementLimit(Integer.valueOf(DEFAULT_ELEMENT_LIMIT));
 	}
 		
 	private void initSortActions() {
@@ -199,8 +199,8 @@ public class JavaSearchResultPage extends AbstractTextSearchViewPage implements
 		try {
 			IMarker marker= file.createMarker(NewSearchUI.SEARCH_MARKER);
 			HashMap attributes= new HashMap(4);
-			attributes.put(IMarker.CHAR_START, new Integer(offset));
-			attributes.put(IMarker.CHAR_END, new Integer(offset + length));
+			attributes.put(IMarker.CHAR_START, Integer.valueOf(offset));
+			attributes.put(IMarker.CHAR_END, Integer.valueOf(offset + length));
 			marker.setAttributes(attributes);
 			IDE.gotoMarker(editor, marker);
 			marker.delete();
@@ -417,7 +417,7 @@ public class JavaSearchResultPage extends AbstractTextSearchViewPage implements
 		
 		fCurrentGrouping= grouping;
 		fCurrentSortOrder= sortOrder;
-		setElementLimit(new Integer(elementLimit));
+		setElementLimit(Integer.valueOf(elementLimit));
 	}
 
 	/* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/OccurrencesFinder.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/OccurrencesFinder.java
index 2bebcdd40..554cfa284 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/OccurrencesFinder.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/OccurrencesFinder.java
@@ -104,7 +104,7 @@ public class OccurrencesFinder extends ASTVisitor implements IOccurrencesFinder
 			try {
 				boolean isWriteAccess= fWriteUsages.contains(node);
 				int line= document.getLineOfOffset(startPosition);
-				Integer lineInteger= new Integer(line);
+				Integer lineInteger= Integer.valueOf(line);
 				OccurrencesGroupKey groupKey= (OccurrencesGroupKey) lineToGroup.get(lineInteger);
 				if (groupKey == null) {
 					IRegion region= document.getLineInformation(line);
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/OccurrencesSearchQuery.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/OccurrencesSearchQuery.java
index c4834a356..10cabbed1 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/OccurrencesSearchQuery.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/OccurrencesSearchQuery.java
@@ -81,7 +81,7 @@ public class OccurrencesSearchQuery implements ISearchQuery {
 		if (nMatches == 1) {
 			return Messages.format(fSingularLabel, new Object[] { fName, fElement.getElementName() });
 		} else {
-			return Messages.format(fPluralLabel, new Object[] { fName, new Integer(nMatches), fElement.getElementName() });
+			return Messages.format(fPluralLabel, new Object[] { fName, Integer.valueOf(nMatches), fElement.getElementName() });
 		}
 	}
 		
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/TextSearchLabelProvider.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/TextSearchLabelProvider.java
index f7c55f45f..9bf69e3be 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/TextSearchLabelProvider.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/search/TextSearchLabelProvider.java
@@ -30,7 +30,7 @@ public abstract class TextSearchLabelProvider extends LabelProvider {
 		if (matchCount < 2)
 			return text;
 		else {
-			return Messages.format(fMatchCountFormat, new Object[] { text, new Integer(matchCount) });
+			return Messages.format(fMatchCountFormat, new Object[] { text, Integer.valueOf(matchCount) });
 		}
 	}
 
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/SmartBackspaceManager.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/SmartBackspaceManager.java
index 9e0f5ef4a..6ce5452cf 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/SmartBackspaceManager.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/SmartBackspaceManager.java
@@ -182,12 +182,12 @@ public class SmartBackspaceManager {
 	}
 
 	private void addEdit(UndoSpec spec) {
-		Integer i= new Integer(spec.triggerOffset);
+		Integer i= Integer.valueOf(spec.triggerOffset);
 		fSpecs.put(i, spec);
 	}
 
 	private UndoSpec removeEdit(int offset) {
-		Integer i= new Integer(offset);
+		Integer i= Integer.valueOf(offset);
 		UndoSpec spec= (UndoSpec) fSpecs.remove(i);
 		return spec;
 	}
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/ChangeMethodSignatureProposal.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/ChangeMethodSignatureProposal.java
index 0f17ce975..76d34ec70 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/ChangeMethodSignatureProposal.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/ChangeMethodSignatureProposal.java
@@ -205,7 +205,7 @@ public class ChangeMethodSignatureProposal extends LinkedCorrectionProposal {
 				
 				Type newType= imports.addImport(newTypeBinding, ast);
 				rewrite.replace(decl.getType(), newType, null);
-				rewrite.set(decl, SingleVariableDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(0), null);
+				rewrite.set(decl, SingleVariableDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(0), null);
 				
 				IBinding binding= decl.getName().resolveBinding();
 				if (binding != null) {
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/FixCorrectionProposal.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/FixCorrectionProposal.java
index dcf46dd5f..293999bfe 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/FixCorrectionProposal.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/FixCorrectionProposal.java
@@ -194,7 +194,7 @@ public class FixCorrectionProposal extends LinkedCorrectionProposal implements I
 		} else if (count < 2) {
 			return ""; //$NON-NLS-1$
 		} else {
-			return Messages.format(CorrectionMessages.FixCorrectionProposal_hitCtrlEnter_variable_description, new Integer(count));
+			return Messages.format(CorrectionMessages.FixCorrectionProposal_hitCtrlEnter_variable_description, Integer.valueOf(count));
 		}
 	}
 
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/QuickFixProcessor.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/QuickFixProcessor.java
index 4035aad2e..9ee60042d 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/QuickFixProcessor.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/QuickFixProcessor.java
@@ -188,7 +188,7 @@ public class QuickFixProcessor implements IQuickFixProcessor {
 		ArrayList resultingCollections= new ArrayList();
 		for (int i= 0; i < locations.length; i++) {
 			IProblemLocation curr= locations[i];
-			Integer id= new Integer(curr.getProblemId());
+			Integer id= Integer.valueOf(curr.getProblemId());
 			if (handledProblems.add(id)) {
 				process(context, curr, resultingCollections);
 			}
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/TypeChangeCompletionProposal.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/TypeChangeCompletionProposal.java
index a76ee19dc..17b43fe4f 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/TypeChangeCompletionProposal.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/correction/TypeChangeCompletionProposal.java
@@ -93,7 +93,7 @@ public class TypeChangeCompletionProposal extends LinkedCorrectionProposal {
 			if (declNode instanceof FunctionDeclaration) {
 				FunctionDeclaration methodDecl= (FunctionDeclaration) declNode;
 				rewrite.set(methodDecl, FunctionDeclaration.RETURN_TYPE2_PROPERTY, type, null);
-				rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(0), null);
+				rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(0), null);
 			} else if (declNode instanceof VariableDeclarationFragment) {
 				ASTNode parent= declNode.getParent();
 				if (parent instanceof FieldDeclaration) {
@@ -112,7 +112,7 @@ public class TypeChangeCompletionProposal extends LinkedCorrectionProposal {
 						}
 					} else {
 						rewrite.set(fieldDecl, FieldDeclaration.TYPE_PROPERTY, type, null);
-						rewrite.set(declNode, VariableDeclarationFragment.EXTRA_DIMENSIONS_PROPERTY, new Integer(0), null);
+						rewrite.set(declNode, VariableDeclarationFragment.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(0), null);
 					}
 				} else if (parent instanceof VariableDeclarationStatement) {
 					VariableDeclarationStatement varDecl= (VariableDeclarationStatement) parent;
@@ -129,18 +129,18 @@ public class TypeChangeCompletionProposal extends LinkedCorrectionProposal {
 						}
 					} else {
 						rewrite.set(varDecl, VariableDeclarationStatement.TYPE_PROPERTY, type, null);
-						rewrite.set(declNode, VariableDeclarationFragment.EXTRA_DIMENSIONS_PROPERTY, new Integer(0), null);
+						rewrite.set(declNode, VariableDeclarationFragment.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(0), null);
 					}
 				} else if (parent instanceof VariableDeclarationExpression) {
 					VariableDeclarationExpression varDecl= (VariableDeclarationExpression) parent;
 
 					rewrite.set(varDecl, VariableDeclarationExpression.TYPE_PROPERTY, type, null);
-					rewrite.set(declNode, VariableDeclarationFragment.EXTRA_DIMENSIONS_PROPERTY, new Integer(0), null);
+					rewrite.set(declNode, VariableDeclarationFragment.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(0), null);
 				}
 			} else if (declNode instanceof SingleVariableDeclaration) {
 				SingleVariableDeclaration variableDeclaration= (SingleVariableDeclaration) declNode;
 				rewrite.set(variableDeclaration, SingleVariableDeclaration.TYPE_PROPERTY, type, null);
-				rewrite.set(variableDeclaration, SingleVariableDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(0), null);
+				rewrite.set(variableDeclaration, SingleVariableDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(0), null);
 			}
 
 			// set up linked mode
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/CompletionProposalComputerRegistry.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/CompletionProposalComputerRegistry.java
index b0f0f5e2b..db7191c1d 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/CompletionProposalComputerRegistry.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/CompletionProposalComputerRegistry.java
@@ -277,7 +277,7 @@ public final class CompletionProposalComputerRegistry {
 			StringTokenizer inner= new StringTokenizer(tok.nextToken(), ":"); //$NON-NLS-1$
 			String id= inner.nextToken();
 			int rank= Integer.parseInt(inner.nextToken());
-			ordered.put(id, new Integer(rank));
+			ordered.put(id, Integer.valueOf(rank));
 		}
 		
 		List categories= new ArrayList();
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/ContentAssistHistory.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/ContentAssistHistory.java
index 1f65b15d4..5898d4145 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/ContentAssistHistory.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/ContentAssistHistory.java
@@ -395,7 +395,7 @@ public final class ContentAssistHistory {
 			int rank= 1;
 			for (Iterator it= rhsCache.iterator(); it.hasNext(); rank++) {
 				String type= (String) it.next();
-				history.put(type, new Integer(rank));
+				history.put(type, Integer.valueOf(rank));
 			}
 			return new RHSHistory(history);
 		}
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/JavaParameterListValidator.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/JavaParameterListValidator.java
index ec7ca822a..d2c846877 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/JavaParameterListValidator.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/java/JavaParameterListValidator.java
@@ -287,12 +287,12 @@ public class JavaParameterListValidator implements IContextInformationValidator,
 		final int length= code.length();
 	    int pos= 0;
 		List positions= new ArrayList();
-		positions.add(new Integer(-1));
+		positions.add(Integer.valueOf(-1));
 		while (pos < length && pos != -1) {
 			char ch= code.charAt(pos);
 			switch (ch) {
 	            case ',':
-		            positions.add(new Integer(pos));
+		            positions.add(Integer.valueOf(pos));
 		            break;
 	            case '<':
 	            	pos= code.indexOf('>', pos);
@@ -306,7 +306,7 @@ public class JavaParameterListValidator implements IContextInformationValidator,
 			if (pos != -1)
 				pos++;
 		}
-		positions.add(new Integer(length));
+		positions.add(Integer.valueOf(length));
 		
 		int[] fields= new int[positions.size()];
 		for (int i= 0; i < fields.length; i++)
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java
index 85c3a9f35..754a1d1f8 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java
@@ -525,7 +525,7 @@ public abstract class AbstractSpellDictionary implements ISpellDictionary {
 					}
 			} catch (IOException exception) {
 				if (line > 0) {
-					String message= Messages.format(JavaUIMessages.AbstractSpellingDictionary_encodingError, new Object[] { new Integer(line), url.toString() });
+					String message= Messages.format(JavaUIMessages.AbstractSpellingDictionary_encodingError, new Object[] { Integer.valueOf(line), url.toString() });
 					IStatus status= new Status(IStatus.ERROR, JavaScriptUI.ID_PLUGIN, IStatus.OK, message, exception);
 					JavaScriptPlugin.log(status);
 				} else
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorer.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorer.java
index fa2bc42a6..d09fcbe60 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorer.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorer.java
@@ -117,7 +117,7 @@ public class DialogPackageExplorer implements IMenuListener, ISelectionProvider,
                         if (excluded == 1)
                             return Messages.format(NewWizardMessages.DialogPackageExplorer_LabelProvider_SingleExcluded, text); 
                         else if (excluded > 1)
-                            return Messages.format(NewWizardMessages.DialogPackageExplorer_LabelProvider_MultiExcluded, new Object[] {text, new Integer(excluded)}); 
+                            return Messages.format(NewWizardMessages.DialogPackageExplorer_LabelProvider_MultiExcluded, new Object[] {text, Integer.valueOf(excluded)}); 
                     }
                 }
                 if (element instanceof IJavaScriptProject) {
@@ -130,7 +130,7 @@ public class DialogPackageExplorer implements IMenuListener, ISelectionProvider,
                             if (excluded == 1)
                                 return Messages.format(NewWizardMessages.DialogPackageExplorer_LabelProvider_SingleExcluded, text); 
                             else if (excluded > 1)
-                                return Messages.format(NewWizardMessages.DialogPackageExplorer_LabelProvider_MultiExcluded, new Object[] {text, new Integer(excluded)}); 
+                                return Messages.format(NewWizardMessages.DialogPackageExplorer_LabelProvider_MultiExcluded, new Object[] {text, Integer.valueOf(excluded)}); 
                         }
                     }
                 }
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java
index 4c61ee631..8e3b2c114 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java
@@ -306,7 +306,7 @@ public final class ConfigureWorkingSetAssignementAction extends SelectionDispatc
 					if (!modelElement.isGrayed())
 						return superText;
 					
-					return superText + Messages.format(WorkingSetMessages.ConfigureWorkingSetAssignementAction_XofY_label, new Object[] {new Integer(modelElement.getCheckCount()), new Integer(fElements.length)});
+					return superText + Messages.format(WorkingSetMessages.ConfigureWorkingSetAssignementAction_XofY_label, new Object[] {Integer.valueOf(modelElement.getCheckCount()), Integer.valueOf(fElements.length)});
 				}
 			};
 		}	
@@ -435,7 +435,7 @@ public final class ConfigureWorkingSetAssignementAction extends SelectionDispatc
 			}
 			dialog.setMessage(Messages.format(WorkingSetMessages.ConfigureWorkingSetAssignementAction_DialogMessage_specific, elementName));
 		} else {
-			dialog.setMessage(Messages.format(WorkingSetMessages.ConfigureWorkingSetAssignementAction_DialogMessage_multi, new Integer(elements.length)));
+			dialog.setMessage(Messages.format(WorkingSetMessages.ConfigureWorkingSetAssignementAction_DialogMessage_multi, Integer.valueOf(elements.length)));
 		}
 		if (dialog.open() == Window.OK) {
 			updateWorkingSets(dialog.getSelection(), dialog.getGrayed(), elements);
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/workingsets/ViewActionGroup.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/workingsets/ViewActionGroup.java
index 468088139..ba8689ddb 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/workingsets/ViewActionGroup.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/workingsets/ViewActionGroup.java
@@ -33,8 +33,8 @@ public class ViewActionGroup extends ActionGroup {
 	public static final int SHOW_WORKING_SETS= 2;
 	public static final String MODE_CHANGED= ViewActionGroup.class.getName() + ".mode_changed"; //$NON-NLS-1$
 	
-	private static final Integer INT_SHOW_PROJECTS= new Integer(SHOW_PROJECTS);
-	private static final Integer INT_SHOW_WORKING_SETS= new Integer(SHOW_WORKING_SETS);
+	private static final Integer INT_SHOW_PROJECTS= Integer.valueOf(SHOW_PROJECTS);
+	private static final Integer INT_SHOW_WORKING_SETS= Integer.valueOf(SHOW_WORKING_SETS);
 	
 	private IPropertyChangeListener fChangeListener;
 	
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptElementLabelProvider.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptElementLabelProvider.java
index 92c7c19dc..0d9c662c3 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptElementLabelProvider.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptElementLabelProvider.java
@@ -124,7 +124,7 @@ public class JavaScriptElementLabelProvider extends LabelProvider {
 	 * Currently the default is equivalent to
 	 * <code>SHOW_PARAMETERS | SHOW_OVERLAY_ICONS</code>.
 	 */
-	public final static int SHOW_DEFAULT= new Integer(SHOW_PARAMETERS | SHOW_OVERLAY_ICONS).intValue();
+	public final static int SHOW_DEFAULT= SHOW_PARAMETERS | SHOW_OVERLAY_ICONS;
 
 	private JavaElementImageProvider fImageLabelProvider;
 	
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptSourceFoldersAction.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptSourceFoldersAction.java
index e1e102c97..89bbbfc50 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptSourceFoldersAction.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptSourceFoldersAction.java
@@ -33,7 +33,7 @@ public class JavaScriptSourceFoldersAction extends JavaScriptLibrariesAction {
 	
 	public void run(IAction arg0) {
 		Map data = new HashMap();
-		data.put(BuildPathsPropertyPage.DATA_PAGE_INDEX, new Integer(BUILD_PATH_PAGE_INDEX));
+		data.put(BuildPathsPropertyPage.DATA_PAGE_INDEX, Integer.valueOf(BUILD_PATH_PAGE_INDEX));
 		String ID = arg0.getId();
 		String propertyPage = (String)PROPS_TO_IDS.get(ID);
 		
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptSuperTypeAction.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptSuperTypeAction.java
index 6a70390af..be00cfc51 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptSuperTypeAction.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/JavaScriptSuperTypeAction.java
@@ -33,7 +33,7 @@ public class JavaScriptSuperTypeAction extends JavaScriptLibrariesAction {
 	
 	public void run(IAction arg0) {
 		Map data = new HashMap();
-		data.put(BuildPathsPropertyPage.DATA_PAGE_INDEX, new Integer(BUILD_PATH_PAGE_INDEX));
+		data.put(BuildPathsPropertyPage.DATA_PAGE_INDEX, Integer.valueOf(BUILD_PATH_PAGE_INDEX));
 		String ID = arg0.getId();
 		String propertyPage = (String)PROPS_TO_IDS.get(ID);
 		
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/actions/ExternalizeStringsAction.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/actions/ExternalizeStringsAction.java
index fd81231da..0bf60ab61 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/actions/ExternalizeStringsAction.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/ui/actions/ExternalizeStringsAction.java
@@ -434,7 +434,7 @@ public class ExternalizeStringsAction extends SelectionDispatchAction {
 			super(parent);
 			setInput(Arrays.asList(input));
 			setTitle(ActionMessages.ExternalizeStringsAction_dialog_title);  
-			setMessage(Messages.format(ActionMessages.FindStringsToExternalizeAction_non_externalized, new Object[] {new Integer(count)} )); 
+			setMessage(Messages.format(ActionMessages.FindStringsToExternalizeAction_non_externalized, new Object[] {Integer.valueOf(count)} )); 
 			setContentProvider(new ArrayContentProvider());
 			setLabelProvider(createLabelProvider());
 		}
@@ -510,7 +510,7 @@ public class ExternalizeStringsAction extends SelectionDispatchAction {
 					String elementName= nlsel.cu.getResource().getFullPath().toString();
 					return Messages.format(
 						ActionMessages.FindStringsToExternalizeAction_foundStrings, 
-						new Object[] {new Integer(nlsel.count), elementName} );
+						new Object[] {Integer.valueOf(nlsel.count), elementName} );
 				}		
 				public Image getImage(Object element) {
 					return super.getImage(((NonNLSElement)element).cu);
diff --git a/development/org.eclipse.wst.jsdt.astview/src/org/eclipse/wst/jsdt/astview/views/ASTView.java b/development/org.eclipse.wst.jsdt.astview/src/org/eclipse/wst/jsdt/astview/views/ASTView.java
index 6a79f5095..0063723af 100644
--- a/development/org.eclipse.wst.jsdt.astview/src/org/eclipse/wst/jsdt/astview/views/ASTView.java
+++ b/development/org.eclipse.wst.jsdt.astview/src/org/eclipse/wst/jsdt/astview/views/ASTView.java
@@ -679,7 +679,7 @@ public class ASTView extends ViewPart implements IShowInSource {
 		TreeInfoCollector collector= new TreeInfoCollector(root);
 
 		String msg= "{0} ({1}).  Creation time: {2,number} ms.  Size: {3,number} nodes, {4,number} bytes (AST nodes only)."; //$NON-NLS-1$
-		Object[] args= { element.getElementName(), version, new Long(time),  new Integer(collector.getNumberOfNodes()), new Integer(collector.getSize())};
+		Object[] args= { element.getElementName(), version, new Long(time),  Integer.valueOf(collector.getNumberOfNodes()), Integer.valueOf(collector.getSize())};
 		setContentDescription(MessageFormat.format(msg, args));
 
 	}
diff --git a/development/org.eclipse.wst.jsdt.debug.chrome/src/org/eclipse/wst/jsdt/debug/internal/chrome/connect/TimeoutArgument.java b/development/org.eclipse.wst.jsdt.debug.chrome/src/org/eclipse/wst/jsdt/debug/internal/chrome/connect/TimeoutArgument.java
index 2d84a7a80..9364cbd09 100644
--- a/development/org.eclipse.wst.jsdt.debug.chrome/src/org/eclipse/wst/jsdt/debug/internal/chrome/connect/TimeoutArgument.java
+++ b/development/org.eclipse.wst.jsdt.debug.chrome/src/org/eclipse/wst/jsdt/debug/internal/chrome/connect/TimeoutArgument.java
@@ -26,7 +26,7 @@ public class TimeoutArgument implements IntegerArgument {
 	/**
 	 * default connecting timeout
 	 */
-	public static final Integer CONNECT_TIMEOUT = new Integer(30000);
+	public static final Integer CONNECT_TIMEOUT = Integer.valueOf(30000);
 	
 	/**
 	 * The timeout
diff --git a/development/org.eclipse.wst.jsdt.debug.jsd2/src/org/eclipse/wst/jsdt/debug/internal/jsd2/connect/TimeoutArgument.java b/development/org.eclipse.wst.jsdt.debug.jsd2/src/org/eclipse/wst/jsdt/debug/internal/jsd2/connect/TimeoutArgument.java
index 10ee7cc13..baf63c75b 100644
--- a/development/org.eclipse.wst.jsdt.debug.jsd2/src/org/eclipse/wst/jsdt/debug/internal/jsd2/connect/TimeoutArgument.java
+++ b/development/org.eclipse.wst.jsdt.debug.jsd2/src/org/eclipse/wst/jsdt/debug/internal/jsd2/connect/TimeoutArgument.java
@@ -26,7 +26,7 @@ public class TimeoutArgument implements IntegerArgument {
 	/**
 	 * default connecting timeout
 	 */
-	public static final Integer CONNECT_TIMEOUT = new Integer(30000);
+	public static final Integer CONNECT_TIMEOUT = Integer.valueOf(30000);
 	
 	/**
 	 * The timeout
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/compiler/regression/AbstractRegressionTest.java b/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/compiler/regression/AbstractRegressionTest.java
index 669f09d04..981738b6c 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/compiler/regression/AbstractRegressionTest.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/compiler/regression/AbstractRegressionTest.java
@@ -513,7 +513,7 @@ public abstract class AbstractRegressionTest extends AbstractCompilerTest
 			Integer count = (Integer) TESTS_COUNTERS.get(CURRENT_CLASS_NAME);
 			if (count != null) {
 				int newCount = count.intValue() - 1;
-				TESTS_COUNTERS.put(CURRENT_CLASS_NAME, new Integer(newCount));
+				TESTS_COUNTERS.put(CURRENT_CLASS_NAME, Integer.valueOf(newCount));
 				if (newCount == 0) {
 					if (DIFF_COUNTERS[0] != 0 || DIFF_COUNTERS[1] != 0
 							|| DIFF_COUNTERS[2] != 0) {
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/compiler/regression/JavadocTest.java b/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/compiler/regression/JavadocTest.java
index b398bff13..b8084b03d 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/compiler/regression/JavadocTest.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/compiler/regression/JavadocTest.java
@@ -546,7 +546,7 @@ public abstract class JavadocTest extends AbstractRegressionTest {
 			Integer count = (Integer)TESTS_COUNTERS.get(CURRENT_CLASS_NAME);
 			if (count != null) {
 				int newCount = count.intValue()-1;
-				TESTS_COUNTERS.put(CURRENT_CLASS_NAME, new Integer(newCount));
+				TESTS_COUNTERS.put(CURRENT_CLASS_NAME, Integer.valueOf(newCount));
 				if (newCount == 0) {
 					if (DIFF_COUNTERS[0]!=0 || DIFF_COUNTERS[1]!=0 || DIFF_COUNTERS[2]!=0) {
 						dualPrintln("===========================================================================");
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/util/AbstractCompilerTest.java b/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/util/AbstractCompilerTest.java
index e9a0378e6..966c81ba9 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/util/AbstractCompilerTest.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/util/AbstractCompilerTest.java
@@ -347,12 +347,12 @@ public class AbstractCompilerTest extends TestCase {
 		Class testClass;
 		if (testClasses.size() == 1) {
 			suite = new TestSuite(testClass = (Class)testClasses.get(0), complianceLevel);
-			TESTS_COUNTERS.put(testClass.getName(), new Integer(suite.countTestCases()));
+			TESTS_COUNTERS.put(testClass.getName(), Integer.valueOf(suite.countTestCases()));
 		} else {
 			suite = new TestSuite(complianceLevel);
 			for (int i = 0, length = testClasses.size(); i < length; i++) {
 				TestSuite innerSuite = new TestSuite(testClass = (Class)testClasses.get(i));
-				TESTS_COUNTERS.put(testClass.getName(), new Integer(innerSuite.countTestCases()));
+				TESTS_COUNTERS.put(testClass.getName(), Integer.valueOf(innerSuite.countTestCases()));
 				suite.addTest(innerSuite);
 			}
 		}
@@ -401,7 +401,7 @@ public class AbstractCompilerTest extends TestCase {
 		int newTestsNb = test.countTestCases();
 		if ((testsNb = (Integer) TESTS_COUNTERS.get(className)) != null)
 			newTestsNb += testsNb.intValue();
-		TESTS_COUNTERS.put(className, new Integer(newTestsNb));
+		TESTS_COUNTERS.put(className, Integer.valueOf(newTestsNb));
 		return test;
 	}
 
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTTest.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTTest.java
index dfb946219..5d0000baf 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTTest.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTTest.java
@@ -5164,7 +5164,7 @@ public class ASTTest extends org.eclipse.wst.jsdt.core.tests.junit.extension.Tes
 				int start = buffer.length();
 				buffer.append("(");
 				// push start position - popped by postVisit for same node
-				stack.add(new Integer(start));
+				stack.add(Integer.valueOf(start));
 			}
 			public void postVisit(ASTNode node) {
 				// pop start position placed there by preVisit
@@ -7181,11 +7181,11 @@ public class ASTTest extends org.eclipse.wst.jsdt.core.tests.junit.extension.Tes
 		Set s = new HashSet();
 		for (int i=0; i<all.length; i++) {
 			assertTrue(MIN <= all[i] && all[i] <= MAX);
-			s.add(new Integer(all[i]));
+			s.add(Integer.valueOf(all[i]));
 		}
 		assertTrue(s.size() == all.length);
 		// ensure that Integers really do compare properly with equals
-		assertTrue(new Integer(1).equals(new Integer(1)));
+		assertTrue(Integer.valueOf(1).equals(Integer.valueOf(1)));
 	}
 }
 
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/SortCompilationUnitElementsTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/SortCompilationUnitElementsTests.java
index ab20aa3eb..2c2124bf9 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/SortCompilationUnitElementsTests.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/SortCompilationUnitElementsTests.java
@@ -70,7 +70,7 @@ private void sortUnit(int apiLevel, IJavaScriptUnit unit, String expectedResult,
 //	if (testPositions) {
 //		for (int i = 0; i < initialSource.length(); i++) {
 //			if (!Character.isWhitespace(initialSource.charAt(i))) {
-//				arrayList.add(new Integer(i));
+//				arrayList.add(Integer.valueOf(i));
 //			}
 //		}
 //		final int length = arrayList.size();
@@ -111,7 +111,7 @@ private void sortUnit(int apiLevel, IJavaScriptUnit unit, String expectedResult,
 	if (testPositions) {
 		for (int i = 0; i < initialSource.length(); i++) {
 			if (!Character.isWhitespace(initialSource.charAt(i))) {
-				arrayList.add(new Integer(i));
+				arrayList.add(Integer.valueOf(i));
 			}
 		}
 		final int length = arrayList.size();
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/ASTRewritingMethodDeclTest.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/ASTRewritingMethodDeclTest.java
index 152b42c69..c1b3cd3dd 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/ASTRewritingMethodDeclTest.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/ASTRewritingMethodDeclTest.java
@@ -205,7 +205,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		
 		{ // insert return type, add second modifier
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(0);
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(Modifier.PUBLIC | Modifier.FINAL), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(Modifier.PUBLIC | Modifier.FINAL), null);
 		
 			Type newReturnType= astRoot.getAST().newPrimitiveType(PrimitiveType.FLOAT);
 			
@@ -216,7 +216,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		}
 		{ // insert return type, add (first) modifier
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(1);
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(Modifier.FINAL), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(Modifier.FINAL), null);
 			
 			Type newReturnType= astRoot.getAST().newPrimitiveType(PrimitiveType.FLOAT);
 			
@@ -228,7 +228,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		{ // insert return type, add second modifier with comments
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(2);
 			
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(Modifier.FINAL), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(Modifier.FINAL), null);
 			
 			Type newReturnType= astRoot.getAST().newPrimitiveType(PrimitiveType.FLOAT);
 			
@@ -240,7 +240,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		
 		{ // remove return type, add second modifier
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(3);
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(Modifier.PUBLIC | Modifier.FINAL), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(Modifier.PUBLIC | Modifier.FINAL), null);
 		
 			// from method to constructor 
 			rewrite.set(methodDecl, FunctionDeclaration.RETURN_TYPE_PROPERTY, null, null);
@@ -249,7 +249,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		}
 		{ // remove return type, add (first) modifier
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(4);
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(Modifier.FINAL), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(Modifier.FINAL), null);
 			
 			// from method to constructor 
 			rewrite.set(methodDecl, FunctionDeclaration.RETURN_TYPE_PROPERTY, null, null);
@@ -259,7 +259,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		{ // remove return type, add second modifier with comments
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(5);
 			
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(Modifier.FINAL), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(Modifier.FINAL), null);
 			
 			// from method to constructor 
 			rewrite.set(methodDecl, FunctionDeclaration.RETURN_TYPE_PROPERTY, null, null);
@@ -308,7 +308,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		
 		{ // insert return type, remove second modifier
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(0);
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(Modifier.PUBLIC), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(Modifier.PUBLIC), null);
 		
 			Type newReturnType= astRoot.getAST().newPrimitiveType(PrimitiveType.FLOAT);
 			
@@ -319,7 +319,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		}
 		{ // insert return type, remove (only) modifier
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(1);
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(0), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(0), null);
 			
 			Type newReturnType= astRoot.getAST().newPrimitiveType(PrimitiveType.FLOAT);
 			
@@ -331,7 +331,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		{ // insert return type, remove modifier with comments
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(2);
 			
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(0), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(0), null);
 			
 			Type newReturnType= astRoot.getAST().newPrimitiveType(PrimitiveType.FLOAT);
 			
@@ -343,7 +343,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		
 		{ // remove return type, remove second modifier
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(3);
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(Modifier.PUBLIC), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(Modifier.PUBLIC), null);
 		
 			// from method to constructor 
 			rewrite.set(methodDecl, FunctionDeclaration.RETURN_TYPE_PROPERTY, null, null);
@@ -352,7 +352,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		}
 		{ // remove return type, remove (only) modifier
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(4);
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(0), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(0), null);
 			
 			// from method to constructor 
 			rewrite.set(methodDecl, FunctionDeclaration.RETURN_TYPE_PROPERTY, null, null);
@@ -362,7 +362,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		{ // remove return type, remove modifier with comments
 			FunctionDeclaration methodDecl= (FunctionDeclaration) list.get(5);
 			
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(0), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(0), null);
 			
 			// from method to constructor 
 			rewrite.set(methodDecl, FunctionDeclaration.RETURN_TYPE_PROPERTY, null, null);
@@ -635,7 +635,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			FunctionDeclaration methodDecl= findMethodDeclaration(type, "gee");
 			
 			// change flags
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(0), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(0), null);
 			
 			List parameters= methodDecl.parameters();
 			assertTrue("must be 3 parameters", parameters.size() == 3);
@@ -796,7 +796,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			
 			// change flags
 			int newModifiers= Modifier.PUBLIC | Modifier.SYNCHRONIZED;
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(newModifiers), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(newModifiers), null);
 			
 			List parameters= methodDecl.parameters();
 			assertTrue("must be 3 parameters", parameters.size() == 3);
@@ -817,7 +817,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			
 			// change flags
 			int newModifiers= Modifier.PUBLIC | Modifier.SYNCHRONIZED | Modifier.STATIC;
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(newModifiers), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(newModifiers), null);
 			
 			List parameters= methodDecl.parameters();
 			assertTrue("must be 3 parameters", parameters.size() == 3);
@@ -1244,7 +1244,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			
 			// change flags
 			int newModifiers= Modifier.PUBLIC | Modifier.ABSTRACT;
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(newModifiers), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(newModifiers), null);
 			
 			Block body= methodDecl.getBody();
 			assertTrue("No body: gee", body != null);
@@ -1256,7 +1256,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			
 			// change flags
 			int newModifiers= Modifier.PRIVATE;
-			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, new Integer(newModifiers), null);
+			rewrite.set(methodDecl, FunctionDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(newModifiers), null);
 			
 			
 			Block body= methodDecl.getBody();
@@ -1308,7 +1308,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		{ // add extra dim, add throws
 			FunctionDeclaration methodDecl= findMethodDeclaration(type, "foo1");
 			
-			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(1), null);
+			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(1), null);
 			
 			Name newThrownException2= ast.newSimpleName("ArrayStoreException");
 			rewrite.getListRewrite(methodDecl, FunctionDeclaration.THROWN_EXCEPTIONS_PROPERTY).insertLast(newThrownException2, null);
@@ -1317,14 +1317,14 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		{ // add extra dim, remove throws
 			FunctionDeclaration methodDecl= findMethodDeclaration(type, "foo2");
 			
-			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(1), null);
+			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(1), null);
 			
 			rewrite.remove((ASTNode) methodDecl.thrownExceptions().get(0), null);			
 		}		
 		{ // remove extra dim, add throws
 			FunctionDeclaration methodDecl= findMethodDeclaration(type, "foo3");
 
-			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(1), null);
+			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(1), null);
 			
 			Name newThrownException2= ast.newSimpleName("ArrayStoreException");
 			rewrite.getListRewrite(methodDecl, FunctionDeclaration.THROWN_EXCEPTIONS_PROPERTY).insertLast(newThrownException2, null);
@@ -1333,7 +1333,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 		{ // add extra dim, remove throws
 			FunctionDeclaration methodDecl= findMethodDeclaration(type, "foo4");
 			
-			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(1), null);
+			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(1), null);
 			
 			rewrite.remove((ASTNode) methodDecl.thrownExceptions().get(0), null);			
 		}
@@ -1344,7 +1344,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			rewrite.getListRewrite(methodDecl, FunctionDeclaration.PARAMETERS_PROPERTY).insertLast(newParam1, null);
 
 			
-			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(4), null);
+			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(4), null);
 			
 			Name newThrownException2= ast.newSimpleName("ArrayStoreException");
 			rewrite.getListRewrite(methodDecl, FunctionDeclaration.THROWN_EXCEPTIONS_PROPERTY).insertLast(newThrownException2, null);
@@ -1355,7 +1355,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			
 			rewrite.remove((ASTNode) methodDecl.parameters().get(0), null);		
 			
-			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(4), null);
+			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(4), null);
 			
 			rewrite.remove((ASTNode) methodDecl.thrownExceptions().get(0), null);			
 		}
@@ -1530,7 +1530,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			
 			// add modifier
 			int newModifiers= Modifier.FINAL;
-			rewrite.set(decl, FieldDeclaration.MODIFIERS_PROPERTY, new Integer(newModifiers), null);
+			rewrite.set(decl, FieldDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(newModifiers), null);
 			
 			PrimitiveType newType= ast.newPrimitiveType(PrimitiveType.BOOLEAN);
 			rewrite.replace(decl.getType(), newType, null);
@@ -1547,7 +1547,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			
 			// add modifier
 			int newModifiers= Modifier.FINAL | Modifier.STATIC | Modifier.TRANSIENT;
-			rewrite.set(decl, FieldDeclaration.MODIFIERS_PROPERTY, new Integer(newModifiers), null);
+			rewrite.set(decl, FieldDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(newModifiers), null);
 			
 			List fragments= decl.fragments();
 			assertTrue("Number of fragments not 3", fragments.size() == 3);
@@ -1566,7 +1566,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			
 			// change modifier
 			int newModifiers= 0;
-			rewrite.set(decl, FieldDeclaration.MODIFIERS_PROPERTY, new Integer(newModifiers), null);
+			rewrite.set(decl, FieldDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(newModifiers), null);
 		}
 				
 		String preview= evaluateRewrite(cu, rewrite);
@@ -1611,7 +1611,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			
 			// add modifier
 			int newModifiers= Modifier.STATIC;
-			rewrite.set(initializer, Initializer.MODIFIERS_PROPERTY, new Integer(newModifiers), null);
+			rewrite.set(initializer, Initializer.MODIFIERS_PROPERTY, Integer.valueOf(newModifiers), null);
 			
 			
 			Block block= ast.newBlock();
@@ -1623,7 +1623,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			Initializer initializer= (Initializer) declarations.get(1);
 			
 			int newModifiers= 0;
-			rewrite.set(initializer, Initializer.MODIFIERS_PROPERTY, new Integer(newModifiers), null);
+			rewrite.set(initializer, Initializer.MODIFIERS_PROPERTY, Integer.valueOf(newModifiers), null);
 			
 		}
 				
@@ -1744,7 +1744,7 @@ public class ASTRewritingMethodDeclTest extends ASTRewritingTest {
 			FunctionDeclaration methodDecl= findMethodDeclaration(type, "DD");
 			
 			rewrite.set(methodDecl, FunctionDeclaration.CONSTRUCTOR_PROPERTY, Boolean.TRUE, null);
-			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, new Integer(0), null);
+			rewrite.set(methodDecl, FunctionDeclaration.EXTRA_DIMENSIONS_PROPERTY, Integer.valueOf(0), null);
 		}
 
 		String preview= evaluateRewrite(cu, rewrite);
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/ASTRewritingTrackingTest.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/ASTRewritingTrackingTest.java
index 51f80a6ea..c03a2a5a3 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/ASTRewritingTrackingTest.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/ASTRewritingTrackingTest.java
@@ -238,7 +238,7 @@ public class ASTRewritingTrackingTest extends ASTRewritingTest {
 		
 		// change modifier
 		int newModifiers= Modifier.STATIC | Modifier.TRANSIENT | Modifier.PRIVATE;
-		rewrite.set(field, FieldDeclaration.MODIFIERS_PROPERTY, new Integer(newModifiers), null);
+		rewrite.set(field, FieldDeclaration.MODIFIERS_PROPERTY, Integer.valueOf(newModifiers), null);
 								
 		String preview= evaluateRewrite(cu, rewrite);
 		
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/LineCommentOffsetsTest.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/LineCommentOffsetsTest.java
index 8b182bee5..718df8f5e 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/LineCommentOffsetsTest.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/rewrite/describing/LineCommentOffsetsTest.java
@@ -154,7 +154,7 @@ public class LineCommentOffsetsTest extends ASTRewritingTest {
 		for (int i= 0; i < content.length(); i++) {
 			char ch= content.charAt(i);
 			if (ch == 'Y') {
-				expectedOffsets.add(new Integer(i + 1));
+				expectedOffsets.add(Integer.valueOf(i + 1));
 			}
 		}
 		
@@ -205,7 +205,7 @@ public class LineCommentOffsetsTest extends ASTRewritingTest {
 		for (int i= 0; i < content.length(); i++) {
 			char ch= content.charAt(i);
 			if (ch == 'Y') {
-				expectedOffsets.add(new Integer(i + 1));
+				expectedOffsets.add(Integer.valueOf(i + 1));
 			}
 		}
 		
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/BreakpointRequestTests.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/BreakpointRequestTests.java
index ff1fc3114..20e6728a1 100644
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/BreakpointRequestTests.java
+++ b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/BreakpointRequestTests.java
@@ -36,7 +36,7 @@ public class BreakpointRequestTests extends RequestTest {
 	 */
 	public void testInvalidBreakpoint() throws Exception {
 		RhinoRequest request = new RhinoRequest(JSONConstants.BREAKPOINT);
-		request.getArguments().put(JSONConstants.BREAKPOINT_ID, new Integer("9999")); //$NON-NLS-1$
+		request.getArguments().put(JSONConstants.BREAKPOINT_ID, Integer.valueOf("9999")); //$NON-NLS-1$
 		debugSession.send(request);
 		Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
 		assertFalse(response.isSuccess());
@@ -64,7 +64,7 @@ public class BreakpointRequestTests extends RequestTest {
 	 */
 	public void testClearInvalidBreakpoint() throws Exception {
 		RhinoRequest request = new RhinoRequest(JSONConstants.CLEARBREAKPOINT);
-		request.getArguments().put(JSONConstants.BREAKPOINT_ID, new Integer("9999")); //$NON-NLS-1$
+		request.getArguments().put(JSONConstants.BREAKPOINT_ID, Integer.valueOf("9999")); //$NON-NLS-1$
 		debugSession.send(request);
 		Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
 		assertFalse(response.isSuccess());
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestLookupTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestLookupTest.java
index b3da3635e..cace4d148 100644
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestLookupTest.java
+++ b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestLookupTest.java
@@ -65,7 +65,7 @@ public class RequestLookupTest extends FrameRequestTests {
 							request.getArguments().put(JSONConstants.THREAD_ID, threadId);
 							request.getArguments().put(JSONConstants.CONTEXT_ID, contextId);
 							request.getArguments().put(JSONConstants.FRAME_ID, frameId);
-							request.getArguments().put(JSONConstants.REF, new Integer(0));
+							request.getArguments().put(JSONConstants.REF, Integer.valueOf(0));
 							debugSession.send(request);
 							response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
 							assertTrue(response.isSuccess());
@@ -122,7 +122,7 @@ public class RequestLookupTest extends FrameRequestTests {
 						assertTrue("There should be at least one frame", frames.size() > 0); //$NON-NLS-1$
 						Number frameId = (Number) frames.iterator().next();
 						
-						response = doLookup(debugSession, threadId, contextId, frameId, new Integer(0));
+						response = doLookup(debugSession, threadId, contextId, frameId, Integer.valueOf(0));
 						assertTrue(response.isSuccess());
 						Map map = (Map) response.getBody().get(JSONConstants.LOOKUP);
 						assertNotNull("There must be a lookup response", map); //$NON-NLS-1$
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestTest.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestTest.java
index e0882effc..46f4f916d 100644
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestTest.java
+++ b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/RequestTest.java
@@ -245,7 +245,7 @@ public abstract class RequestTest extends TestCase {
 					for (int i = 0; i < adds.length; i++) {
 						request = new RhinoRequest(JSONConstants.SETBREAKPOINT);
 						request.getArguments().put(JSONConstants.SCRIPT_ID, scriptId);
-						request.getArguments().put(JSONConstants.LINE, new Integer(adds[i]));
+						request.getArguments().put(JSONConstants.LINE, Integer.valueOf(adds[i]));
 						debugSession.send(request);
 						response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
 						assertTrue(testName()+": the request to set a breakpoint on line ["+adds[i]+"] was not successful", response.isSuccess()); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ThreadRequestTests.java b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ThreadRequestTests.java
index 56c851336..2ccd0c280 100644
--- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ThreadRequestTests.java
+++ b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/src/org/eclipse/wst/jsdt/debug/rhino/tests/ThreadRequestTests.java
@@ -44,7 +44,7 @@ public class ThreadRequestTests extends RequestTest {
 	 */
 	public void testInvalidThread() throws Exception {
 		RhinoRequest request = new RhinoRequest("context"); //$NON-NLS-1$
-		request.getArguments().put(JSONConstants.THREAD_ID, new Integer("9999")); //$NON-NLS-1$
+		request.getArguments().put(JSONConstants.THREAD_ID, Integer.valueOf("9999")); //$NON-NLS-1$
 		debugSession.send(request);
 		Response response = debugSession.receiveResponse(request.getSequence(), VirtualMachine.DEFAULT_TIMEOUT);
 		assertFalse(response.isSuccess());
diff --git a/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/contentassist/ContentAssistTestUtilities.java b/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/contentassist/ContentAssistTestUtilities.java
index 9e5803b9a..ea9e74b22 100644
--- a/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/contentassist/ContentAssistTestUtilities.java
+++ b/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/contentassist/ContentAssistTestUtilities.java
@@ -427,7 +427,7 @@ public class ContentAssistTestUtilities {
 		viewer.setSelectedRange(offset, 0);
 		
 		// Invoke insertProposal of CompletionProposalPopup
-		privateInsertProposalMethod.invoke(objPopup, new Object[]{pages[0][0], new Character((char) 0), new Integer(524288), new Integer(offset)});
+		privateInsertProposalMethod.invoke(objPopup, new Object[]{pages[0][0], new Character((char) 0), Integer.valueOf(524288), Integer.valueOf(offset)});
 		
 		// Get result of inserted proposal in the Editor
 		String strAfterInsert = viewer.getDocument().get();
author	gdesaintmartinlacaze	2015-02-18 15:33:06 +0000
committer	vrubezhny	2015-02-26 16:13:48 +0000
commit	9b373e0dcc12b8af3785377cd0b0dd9742d1140f (patch)
tree	c06a42f2d8469a51fe0e3d66190ab07397142103
parent	5c72d6cc70b8231bf92b434e4ce03fcb5083193a (diff)
download	webtools.jsdt-9b373e0dcc12b8af3785377cd0b0dd9742d1140f.tar.gz webtools.jsdt-9b373e0dcc12b8af3785377cd0b0dd9742d1140f.tar.xz webtools.jsdt-9b373e0dcc12b8af3785377cd0b0dd9742d1140f.zip