Replace deprecated Wrapper constructors with valueOfI20200317-1800

new Integer, new Long are deprecated and the valueOf method should be
used

Change-Id: I1f963399e3f729ea012d0d9bc2ed8ae5d0fce302
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

62 files changed, 162 insertions, 170 deletions

diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java
index d611d337e..55580e275 100644
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java
+++ b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java
@@ -113,29 +113,29 @@ public class EventRequestTest extends AbstractJDITest {
 	 */
 	public void testJDIProperties() {
 		EventRequest request = fRequests.get(0);
-		request.putProperty(new Integer(0), "prop1");
-		String prop = (String) request.getProperty(new Integer(0));
+		request.putProperty(Integer.valueOf(0), "prop1");
+		String prop = (String) request.getProperty(Integer.valueOf(0));
 		assertTrue("1", prop.equals("prop1"));
 
-		request.putProperty(new Integer(0), null);
-		prop = (String) request.getProperty(new Integer(0));
+		request.putProperty(Integer.valueOf(0), null);
+		prop = (String) request.getProperty(Integer.valueOf(0));
 		assertTrue("2", prop == null);
 
-		request.putProperty(new Integer(0), "prop2");
-		request.putProperty(new Integer(0), "prop3");
-		prop = (String) request.getProperty(new Integer(0));
+		request.putProperty(Integer.valueOf(0), "prop2");
+		request.putProperty(Integer.valueOf(0), "prop3");
+		prop = (String) request.getProperty(Integer.valueOf(0));
 		assertTrue("3", prop.equals("prop3"));
 
-		request.putProperty(new Integer(0), null);
-		prop = (String) request.getProperty(new Integer(0));
+		request.putProperty(Integer.valueOf(0), null);
+		prop = (String) request.getProperty(Integer.valueOf(0));
 		assertTrue("4", prop == null);
 
-		request.putProperty(new Integer(1), null);
-		prop = (String) request.getProperty(new Integer(1));
+		request.putProperty(Integer.valueOf(1), null);
+		prop = (String) request.getProperty(Integer.valueOf(1));
 		assertTrue("5", prop == null);
 
-		request.putProperty(new Integer(1), "prop1");
-		prop = (String) request.getProperty(new Integer(1));
+		request.putProperty(Integer.valueOf(1), "prop1");
+		prop = (String) request.getProperty(Integer.valueOf(1));
 		assertTrue("6", prop.equals("prop1"));
 
 	}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
index 93d8c233c..8df96e299 100644
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
+++ b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
@@ -128,7 +128,7 @@ public class MainClass extends Date implements Runnable, Printable {
 	 */
 	private static String invoke1(int x, Object o) {
 		if (o == null) {
-			return (new Integer(x)).toString();
+			return (Integer.valueOf(x)).toString();
 		} else {
 			return "";
 		}
@@ -397,7 +397,7 @@ public class MainClass extends Date implements Runnable, Printable {
 			foo();
 		}
 		else if(eventType.equals("argvalues")) {
-			argValues("teststr", 5, new Double(1.33));
+			argValues("teststr", 5, Double.valueOf(1.33));
 		}
 		else if(eventType.equals("forcereturn2")) {
 			printNumber(System.out, 1);
diff --git a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
index e663ad98b..a542f2cad 100644
--- a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.debug.tests; singleton:=true
-Bundle-Version: 3.11.800.qualifier
+Bundle-Version: 3.11.900.qualifier
 Bundle-ClassPath: javadebugtests.jar
 Bundle-Activator: org.eclipse.jdt.debug.testplugin.JavaTestPlugin
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.jdt.debug.tests/pom.xml b/org.eclipse.jdt.debug.tests/pom.xml
index c98f6621e..987499260 100644
--- a/org.eclipse.jdt.debug.tests/pom.xml
+++ b/org.eclipse.jdt.debug.tests/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.debug.tests</artifactId>
-  <version>3.11.800-SNAPSHOT</version>
+  <version>3.11.900-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/PListParserTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/PListParserTests.java
index 5f382df8a..174e63f82 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/PListParserTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/PListParserTests.java
@@ -62,7 +62,7 @@ public class PListParserTests extends AbstractDebugTest {
 			map.put("JVMPlatformVersion", "1.5");
 			map.put("JVMVersion", "1.5.0_24");
 			map.put("test", Boolean.FALSE);
-			map.put("testint", new Integer(42));
+			map.put("testint", Integer.valueOf(42));
 			assertEquals("Incorrect values parsed", map, jres[0]);
 
 			map = new HashMap<>();
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/MockReorgQueries.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/MockReorgQueries.java
index 5caa30d25..5a2b799d4 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/MockReorgQueries.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/MockReorgQueries.java
@@ -36,7 +36,7 @@ public class MockReorgQueries implements IReorgQueries {
 	}
 
 	private void run(int queryID) {
-		fQueriesRun.add(new Integer(queryID));
+		fQueriesRun.add(Integer.valueOf(queryID));
 	}
 
 	//List<Integer>
diff --git a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
index 532ef2262..d2742d7c6 100644
--- a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.debug.ui; singleton:=true
-Bundle-Version: 3.10.600.qualifier
+Bundle-Version: 3.10.700.qualifier
 Bundle-Activator: org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.jdt.debug.ui/pom.xml b/org.eclipse.jdt.debug.ui/pom.xml
index c56401a16..ad90fc883 100644
--- a/org.eclipse.jdt.debug.ui/pom.xml
+++ b/org.eclipse.jdt.debug.ui/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.debug.ui</artifactId>
-  <version>3.10.600-SNAPSHOT</version>
+  <version>3.10.700-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <properties>
     <code.ignoredWarnings>-warn:+resource,-deprecation,unavoidableGenericProblems</code.ignoredWarnings>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java
index 091cc2157..374512a19 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java
@@ -244,7 +244,7 @@ public class JavaConnectTab extends AbstractJavaMainTab implements IPropertyChan
 						editor.getPreferenceStore().setValue(key, Boolean.valueOf(value).booleanValue());
 					}
 					else if (arg instanceof Connector.IntegerArgument) {
-						editor.getPreferenceStore().setValue(key, new Integer(value).intValue());
+						editor.getPreferenceStore().setValue(key, Integer.parseInt(value));
 					}
 					editor.load();
 				}
@@ -279,7 +279,7 @@ public class JavaConnectTab extends AbstractJavaMainTab implements IPropertyChan
 				attrMap.put(key, Boolean.valueOf(editor.getPreferenceStore().getBoolean(key)).toString());
 			}
 			else if (arg instanceof Connector.IntegerArgument) {
-				attrMap.put(key, new Integer(editor.getPreferenceStore().getInt(key)).toString());
+				attrMap.put(key, Integer.valueOf(editor.getPreferenceStore().getInt(key)).toString());
 			}
 		}
 		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CONNECT_MAP, attrMap);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java
index c2e5adf41..82e1ce50a 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java
@@ -247,8 +247,8 @@ public class BreakpointUtils {
 	 */
 	public static void addJavaBreakpointAttributesWithMemberDetails(Map<String, Object> attributes, IJavaElement element, int memberStart, int memberEnd) {
 		addJavaBreakpointAttributes(attributes, element);
-		attributes.put(MEMBER_START, new Integer(memberStart));
-		attributes.put(MEMBER_END, new Integer(memberEnd));
+		attributes.put(MEMBER_START, Integer.valueOf(memberStart));
+		attributes.put(MEMBER_END, Integer.valueOf(memberEnd));
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
index 49f06cfab..40d629287 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
@@ -656,7 +656,7 @@ public class JDIModelPresentation extends LabelProvider implements IDebugModelPr
 		char charValue= (char)longValue;
 		StringBuilder charText = new StringBuilder();
 		if (Character.getType(charValue) == Character.CONTROL) {
-			Character ctrl = new Character((char) (charValue + 64));
+			Character ctrl = Character.valueOf((char) (charValue + 64));
 			charText.append('^');
 			charText.append(ctrl);
 			switch (charValue) { // common use
@@ -670,7 +670,7 @@ public class JDIModelPresentation extends LabelProvider implements IDebugModelPr
 				case 127: charText.append(" (DEL)"); break; //$NON-NLS-1$
 			}
 		} else {
-			charText.append(new Character(charValue));
+			charText.append(Character.valueOf(charValue));
 		}
 		return charText.toString();
 	}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java
index 9045a106b..a6e14ce61 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java
@@ -171,13 +171,13 @@ public class JavaDebugPreferencePage extends PreferencePage implements IWorkbenc
 		fTimeoutText.setPage(this);
 		fTimeoutText.setValidateStrategy(StringFieldEditor.VALIDATE_ON_KEY_STROKE);
 		fTimeoutText.setValidRange(JDIDebugModel.DEF_REQUEST_TIMEOUT, Integer.MAX_VALUE);
-		fTimeoutText.setErrorMessage(NLS.bind(DebugUIMessages.JavaDebugPreferencePage_Value_must_be_a_valid_integer_greater_than__0__ms_1, new Object[] {new Integer(JDIDebugModel.DEF_REQUEST_TIMEOUT)}));
+		fTimeoutText.setErrorMessage(NLS.bind(DebugUIMessages.JavaDebugPreferencePage_Value_must_be_a_valid_integer_greater_than__0__ms_1, new Object[] {Integer.valueOf(JDIDebugModel.DEF_REQUEST_TIMEOUT)}));
 		fTimeoutText.load();
 		fConnectionTimeoutText = new JavaDebugIntegerFieldEditor(JavaRuntime.PREF_CONNECT_TIMEOUT, DebugUIMessages.JavaDebugPreferencePage__Launch_timeout__ms___1, space);
 		fConnectionTimeoutText.setPage(this);
 		fConnectionTimeoutText.setValidateStrategy(StringFieldEditor.VALIDATE_ON_KEY_STROKE);
 		fConnectionTimeoutText.setValidRange(JavaRuntime.DEF_CONNECT_TIMEOUT, Integer.MAX_VALUE);
-		fConnectionTimeoutText.setErrorMessage(NLS.bind(DebugUIMessages.JavaDebugPreferencePage_Value_must_be_a_valid_integer_greater_than__0__ms_1, new Object[] {new Integer(JavaRuntime.DEF_CONNECT_TIMEOUT)}));
+		fConnectionTimeoutText.setErrorMessage(NLS.bind(DebugUIMessages.JavaDebugPreferencePage_Value_must_be_a_valid_integer_greater_than__0__ms_1, new Object[] {Integer.valueOf(JavaRuntime.DEF_CONNECT_TIMEOUT)}));
 		fConnectionTimeoutText.load();
 
 		SWTFactory.createVerticalSpacer(composite, 1);
@@ -200,7 +200,7 @@ public class JavaDebugPreferencePage extends PreferencePage implements IWorkbenc
 		fShowStepTimeoutText.setValidateStrategy(StringFieldEditor.VALIDATE_ON_KEY_STROKE);
 		fShowStepTimeoutText.setValidRange(-1, Integer.MAX_VALUE);
 		fShowStepTimeoutText.setErrorMessage(NLS.bind(DebugUIMessages.JavaDebugPreferencePage_Value_must_be_a_valid_integer_greater_than__0__ms_1, new Object[] {
-				new Integer(-1) }));
+				Integer.valueOf(-1) }));
 		fShowStepTimeoutText.load();
 
 		SWTFactory.createVerticalSpacer(composite, 1);
@@ -293,14 +293,14 @@ public class JavaDebugPreferencePage extends PreferencePage implements IWorkbenc
 			fPerformHCRWithCompilationErrors.setSelection(prefs.getBoolean(JDIDebugModel.PREF_HCR_WITH_COMPILATION_ERRORS, true));
 			fShowStepResult.setSelection(prefs.getBoolean(JDIDebugModel.PREF_SHOW_STEP_RESULT, true));
 			fShowStepResultRemote.setSelection(prefs.getBoolean(JDIDebugModel.PREF_SHOW_STEP_RESULT_REMOTE, true));
-			fShowStepTimeoutText.setStringValue(new Integer(prefs.getInt(JDIDebugModel.PREF_SHOW_STEP_RESULT, JDIDebugModel.DEF_SHOW_STEP_TIMEOUT)).toString());
-			fTimeoutText.setStringValue(new Integer(prefs.getInt(JDIDebugModel.PREF_REQUEST_TIMEOUT, JDIDebugModel.DEF_REQUEST_TIMEOUT)).toString());
+			fShowStepTimeoutText.setStringValue(Integer.valueOf(prefs.getInt(JDIDebugModel.PREF_SHOW_STEP_RESULT, JDIDebugModel.DEF_SHOW_STEP_TIMEOUT)).toString());
+			fTimeoutText.setStringValue(Integer.valueOf(prefs.getInt(JDIDebugModel.PREF_REQUEST_TIMEOUT, JDIDebugModel.DEF_REQUEST_TIMEOUT)).toString());
 			fFilterUnrelatedBreakpoints.setSelection(prefs.getBoolean(JDIDebugModel.PREF_FILTER_BREAKPOINTS_FROM_UNRELATED_SOURCES, true));
 			fAdvancedSourcelookup.setSelection(prefs.getBoolean(JDIDebugPlugin.PREF_ENABLE_ADVANCED_SOURCELOOKUP, true));
 		}
 		prefs = DefaultScope.INSTANCE.getNode(LaunchingPlugin.ID_PLUGIN);
 		if(prefs != null) {
-			fConnectionTimeoutText.setStringValue(new Integer(prefs.getInt(JavaRuntime.PREF_CONNECT_TIMEOUT,JavaRuntime.DEF_CONNECT_TIMEOUT)).toString());
+			fConnectionTimeoutText.setStringValue(Integer.valueOf(prefs.getInt(JavaRuntime.PREF_CONNECT_TIMEOUT,JavaRuntime.DEF_CONNECT_TIMEOUT)).toString());
 			fOnlyIncludeExportedEntries.setSelection(prefs.getBoolean(JavaRuntime.PREF_ONLY_INCLUDE_EXPORTED_CLASSPATH_ENTRIES, false));
 		}
 		super.performDefaults();
@@ -335,13 +335,13 @@ public class JavaDebugPreferencePage extends PreferencePage implements IWorkbenc
 		fPerformHCRWithCompilationErrors.setSelection(prefs.getBoolean(bundleId, JDIDebugModel.PREF_HCR_WITH_COMPILATION_ERRORS, true, null));
 		fShowStepResult.setSelection(prefs.getBoolean(bundleId, JDIDebugModel.PREF_SHOW_STEP_RESULT, true, null));
 		fShowStepResultRemote.setSelection(prefs.getBoolean(bundleId, JDIDebugModel.PREF_SHOW_STEP_RESULT_REMOTE, false, null));
-		fShowStepTimeoutText.setStringValue(new Integer(prefs.getInt(bundleId, JDIDebugModel.PREF_SHOW_STEP_TIMEOUT, JDIDebugModel.DEF_SHOW_STEP_TIMEOUT, null)).toString());
-		fTimeoutText.setStringValue(new Integer(prefs.getInt(bundleId, JDIDebugModel.PREF_REQUEST_TIMEOUT, JDIDebugModel.DEF_REQUEST_TIMEOUT, null)).toString());
+		fShowStepTimeoutText.setStringValue(Integer.valueOf(prefs.getInt(bundleId, JDIDebugModel.PREF_SHOW_STEP_TIMEOUT, JDIDebugModel.DEF_SHOW_STEP_TIMEOUT, null)).toString());
+		fTimeoutText.setStringValue(Integer.valueOf(prefs.getInt(bundleId, JDIDebugModel.PREF_REQUEST_TIMEOUT, JDIDebugModel.DEF_REQUEST_TIMEOUT, null)).toString());
 		fFilterUnrelatedBreakpoints.setSelection(prefs.getBoolean(bundleId, JDIDebugModel.PREF_FILTER_BREAKPOINTS_FROM_UNRELATED_SOURCES, true, null));
 		fAdvancedSourcelookup.setSelection(prefs.getBoolean(bundleId, JDIDebugPlugin.PREF_ENABLE_ADVANCED_SOURCELOOKUP, true, null));
 
 		bundleId = LaunchingPlugin.ID_PLUGIN;
-		fConnectionTimeoutText.setStringValue(new Integer(prefs.getInt(bundleId, JavaRuntime.PREF_CONNECT_TIMEOUT, JavaRuntime.DEF_CONNECT_TIMEOUT, null)).toString());
+		fConnectionTimeoutText.setStringValue(Integer.valueOf(prefs.getInt(bundleId, JavaRuntime.PREF_CONNECT_TIMEOUT, JavaRuntime.DEF_CONNECT_TIMEOUT, null)).toString());
 		fOnlyIncludeExportedEntries.setSelection(prefs.getBoolean(bundleId, JavaRuntime.PREF_ONLY_INCLUDE_EXPORTED_CLASSPATH_ENTRIES, false, null));
 	}
 
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java
index bf68392bb..987fcdfd0 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java
@@ -192,7 +192,7 @@ public class StandardJavaBreakpointEditor extends AbstractJavaBreakpointEditor {
 			enabled = true;
 			int hitCount = breakpoint.getHitCount();
 			if (hitCount > 0) {
-				text = new Integer(hitCount).toString();
+				text = Integer.valueOf(hitCount).toString();
 				hasHitCount = true;
 			}
 			suspendThread= breakpoint.getSuspendPolicy() == IJavaBreakpoint.SUSPEND_THREAD;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableCellModifier.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableCellModifier.java
index ab829a5ec..31ba1ecb7 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableCellModifier.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableCellModifier.java
@@ -68,9 +68,9 @@ public class JavaVariableCellModifier extends DefaultVariableCellModifier {
                 if (isBoolean(var)) {
                     try {
                         if (var.getValue().getValueString().equals(Boolean.toString(true))) {
-                            return new Integer(0);
+                            return Integer.valueOf(0);
                         }
-                        return new Integer(1);
+                        return Integer.valueOf(1);
                     } catch (DebugException e) {
                     }
                 }
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayAccess.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayAccess.java
index 1ae627cff..dfa6e60bf 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayAccess.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/ArrayAccess.java
@@ -45,7 +45,7 @@ public class ArrayAccess extends ArrayInstruction {
 							IStatus.OK,
 							MessageFormat
 									.format(InstructionsEvaluationMessages.ArrayAccess_illegal_index,
-											new Object[] { new Integer(index) }),
+											new Object[] { Integer.valueOf(index) }),
 							null));
 		}
 		push(array.getVariable(index));
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java
index d0cc53a70..c5d75f411 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java
@@ -57,19 +57,19 @@ public class PlusOperator extends BinaryOperator {
 		case T_boolean:
 			return Boolean.valueOf(primitiveValue.getBooleanValue()).toString();
 		case T_byte:
-			return new Integer(primitiveValue.getByteValue()).toString();
+			return Integer.valueOf(primitiveValue.getByteValue()).toString();
 		case T_char:
-			return new Character(primitiveValue.getCharValue()).toString();
+			return Character.valueOf(primitiveValue.getCharValue()).toString();
 		case T_double:
-			return new Double(primitiveValue.getDoubleValue()).toString();
+			return Double.valueOf(primitiveValue.getDoubleValue()).toString();
 		case T_float:
-			return new Float(primitiveValue.getFloatValue()).toString();
+			return Float.valueOf(primitiveValue.getFloatValue()).toString();
 		case T_int:
-			return new Integer(primitiveValue.getIntValue()).toString();
+			return Integer.valueOf(primitiveValue.getIntValue()).toString();
 		case T_long:
-			return new Long(primitiveValue.getLongValue()).toString();
+			return Long.valueOf(primitiveValue.getLongValue()).toString();
 		case T_short:
-			return new Integer(primitiveValue.getShortValue()).toString();
+			return Integer.valueOf(primitiveValue.getShortValue()).toString();
 		}
 		return NULL;
 	}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ByteValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ByteValueImpl.java
index 8a4ba207c..a9b223efd 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ByteValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ByteValueImpl.java
@@ -82,7 +82,7 @@ public class ByteValueImpl extends PrimitiveValueImpl implements ByteValue, Comp
 			throws IOException {
 		VirtualMachineImpl vmImpl = target.virtualMachineImpl();
 		byte value = target.readByte("byteValue", in); //$NON-NLS-1$
-		return new ByteValueImpl(vmImpl, new Byte(value));
+		return new ByteValueImpl(vmImpl, Byte.valueOf(value));
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/CharValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/CharValueImpl.java
index d96e3acd1..7409467bb 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/CharValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/CharValueImpl.java
@@ -77,7 +77,7 @@ public class CharValueImpl extends PrimitiveValueImpl implements CharValue, Comp
 			throws IOException {
 		VirtualMachineImpl vmImpl = target.virtualMachineImpl();
 		char value = target.readChar("charValue", in); //$NON-NLS-1$
-		return new CharValueImpl(vmImpl, new Character(value));
+		return new CharValueImpl(vmImpl, Character.valueOf(value));
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/DoubleValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/DoubleValueImpl.java
index 81bbba549..5a2a303f3 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/DoubleValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/DoubleValueImpl.java
@@ -77,7 +77,7 @@ public class DoubleValueImpl extends PrimitiveValueImpl implements DoubleValue,
 			throws IOException {
 		VirtualMachineImpl vmImpl = target.virtualMachineImpl();
 		double value = target.readDouble("doubleValue", in); //$NON-NLS-1$
-		return new DoubleValueImpl(vmImpl, new Double(value));
+		return new DoubleValueImpl(vmImpl, Double.valueOf(value));
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FloatValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FloatValueImpl.java
index b0f9da9a6..ca4e29d8a 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FloatValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/FloatValueImpl.java
@@ -77,7 +77,7 @@ public class FloatValueImpl extends PrimitiveValueImpl implements FloatValue, Co
 			throws IOException {
 		VirtualMachineImpl vmImpl = target.virtualMachineImpl();
 		float value = target.readFloat("floatValue", in); //$NON-NLS-1$
-		return new FloatValueImpl(vmImpl, new Float(value));
+		return new FloatValueImpl(vmImpl, Float.valueOf(value));
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/IntegerValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/IntegerValueImpl.java
index d222bfa06..ffa52ba66 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/IntegerValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/IntegerValueImpl.java
@@ -77,7 +77,7 @@ public class IntegerValueImpl extends PrimitiveValueImpl implements IntegerValue
 			throws IOException {
 		VirtualMachineImpl vmImpl = target.virtualMachineImpl();
 		int value = target.readInt("integerValue", in); //$NON-NLS-1$
-		return new IntegerValueImpl(vmImpl, new Integer(value));
+		return new IntegerValueImpl(vmImpl, Integer.valueOf(value));
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LongValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LongValueImpl.java
index 9e5d49acf..15dbdc595 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LongValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/LongValueImpl.java
@@ -77,7 +77,7 @@ public class LongValueImpl extends PrimitiveValueImpl implements LongValue {
 			throws IOException {
 		VirtualMachineImpl vmImpl = target.virtualMachineImpl();
 		long value = target.readLong("longValue", in); //$NON-NLS-1$
-		return new LongValueImpl(vmImpl, new Long(value));
+		return new LongValueImpl(vmImpl, Long.valueOf(value));
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java
index 835cb9e9c..84f955908 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/MethodImpl.java
@@ -136,7 +136,7 @@ public class MethodImpl extends TypeComponentImpl implements Method, Locatable {
 		}
 		getLineTable();
 
-		return fLineToCodeIndexes.get(new Integer(line));
+		return fLineToCodeIndexes.get(Integer.valueOf(line));
 	}
 
 	/**
@@ -186,9 +186,9 @@ public class MethodImpl extends TypeComponentImpl implements Method, Locatable {
 			fJavaStratumLineNumberTable = new int[nrOfElements];
 			for (int i = 0; i < nrOfElements; i++) {
 				long lineCodeIndex = readLong("code index", replyData); //$NON-NLS-1$
-				Long lineCodeIndexLong = new Long(lineCodeIndex);
+				Long lineCodeIndexLong = Long.valueOf(lineCodeIndex);
 				int lineNr = readInt("line nr", replyData); //$NON-NLS-1$
-				Integer lineNrInt = new Integer(lineNr);
+				Integer lineNrInt = Integer.valueOf(lineNr);
 
 				// Add entry to code-index to line mapping.
 				fCodeIndexToLine.put(lineCodeIndexLong, lineNrInt);
@@ -231,14 +231,14 @@ public class MethodImpl extends TypeComponentImpl implements Method, Locatable {
 		long index = lineCodeIndex;
 		// Search for the line where this code index is located.
 		do {
-			lineCodeIndexObj = new Long(index);
+			lineCodeIndexObj = Long.valueOf(index);
 			lineNrObj = javaStratumCodeIndexToLine().get(lineCodeIndexObj);
 		} while (lineNrObj == null && --index >= fLowestValidCodeIndex);
 		if (lineNrObj == null) {
 			if (lineCodeIndex >= fLowestValidCodeIndex) {
 				index = lineCodeIndex;
 				do {
-					lineCodeIndexObj = new Long(index);
+					lineCodeIndexObj = Long.valueOf(index);
 					lineNrObj = javaStratumCodeIndexToLine().get(lineCodeIndexObj);
 				} while (lineNrObj == null && ++index <= fHighestValidCodeIndex);
 				if (lineNrObj != null) {
@@ -467,7 +467,7 @@ public class MethodImpl extends TypeComponentImpl implements Method, Locatable {
 			return null;
 		}
 		try {
-			Integer lineNrInt = javaStratumCodeIndexToLine().get(new Long(index));
+			Integer lineNrInt = javaStratumCodeIndexToLine().get(Long.valueOf(index));
 			if (lineNrInt == null) {
 				throw new AbsentInformationException(MessageFormat.format(JDIMessages.MethodImpl_No_valid_location_at_the_specified_code_index__0__2, new Object[] { Long.toString(index) }));
 			}
@@ -897,7 +897,7 @@ public class MethodImpl extends TypeComponentImpl implements Method, Locatable {
 				//See http://docs.oracle.com/javase/6/docs/platform/jpda/jdwp/jdwp-protocol.html#JDWP_Method_LineTable for more information
 				continue;
 			}
-			if (position == 0 || !tmpLocations.contains(new Long(fCodeIndexTable[position - 1]))) {
+			if (position == 0 || !tmpLocations.contains(Long.valueOf(fCodeIndexTable[position - 1]))) {
 				locations.add(new LocationImpl(virtualMachineImpl(), this, index));
 			}
 		}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java
index 2c85a928c..4b9fd2846 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java
@@ -137,7 +137,7 @@ public abstract class ReferenceTypeImpl extends TypeImpl implements
 		 */
 		public void addLineInfo(int inputLine, int outputStartLine,
 				int outputLineRange) {
-			Integer key = new Integer(inputLine);
+			Integer key = Integer.valueOf(inputLine);
 			List<int[]> outputLines = fLineInfo.get(key);
 			if (outputLines == null) {
 				outputLines = new ArrayList<>();
@@ -156,7 +156,7 @@ public abstract class ReferenceTypeImpl extends TypeImpl implements
 		 */
 		public List<Integer> getOutputLinesForLine(int lineNumber) {
 			List<Integer> list = new ArrayList<>();
-			List<int[]> outputLines = fLineInfo.get(new Integer(lineNumber));
+			List<int[]> outputLines = fLineInfo.get(Integer.valueOf(lineNumber));
 			if (outputLines != null) {
 				for (int[] info : outputLines) {
 					int outputLineNumber = info[0];
@@ -165,7 +165,7 @@ public abstract class ReferenceTypeImpl extends TypeImpl implements
 						length = length + 1;
 					}
 					for (int i = 0; i < length; i++) {
-						list.add(new Integer(outputLineNumber++));
+						list.add(Integer.valueOf(outputLineNumber++));
 					}
 				}
 			}
@@ -313,7 +313,7 @@ public abstract class ReferenceTypeImpl extends TypeImpl implements
 		 */
 		private void addLineInfoToMap(int inputStartLine, int lineFileId,
 				int outputStartLine) {
-			Integer key = new Integer(outputStartLine);
+			Integer key = Integer.valueOf(outputStartLine);
 			List<int[]> inputLines = fOutputLineToInputLine.get(key);
 			if (inputLines == null) {
 				inputLines = new ArrayList<>();
@@ -344,8 +344,7 @@ public abstract class ReferenceTypeImpl extends TypeImpl implements
 		 * @return
 		 */
 		public List<int[]> getInputLineInfos(int outputLineNumber) {
-			return fOutputLineToInputLine.get(new Integer(
-					outputLineNumber));
+			return fOutputLineToInputLine.get(Integer.valueOf(outputLineNumber));
 		}
 
 	}
@@ -2029,7 +2028,7 @@ public abstract class ReferenceTypeImpl extends TypeImpl implements
 				throw new AbsentInformationException(JDIMessages.ReferenceTypeImpl_34);
 			}
 		} else { // Java stratum
-			javaLines.add(new Integer(lineNumber));
+			javaLines.add(Integer.valueOf(lineNumber));
 		}
 		return method.javaStratumLocationsOfLines(javaLines);
 	}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ShortValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ShortValueImpl.java
index d53a072a3..95ab0f34e 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ShortValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ShortValueImpl.java
@@ -77,7 +77,7 @@ public class ShortValueImpl extends PrimitiveValueImpl implements ShortValue {
 			throws IOException {
 		VirtualMachineImpl vmImpl = target.virtualMachineImpl();
 		short value = target.readShort("shortValue", in); //$NON-NLS-1$
-		return new ShortValueImpl(vmImpl, new Short(value));
+		return new ShortValueImpl(vmImpl, Short.valueOf(value));
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadReferenceImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadReferenceImpl.java
index 9fbdfb7c7..b57a1312c 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadReferenceImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ThreadReferenceImpl.java
@@ -750,7 +750,7 @@ public class ThreadReferenceImpl extends ObjectReferenceImpl implements	ThreadRe
 			try {
 				String name = field.getName();
 				int value = field.getInt(null);
-				Integer intValue = new Integer(value);
+				Integer intValue = Integer.valueOf(value);
 
 				if (name.startsWith("JDWP_THREAD_STATUS_")) { //$NON-NLS-1$
 					name = name.substring(19);
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java
index daadc80d3..9c82f5dd7 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java
@@ -320,29 +320,29 @@ public abstract class ValueImpl extends MirrorImpl implements Value {
 		switch (typeSignature) {
 		case 'D':
 			if (valueTypeSignature != 'Z') {
-				return new DoubleValueImpl(vm, new Double(value.doubleValue()));
+				return new DoubleValueImpl(vm, Double.valueOf(value.doubleValue()));
 			}
 			break;
 		case 'F':
 			if (valueTypeSignature != 'Z' && valueTypeSignature != 'D') {
-				return new FloatValueImpl(vm, new Float(value.floatValue()));
+				return new FloatValueImpl(vm, Float.valueOf(value.floatValue()));
 			}
 			break;
 		case 'J':
 			if (valueTypeSignature != 'Z' && valueTypeSignature != 'D'
 					&& valueTypeSignature != 'F') {
-				return new LongValueImpl(vm, new Long(value.longValue()));
+				return new LongValueImpl(vm, Long.valueOf(value.longValue()));
 			}
 			break;
 		case 'I':
 			if (valueTypeSignature == 'B' || valueTypeSignature == 'C'
 					|| valueTypeSignature == 'S') {
-				return new IntegerValueImpl(vm, new Integer(value.intValue()));
+				return new IntegerValueImpl(vm, Integer.valueOf(value.intValue()));
 			}
 			break;
 		case 'S':
 			if (valueTypeSignature == 'B') {
-				return new ShortValueImpl(vm, new Short(value.shortValue()));
+				return new ShortValueImpl(vm, Short.valueOf(value.shortValue()));
 			}
 			break;
 		}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VerboseWriter.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VerboseWriter.java
index cee5f0ec8..dc25fba56 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VerboseWriter.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VerboseWriter.java
@@ -198,7 +198,7 @@ public class VerboseWriter {
 	public void println(String description, double value) {
 		printDescription(description);
 		printHex(value);
-		print(new Double(value).toString());
+		print(Double.valueOf(value).toString());
 		println();
 	}
 
@@ -208,7 +208,7 @@ public class VerboseWriter {
 	public void println(String description, float value) {
 		printDescription(description);
 		printHex(value);
-		print(new Float(value).toString());
+		print(Float.valueOf(value).toString());
 		println();
 	}
 
@@ -409,7 +409,7 @@ public class VerboseWriter {
 	 * strings.
 	 */
 	public void printValue(int value, Map<Integer, String> valueToString) {
-		Integer val = new Integer(value);
+		Integer val = Integer.valueOf(value);
 		if (valueToString == null) {
 			print(val.toString());
 			return;
@@ -443,7 +443,7 @@ public class VerboseWriter {
 	 * the bits.
 	 */
 	public void printValue(int value, String[] bitNames) {
-		Integer val = new Integer(value);
+		Integer val = Integer.valueOf(value);
 		if (bitNames == null) {
 			print(val.toString());
 			return;
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java
index 9986c032a..541c0eadd 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java
@@ -751,7 +751,7 @@ public class VirtualMachineImpl extends MirrorImpl implements VirtualMachine,
 	 */
 	@Override
 	public ByteValue mirrorOf(byte value) {
-		return new ByteValueImpl(virtualMachineImpl(), new Byte(value));
+		return new ByteValueImpl(virtualMachineImpl(), Byte.valueOf(value));
 	}
 
 	/* (non-Javadoc)
@@ -759,7 +759,7 @@ public class VirtualMachineImpl extends MirrorImpl implements VirtualMachine,
 	 */
 	@Override
 	public CharValue mirrorOf(char value) {
-		return new CharValueImpl(virtualMachineImpl(), new Character(value));
+		return new CharValueImpl(virtualMachineImpl(), Character.valueOf(value));
 	}
 
 	/* (non-Javadoc)
@@ -767,7 +767,7 @@ public class VirtualMachineImpl extends MirrorImpl implements VirtualMachine,
 	 */
 	@Override
 	public DoubleValue mirrorOf(double value) {
-		return new DoubleValueImpl(virtualMachineImpl(), new Double(value));
+		return new DoubleValueImpl(virtualMachineImpl(), Double.valueOf(value));
 	}
 
 	/* (non-Javadoc)
@@ -775,7 +775,7 @@ public class VirtualMachineImpl extends MirrorImpl implements VirtualMachine,
 	 */
 	@Override
 	public FloatValue mirrorOf(float value) {
-		return new FloatValueImpl(virtualMachineImpl(), new Float(value));
+		return new FloatValueImpl(virtualMachineImpl(), Float.valueOf(value));
 	}
 
 	/* (non-Javadoc)
@@ -783,7 +783,7 @@ public class VirtualMachineImpl extends MirrorImpl implements VirtualMachine,
 	 */
 	@Override
 	public IntegerValue mirrorOf(int value) {
-		return new IntegerValueImpl(virtualMachineImpl(), new Integer(value));
+		return new IntegerValueImpl(virtualMachineImpl(), Integer.valueOf(value));
 	}
 
 	/* (non-Javadoc)
@@ -791,7 +791,7 @@ public class VirtualMachineImpl extends MirrorImpl implements VirtualMachine,
 	 */
 	@Override
 	public LongValue mirrorOf(long value) {
-		return new LongValueImpl(virtualMachineImpl(), new Long(value));
+		return new LongValueImpl(virtualMachineImpl(), Long.valueOf(value));
 	}
 
 	/* (non-Javadoc)
@@ -799,7 +799,7 @@ public class VirtualMachineImpl extends MirrorImpl implements VirtualMachine,
 	 */
 	@Override
 	public ShortValue mirrorOf(short value) {
-		return new ShortValueImpl(virtualMachineImpl(), new Short(value));
+		return new ShortValueImpl(virtualMachineImpl(), Short.valueOf(value));
 	}
 
 	/* (non-Javadoc)
@@ -1198,7 +1198,7 @@ public class VirtualMachineImpl extends MirrorImpl implements VirtualMachine,
 			try {
 				String name = field.getName();
 				if (name.startsWith("HCR_RELOAD_")) { //$NON-NLS-1$
-					Integer intValue = new Integer(field.getInt(null));
+					Integer intValue = Integer.valueOf(field.getInt(null));
 					name = name.substring(4);
 					fgHCRResultMap.put(intValue, name);
 				}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java
index 0875fff6d..8a720d933 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectorImpl.java
@@ -237,14 +237,14 @@ public abstract class ConnectorImpl implements Connector {
 
 		@Override
 		public void setValue(String value) {
-			fValue = new Integer(value);
+			fValue = Integer.valueOf(value);
 		}
 
 		@Override
 		public boolean isValid(String value) {
 			Integer val;
 			try {
-				val = new Integer(value);
+				val = Integer.valueOf(value);
 			} catch (NumberFormatException e) {
 				return false;
 			}
@@ -269,7 +269,7 @@ public abstract class ConnectorImpl implements Connector {
 		 */
 		@Override
 		public void setValue(int value) {
-			fValue = new Integer(value);
+			fValue = Integer.valueOf(value);
 		}
 
 		/* (non-Javadoc)
@@ -301,7 +301,7 @@ public abstract class ConnectorImpl implements Connector {
 		 */
 		@Override
 		public String stringValueOf(int value) {
-			return new Integer(value).toString();
+			return Integer.valueOf(value).toString();
 		}
 	}
 
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java
index 2971a0545..1d0d0b0c8 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java
@@ -191,7 +191,7 @@ public class PacketReceiveManager extends PacketManager {
 		// Check for a timeout.
 		if (packet == null) {
 			synchronized (fTimedOutPackets) {
-				fTimedOutPackets.add(new Integer(id));
+				fTimedOutPackets.add(Integer.valueOf(id));
 			}
 			throw new TimeoutException(NLS.bind(
 					ConnectMessages.PacketReceiveManager_0, new String[] { id
@@ -276,7 +276,7 @@ public class PacketReceiveManager extends PacketManager {
 			if (fTimedOutPackets.isEmpty()) {
 				return false;
 			}
-			Integer id = new Integer(packet.getId());
+			Integer id = Integer.valueOf(packet.getId());
 			return fTimedOutPackets.remove(id);
 		}
 	}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java
index e85a9054d..5068ec9fd 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventImpl.java
@@ -223,7 +223,7 @@ public abstract class EventImpl extends MirrorImpl implements Event {
 
 			try {
 				String name = field.getName();
-				Integer intValue = new Integer(field.getInt(null));
+				Integer intValue = Integer.valueOf(field.getInt(null));
 
 				if (name.startsWith("EVENT_")) { //$NON-NLS-1$
 					name = name.substring(6);
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpCommandPacket.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpCommandPacket.java
index 219356d79..68e99ae9d 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpCommandPacket.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpCommandPacket.java
@@ -274,7 +274,7 @@ public class JdwpCommandPacket extends JdwpPacket {
 					continue;
 				}
 				int value = field.getInt(null);
-				setNames.put(new Integer(value), removePrefix(name));
+				setNames.put(Integer.valueOf(value), removePrefix(name));
 			} catch (IllegalAccessException e) {
 				// Will not occur for own class.
 			} catch (IllegalArgumentException e) {
@@ -303,7 +303,7 @@ public class JdwpCommandPacket extends JdwpPacket {
 				Integer val = (Integer) field.get(null);
 				int value = val.intValue();
 				int set = value >>> 8;
-				String setName = setNames.get(new Integer(set));
+				String setName = setNames.get(Integer.valueOf(set));
 				String entryName = setName + " - " + removePrefix(name); //$NON-NLS-1$
 
 				fgCommandMap.put(val, entryName);
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpID.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpID.java
index c9d62b7de..e9d070b25 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpID.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpID.java
@@ -117,7 +117,7 @@ public abstract class JdwpID {
 	 */
 	@Override
 	public String toString() {
-		return new Long(fValue).toString();
+		return Long.valueOf(fValue).toString();
 	}
 
 	/**
@@ -174,7 +174,7 @@ public abstract class JdwpID {
 
 			try {
 				String name = field.getName();
-				Integer intValue = new Integer(field.getInt(null));
+				Integer intValue = Integer.valueOf(field.getInt(null));
 				if (name.startsWith("TYPE_TAG_")) { //$NON-NLS-1$
 					name = name.substring(9);
 					fTypeTagMap.put(intValue, name);
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpReplyPacket.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpReplyPacket.java
index ad437fe15..8f19f0b97 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpReplyPacket.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpReplyPacket.java
@@ -150,7 +150,7 @@ public class JdwpReplyPacket extends JdwpPacket {
 				continue;
 
 			try {
-				Integer intValue = new Integer(field.getInt(null));
+				Integer intValue = Integer.valueOf(field.getInt(null));
 				fErrorMap.put(intValue, field.getName());
 			} catch (IllegalAccessException e) {
 				// Will not occur for own class.
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java
index 347c2fc5c..cd3c6e02a 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java
@@ -349,7 +349,7 @@ public abstract class EventRequestImpl extends MirrorImpl implements
 		if (fCountFilters == null)
 			fCountFilters = new ArrayList<>();
 
-		fCountFilters.add(new Integer(count));
+		fCountFilters.add(Integer.valueOf(count));
 	}
 
 	/**
@@ -740,7 +740,7 @@ public abstract class EventRequestImpl extends MirrorImpl implements
 
 			try {
 				String name = field.getName();
-				Integer intValue = new Integer(field.getInt(null));
+				Integer intValue = Integer.valueOf(field.getInt(null));
 				if (name.startsWith("STEP_SIZE_")) { //$NON-NLS-1$
 					name = name.substring(10);
 					fStepSizeMap.put(intValue, name);
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/RequestID.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/RequestID.java
index 421fea0dc..f4f43026a 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/RequestID.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/RequestID.java
@@ -69,7 +69,7 @@ public class RequestID {
 	 */
 	@Override
 	public String toString() {
-		return new Long(fRequestID).toString();
+		return Long.valueOf(fRequestID).toString();
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/TcpipSpy.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/TcpipSpy.java
index caff506e7..e37a34565 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/TcpipSpy.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/TcpipSpy.java
@@ -158,7 +158,7 @@ public class TcpipSpy extends Thread {
 
 	public static JdwpCommandPacket getCommand(int id) {
 		JdwpConversation conversation = fPackets
-				.get(new Integer(id));
+				.get(Integer.valueOf(id));
 		if (conversation != null)
 			return conversation.getCommand();
 		return null;
@@ -167,10 +167,10 @@ public class TcpipSpy extends Thread {
 	protected static void store(JdwpPacket packet) {
 		int id = packet.getId();
 		JdwpConversation conversation = fPackets
-				.get(new Integer(id));
+				.get(Integer.valueOf(id));
 		if (conversation == null) {
 			conversation = new JdwpConversation(id);
-			fPackets.put(new Integer(id), conversation);
+			fPackets.put(Integer.valueOf(id), conversation);
 		}
 
 		if ((packet.getFlags() & JdwpPacket.FLAG_REPLY_PACKET) != 0) {
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/VerbosePacketStream.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/VerbosePacketStream.java
index 8fb1cfe98..ed36f7bf0 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/VerbosePacketStream.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/VerbosePacketStream.java
@@ -200,7 +200,7 @@ public class VerbosePacketStream extends PrintStream {
 		printHex(flags);
 		if ((flags & JdwpPacket.FLAG_REPLY_PACKET) != 0) {
 			print(MessageFormat
-					.format(" (REPLY to {0})", new Object[] { JdwpCommandPacket.commandMap().get(new Integer(TcpipSpy.getCommand(packet))) })); //$NON-NLS-1$
+					.format(" (REPLY to {0})", new Object[] { JdwpCommandPacket.commandMap().get(Integer.valueOf(TcpipSpy.getCommand(packet))) })); //$NON-NLS-1$
 		} else {
 			print(" (COMMAND)"); //$NON-NLS-1$
 		}
@@ -229,7 +229,7 @@ public class VerbosePacketStream extends PrintStream {
 		printHex(command);
 		printParanthetical(command);
 		print(" ("); //$NON-NLS-1$
-		print(JdwpCommandPacket.commandMap().get(new Integer(commandAndSet)));
+		print(JdwpCommandPacket.commandMap().get(Integer.valueOf(commandAndSet)));
 		println(')');
 	}
 
@@ -240,7 +240,7 @@ public class VerbosePacketStream extends PrintStream {
 		printHex(error);
 		if (error != 0) {
 			print(" ("); //$NON-NLS-1$
-			print(JdwpReplyPacket.errorMap().get(new Integer(error)));
+			print(JdwpReplyPacket.errorMap().get(Integer.valueOf(error)));
 			print(')');
 		}
 		println();
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
index 7f2ee5f4a..c7406a84d 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
@@ -577,7 +577,7 @@ public abstract class JavaBreakpoint extends Breakpoint implements IJavaBreakpoi
 		int hitCount = getHitCount();
 		if (hitCount > 0) {
 			request.addCountFilter(hitCount);
-			request.putProperty(HIT_COUNT, new Integer(hitCount));
+			request.putProperty(HIT_COUNT, Integer.valueOf(hitCount));
 		}
 	}
 
@@ -941,7 +941,7 @@ public abstract class JavaBreakpoint extends Breakpoint implements IJavaBreakpoi
 		if (isInstalled()) {
 			attributes = new ArrayList<>(3);
 			attributes.add(INSTALL_COUNT);
-			values.add(new Integer(0));
+			values.add(Integer.valueOf(0));
 		}
 		if (isExpired()) {
 			if (attributes == null) {
@@ -986,11 +986,11 @@ public abstract class JavaBreakpoint extends Breakpoint implements IJavaBreakpoi
 		if (getHitCount() != count) {
 			if (!isEnabled() && count > -1) {
 				setAttributes(new String[] { ENABLED, HIT_COUNT, EXPIRED },
-						new Object[] { Boolean.TRUE, new Integer(count),
+						new Object[] { Boolean.TRUE, Integer.valueOf(count),
 								Boolean.FALSE });
 			} else {
 				setAttributes(new String[] { HIT_COUNT, EXPIRED },
-						new Object[] { new Integer(count), Boolean.FALSE });
+						new Object[] { Integer.valueOf(count), Boolean.FALSE });
 			}
 			recreate();
 		}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaClassPrepareBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaClassPrepareBreakpoint.java
index aca38d050..09cc0345c 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaClassPrepareBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaClassPrepareBreakpoint.java
@@ -97,13 +97,12 @@ public class JavaClassPrepareBreakpoint extends JavaBreakpoint implements
 
 				// add attributes
 				attributes.put(IBreakpoint.ID, getModelIdentifier());
-				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(TYPE_NAME, typeName);
-				attributes.put(MEMBER_TYPE, new Integer(memberType));
+				attributes.put(MEMBER_TYPE, Integer.valueOf(memberType));
 				attributes.put(ENABLED, Boolean.TRUE);
-				attributes.put(SUSPEND_POLICY, new Integer(
-						getDefaultSuspendPolicy()));
+				attributes.put(SUSPEND_POLICY, Integer.valueOf(getDefaultSuspendPolicy()));
 
 				ensureMarker().setAttributes(attributes);
 
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java
index 4f0235f52..3dca9ae4c 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java
@@ -183,8 +183,7 @@ public class JavaExceptionBreakpoint extends JavaBreakpoint implements
 				attributes.put(CAUGHT, Boolean.valueOf(caught));
 				attributes.put(UNCAUGHT, Boolean.valueOf(uncaught));
 				attributes.put(CHECKED, Boolean.valueOf(checked));
-				attributes.put(SUSPEND_POLICY, new Integer(
-						getDefaultSuspendPolicy()));
+				attributes.put(SUSPEND_POLICY, Integer.valueOf(getDefaultSuspendPolicy()));
 
 				ensureMarker().setAttributes(attributes);
 
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java
index c7d831817..8d6794706 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java
@@ -156,8 +156,7 @@ public class JavaLineBreakpoint extends JavaBreakpoint implements
 						true, lineNumber, charStart, charEnd);
 				addTypeNameAndHitCount(attributes, typeName, hitCount);
 				// set attributes
-				attributes.put(SUSPEND_POLICY, new Integer(
-						getDefaultSuspendPolicy()));
+				attributes.put(SUSPEND_POLICY, Integer.valueOf(getDefaultSuspendPolicy()));
 				ensureMarker().setAttributes(attributes);
 
 				// add to breakpoint manager if requested
@@ -444,9 +443,9 @@ public class JavaLineBreakpoint extends JavaBreakpoint implements
 			int charStart, int charEnd) {
 		attributes.put(IBreakpoint.ID, modelIdentifier);
 		attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(enabled));
-		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));
 	}
 
 	/**
@@ -461,7 +460,7 @@ public class JavaLineBreakpoint extends JavaBreakpoint implements
 			int hitCount) {
 		attributes.put(TYPE_NAME, typeName);
 		if (hitCount > 0) {
-			attributes.put(HIT_COUNT, new Integer(hitCount));
+			attributes.put(HIT_COUNT, Integer.valueOf(hitCount));
 			attributes.put(EXPIRED, Boolean.FALSE);
 		}
 	}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java
index 321699cab..b2c7fdd63 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java
@@ -107,13 +107,13 @@ public class JavaMethodBreakpoint extends JavaLineBreakpoint implements
 	 * Flag indicating that this breakpoint last suspended execution due to a
 	 * method entry
 	 */
-	protected static final Integer ENTRY_EVENT = new Integer(0);
+	protected static final Integer ENTRY_EVENT = Integer.valueOf(0);
 
 	/**
 	 * Flag indicating that this breakpoint last suspended execution due to a
 	 * method exit
 	 */
-	protected static final Integer EXIT_EVENT = new Integer(1);
+	protected static final Integer EXIT_EVENT = Integer.valueOf(1);
 
 	/**
 	 * Maps each debug target that is suspended for this breakpoint to reason
@@ -162,8 +162,7 @@ public class JavaMethodBreakpoint extends JavaLineBreakpoint implements
 				attributes.put(ENTRY, Boolean.valueOf(entry));
 				attributes.put(EXIT, Boolean.valueOf(exit));
 				attributes.put(NATIVE, Boolean.valueOf(nativeOnly));
-				attributes.put(SUSPEND_POLICY, new Integer(
-						getDefaultSuspendPolicy()));
+				attributes.put(SUSPEND_POLICY, Integer.valueOf(getDefaultSuspendPolicy()));
 				// set attributes
 				ensureMarker().setAttributes(attributes);
 				register(register);
@@ -374,7 +373,7 @@ public class JavaMethodBreakpoint extends JavaLineBreakpoint implements
 		} else {
 			int hitCount = getHitCount();
 			if (hitCount > 0) {
-				request.putProperty(HIT_COUNT, new Integer(hitCount));
+				request.putProperty(HIT_COUNT, Integer.valueOf(hitCount));
 			}
 		}
 	}
@@ -520,7 +519,7 @@ public class JavaMethodBreakpoint extends JavaLineBreakpoint implements
 		int hitCount = count.intValue();
 		if (hitCount > 0) {
 			hitCount--;
-			count = new Integer(hitCount);
+			count = Integer.valueOf(hitCount);
 			event.request().putProperty(HIT_COUNT, count);
 			if (hitCount == 0) {
 				// the count has reached 0, breakpoint hit
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java
index e9a9b021a..ffaf75899 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java
@@ -90,8 +90,7 @@ public class JavaMethodEntryBreakpoint extends JavaLineBreakpoint implements
 						methodSignature);
 				addTypeNameAndHitCount(attributes, typeName, hitCount);
 				// set attributes
-				attributes.put(SUSPEND_POLICY, new Integer(
-						getDefaultSuspendPolicy()));
+				attributes.put(SUSPEND_POLICY, Integer.valueOf(getDefaultSuspendPolicy()));
 				ensureMarker().setAttributes(attributes);
 
 				register(register);
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaPatternBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaPatternBreakpoint.java
index b10a0846c..fe57b8f67 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaPatternBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaPatternBreakpoint.java
@@ -78,8 +78,7 @@ public class JavaPatternBreakpoint extends JavaLineBreakpoint implements
 						true, lineNumber, charStart, charEnd);
 				addPatternAndHitCount(attributes, sourceName, pattern, hitCount);
 				// set attributes
-				attributes.put(SUSPEND_POLICY, new Integer(
-						getDefaultSuspendPolicy()));
+				attributes.put(SUSPEND_POLICY, Integer.valueOf(getDefaultSuspendPolicy()));
 				ensureMarker().setAttributes(attributes);
 
 				register(add);
@@ -165,7 +164,7 @@ public class JavaPatternBreakpoint extends JavaLineBreakpoint implements
 			attributes.put(SOURCE_NAME, sourceName);
 		}
 		if (hitCount > 0) {
-			attributes.put(HIT_COUNT, new Integer(hitCount));
+			attributes.put(HIT_COUNT, Integer.valueOf(hitCount));
 			attributes.put(EXPIRED, Boolean.FALSE);
 		}
 	}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java
index d03882f07..20137de0f 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java
@@ -160,8 +160,7 @@ public class JavaStratumLineBreakpoint extends JavaLineBreakpoint implements
 				addStratumPatternAndHitCount(attributes, stratum, sourceName,
 						sourcePath, pattern, hitCount);
 				// set attributes
-				attributes.put(SUSPEND_POLICY, new Integer(
-						getDefaultSuspendPolicy()));
+				attributes.put(SUSPEND_POLICY, Integer.valueOf(getDefaultSuspendPolicy()));
 				ensureMarker().setAttributes(attributes);
 
 				register(register);
@@ -184,7 +183,7 @@ public class JavaStratumLineBreakpoint extends JavaLineBreakpoint implements
 			attributes.put(SOURCE_PATH, sourcePath);
 		}
 		if (hitCount > 0) {
-			attributes.put(HIT_COUNT, new Integer(hitCount));
+			attributes.put(HIT_COUNT, Integer.valueOf(hitCount));
 			attributes.put(EXPIRED, Boolean.FALSE);
 		}
 	}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaTargetPatternBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaTargetPatternBreakpoint.java
index c159a573d..d741b77c5 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaTargetPatternBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaTargetPatternBreakpoint.java
@@ -74,8 +74,7 @@ public class JavaTargetPatternBreakpoint extends JavaLineBreakpoint implements
 				addLineBreakpointAttributes(attributes, getModelIdentifier(),
 						true, lineNumber, charStart, charEnd);
 				addSourceNameAndHitCount(attributes, sourceName, hitCount);
-				attributes.put(SUSPEND_POLICY, new Integer(
-						getDefaultSuspendPolicy()));
+				attributes.put(SUSPEND_POLICY, Integer.valueOf(getDefaultSuspendPolicy()));
 				// set attributes
 				ensureMarker().setAttributes(attributes);
 
@@ -215,7 +214,7 @@ public class JavaTargetPatternBreakpoint extends JavaLineBreakpoint implements
 			attributes.put(SOURCE_NAME, sourceName);
 		}
 		if (hitCount > 0) {
-			attributes.put(HIT_COUNT, new Integer(hitCount));
+			attributes.put(HIT_COUNT, Integer.valueOf(hitCount));
 			attributes.put(EXPIRED, Boolean.FALSE);
 		}
 	}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java
index 826c087de..f84253a41 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java
@@ -84,12 +84,12 @@ public class JavaWatchpoint extends JavaLineBreakpoint implements
 	 * Flag indicating that this breakpoint last suspended execution due to a
 	 * field access
 	 */
-	protected static final Integer ACCESS_EVENT = new Integer(0);
+	protected static final Integer ACCESS_EVENT = Integer.valueOf(0);
 	/**
 	 * Flag indicating that this breakpoint last suspended execution due to a
 	 * field modification
 	 */
-	protected static final Integer MODIFICATION_EVENT = new Integer(1);
+	protected static final Integer MODIFICATION_EVENT = Integer.valueOf(1);
 	/**
 	 * Maps each debug target that is suspended for this breakpoint to reason
 	 * that this breakpoint suspended it. Reasons include:
@@ -120,8 +120,7 @@ public class JavaWatchpoint extends JavaLineBreakpoint implements
 				addLineBreakpointAttributes(attributes, getModelIdentifier(),
 						true, lineNumber, charStart, charEnd);
 				addTypeNameAndHitCount(attributes, typeName, hitCount);
-				attributes.put(SUSPEND_POLICY, new Integer(
-						getDefaultSuspendPolicy()));
+				attributes.put(SUSPEND_POLICY, Integer.valueOf(getDefaultSuspendPolicy()));
 				// configure the field handle
 				addFieldName(attributes, fieldName);
 				// configure the access and modification flags to defaults
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
index 5b55b3d3a..df58a2e01 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
@@ -2013,7 +2013,7 @@ public class JDIDebugTarget extends JDIDebugElement implements
 					try {
 						org.eclipse.jdi.hcr.ReferenceType rt = (org.eclipse.jdi.hcr.ReferenceType) type;
 						if (rt.isVersionKnown()) {
-							return new Integer(rt.getClassFileVersion());
+							return Integer.valueOf(rt.getClassFileVersion());
 						}
 					} catch (RuntimeException e) {
 						targetRequestFailed(
diff --git a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
index e508f0b0a..da391bdef 100644
--- a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.17.100.qualifier
 Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathShortener.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathShortener.java
index 9044af2be..a74004591 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathShortener.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathShortener.java
@@ -354,6 +354,7 @@ public class ClasspathShortener {
 			manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0"); //$NON-NLS-1$
 			manifest.getMainAttributes().put(Attributes.Name.CLASS_PATH, manifestClasspath.toString());
 			try (JarOutputStream target = new JarOutputStream(new FileOutputStream(jarFile), manifest)) {
+				target.hashCode(); // avoid warning that target is unused
 			}
 			return jarFile;
 		} catch (IOException e) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java
index 819733919..042ced8ac 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java
@@ -312,7 +312,7 @@ public class EECompilationParticipant extends CompilationParticipant {
 						IMarker.LOCATION},
 					new Object[] {
 						message,
-						new Integer(severity),
+						Integer.valueOf(severity),
 						LaunchingMessages.LaunchingPlugin_37
 					});
 		} catch (CoreException e) {
@@ -340,7 +340,7 @@ public class EECompilationParticipant extends CompilationParticipant {
 							IMarker.LOCATION },
 						new Object[] {
 								message,
-								new Integer(severity),
+								Integer.valueOf(severity),
 								location
 						});
 		} catch (CoreException e) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchableTester.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchableTester.java
index 9594c2516..203146d03 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchableTester.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchableTester.java
@@ -127,14 +127,14 @@ public class JavaLaunchableTester extends PropertyTester {
 
 
     static {
-        fgModifiers.put("public",       new Integer(Flags.AccPublic)); //$NON-NLS-1$
-        fgModifiers.put("protected",    new Integer(Flags.AccProtected)); //$NON-NLS-1$
-        fgModifiers.put("private",      new Integer(Flags.AccPrivate)); //$NON-NLS-1$
-        fgModifiers.put("static",       new Integer(Flags.AccStatic)); //$NON-NLS-1$
-        fgModifiers.put("final",        new Integer(Flags.AccFinal)); //$NON-NLS-1$
-        fgModifiers.put("synchronized", new Integer(Flags.AccSynchronized)); //$NON-NLS-1$
-        fgModifiers.put("abstract",     new Integer(Flags.AccAbstract)); //$NON-NLS-1$
-        fgModifiers.put("native",       new Integer(Flags.AccNative)); //$NON-NLS-1$
+        fgModifiers.put("public",       Integer.valueOf(Flags.AccPublic)); //$NON-NLS-1$
+        fgModifiers.put("protected",    Integer.valueOf(Flags.AccProtected)); //$NON-NLS-1$
+        fgModifiers.put("private",      Integer.valueOf(Flags.AccPrivate)); //$NON-NLS-1$
+        fgModifiers.put("static",       Integer.valueOf(Flags.AccStatic)); //$NON-NLS-1$
+        fgModifiers.put("final",        Integer.valueOf(Flags.AccFinal)); //$NON-NLS-1$
+        fgModifiers.put("synchronized", Integer.valueOf(Flags.AccSynchronized)); //$NON-NLS-1$
+        fgModifiers.put("abstract",     Integer.valueOf(Flags.AccAbstract)); //$NON-NLS-1$
+        fgModifiers.put("native",       Integer.valueOf(Flags.AccNative)); //$NON-NLS-1$
     }
 
 	/**
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
index e18630640..61dffcbca 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
@@ -1018,7 +1018,7 @@ public class LaunchingPlugin extends Plugin implements DebugOptionsListener, IEc
 					}
 				}
 				//if there is no recorded stamp we have to assume it is new
-				stamp = new Long(fstamp);
+				stamp = Long.valueOf(fstamp);
 				fgInstallTimeMap.put(location, stamp);
 				writeInstallInfo();
 				fgHasChanged.add(location);
@@ -1057,7 +1057,7 @@ public class LaunchingPlugin extends Plugin implements DebugOptionsListener, IEc
 								String loc = element.getAttribute("loc"); //$NON-NLS-1$
 								String stamp = element.getAttribute("stamp"); //$NON-NLS-1$
 								try {
-									Long l = new Long(stamp);
+									Long l = Long.valueOf(stamp);
 									fgInstallTimeMap.put(loc, l);
 								}
 								catch(NumberFormatException nfe) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java
index 43ca9eb62..764c4d3c6 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java
@@ -158,7 +158,7 @@ public class PListParser {
 			return Boolean.FALSE;
 		} else if(nodeName.equalsIgnoreCase(INT_ELEMENT)) {
 			try {
-				return new Integer(Integer.parseInt(getText(element)));
+				return Integer.valueOf(Integer.parseInt(getText(element)));
 			} catch (NumberFormatException e) {
 				abort(e);
 			}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
index f5def68d1..7190816ef 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
@@ -284,8 +284,8 @@ public class RuntimeClasspathEntry implements IRuntimeClasspathEntry {
 		Document doc = DebugPlugin.newDocument();
 		Element node = doc.createElement("runtimeClasspathEntry"); //$NON-NLS-1$
 		doc.appendChild(node);
-		node.setAttribute("type", (new Integer(getType())).toString()); //$NON-NLS-1$
-		node.setAttribute("path", (new Integer(getClasspathProperty())).toString()); //$NON-NLS-1$
+		node.setAttribute("type", (Integer.valueOf(getType())).toString()); //$NON-NLS-1$
+		node.setAttribute("path", (Integer.valueOf(getClasspathProperty())).toString()); //$NON-NLS-1$
 		switch (getType()) {
 			case PROJECT :
 				node.setAttribute("projectName", getPath().lastSegment()); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java
index 7b6d94edf..7d900f818 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java
@@ -107,7 +107,7 @@ public class SocketListenConnector implements IVMConnector {
 		// retain default behaviour to accept 1 connection only
 		int connectionLimit = 1;
 		if (arguments.containsKey("connectionLimit")) { //$NON-NLS-1$
-			connectionLimit = Integer.valueOf(arguments.get("connectionLimit")); //$NON-NLS-1$
+			connectionLimit = Integer.parseInt(arguments.get("connectionLimit")); //$NON-NLS-1$
 		}
 
 		try {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
index 6bc948ad7..e56a2078e 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
@@ -1582,11 +1582,11 @@ public final class JavaRuntime {
 		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++) {
 				IClasspathEntry cpe = cpes[i];
@@ -1617,7 +1617,7 @@ public final class JavaRuntime {
 				fgProjects.set(null);
 				fgEntryCount.set(null);
 			} else {
-				fgEntryCount.set(new Integer(intCount));
+				fgEntryCount.set(Integer.valueOf(intCount));
 			}
 		}
 		// set classpath property
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java
index 6722dc0f4..133afee26 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java
@@ -45,7 +45,8 @@ public class SocketUtil {
 
 		for (int i= 0; i < 10; i++) {
 			int port= getRandomPort(searchFrom, searchTo);
-			try (Socket s= new Socket(host, port)){
+			try (Socket s = new Socket(host, port)) {
+				s.getLocalPort(); // avoid warning on s being unused
 			} catch (ConnectException e) {
 				return port;
 			} catch (IOException e) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/ExecutionEnvironmentDescription.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/ExecutionEnvironmentDescription.java
index b170c3460..e3b48b54d 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/ExecutionEnvironmentDescription.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/ExecutionEnvironmentDescription.java
@@ -180,8 +180,8 @@ public final class ExecutionEnvironmentDescription {
 	private static final String EE_ARG_FILTER = "-Dee."; //$NON-NLS-1$
 
 	// Regex constants for handling the source mapping
-	private static final Character WILDCARD_SINGLE_CHAR = new Character('?');
-	private static final Character WILDCARD_MULTI_CHAR = new Character('*');
+	private static final Character WILDCARD_SINGLE_CHAR = Character.valueOf('?');
+	private static final Character WILDCARD_MULTI_CHAR = Character.valueOf('*');
 	private static final String REGEX_SPECIAL_CHARS = "+()^$.{}[]|\\"; //$NON-NLS-1$
 
 	/**
diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml
index 81636d60a..7dce7a63a 100644
--- a/org.eclipse.jdt.launching/pom.xml
+++ b/org.eclipse.jdt.launching/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.launching</artifactId>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.17.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <properties>
     <maven.compiler.release>8</maven.compiler.release>