Bug 527018 - [refactoring] Replace use of Number constructors by valueOf
Also BREE upgrade for org.eclipse.update.core, since
Integer.valueOf(int) is not available in 1.4
Version increment for Eclipse Photon 4.8
- org.eclipse.ant.core
Change-Id: I4bec77aacac2fc2ee845ceb2e56e6ec58add777d
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
diff --git a/ant/org.eclipse.ant.core/META-INF/MANIFEST.MF b/ant/org.eclipse.ant.core/META-INF/MANIFEST.MF
index 734477f..eaf59a0 100644
--- a/ant/org.eclipse.ant.core/META-INF/MANIFEST.MF
+++ b/ant/org.eclipse.ant.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ant.core; singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.100.qualifier
Bundle-Activator: org.eclipse.ant.core.AntCorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/ant/org.eclipse.ant.core/pom.xml b/ant/org.eclipse.ant.core/pom.xml
index 267be29..22c384c 100644
--- a/ant/org.eclipse.ant.core/pom.xml
+++ b/ant/org.eclipse.ant.core/pom.xml
@@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.ant</groupId>
<artifactId>org.eclipse.ant.core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
index 9c5e224..02df242 100644
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
+++ b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
@@ -1245,7 +1245,7 @@
BundleRevision input = edges.get(i).from;
Integer count = counts.get(input);
if (count != null) {
- counts.put(input, new Integer(count.intValue() - 1));
+ counts.put(input, Integer.valueOf(count.intValue() - 1));
}
}
}
@@ -1282,11 +1282,11 @@
Integer fromCount = counts.get(from);
BundleRevision to = mappings.get(i).to;
if (to == null)
- counts.put(from, new Integer(0));
+ counts.put(from, Integer.valueOf(0));
else {
if (counts.get(to) == null)
- counts.put(to, new Integer(0));
- fromCount = fromCount == null ? new Integer(1) : new Integer(fromCount.intValue() + 1);
+ counts.put(to, Integer.valueOf(0));
+ fromCount = fromCount == null ? Integer.valueOf(1) : new Integer(fromCount.intValue() + 1);
counts.put(from, fromCount);
}
}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
index 70fb39c..20e777d 100644
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
+++ b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
@@ -357,7 +357,7 @@
// set message output level
if (messageOutputLevel != 2) { // changed from the default Project.MSG_INFO
Method setMessageOutputLevel = classInternalAntRunner.getMethod("setMessageOutputLevel", new Class[] { int.class }); //$NON-NLS-1$
- setMessageOutputLevel.invoke(runner, new Object[] { new Integer(messageOutputLevel) });
+ setMessageOutputLevel.invoke(runner, new Object[] { Integer.valueOf(messageOutputLevel) });
}
// set execution targets
diff --git a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntLineBreakpoint.java b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntLineBreakpoint.java
index 723b5aa..c936ccf 100644
--- a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntLineBreakpoint.java
+++ b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntLineBreakpoint.java
@@ -75,7 +75,7 @@
IMarker marker = resource.createMarker(IAntDebugConstants.ID_ANT_LINE_BREAKPOINT_MARKER);
setMarker(marker);
attributes.put(IBreakpoint.ENABLED, Boolean.TRUE);
- attributes.put(IMarker.LINE_NUMBER, new Integer(lineNumber));
+ attributes.put(IMarker.LINE_NUMBER, Integer.valueOf(lineNumber));
attributes.put(IBreakpoint.ID, IAntDebugConstants.ID_ANT_DEBUG_MODEL);
attributes.put(IMarker.MESSAGE, MessageFormat.format(DebugModelMessages.AntLineBreakpoint_0, new Object[] { Integer.toString(lineNumber) }));
ensureMarker().setAttributes(attributes);
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/dtd/dumper.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/dtd/dumper.java
index 0247aa3..0e48a2b 100644
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/dtd/dumper.java
+++ b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/dtd/dumper.java
@@ -121,7 +121,7 @@
private static int dumpDfm(IDfm dfm, HashMap<IDfm, Integer> map, int num) {
if (!map.containsKey(dfm)) {
- map.put(dfm, new Integer(num++));
+ map.put(dfm, Integer.valueOf(num++));
String[] accepts = dfm.getAccepts();
for (int i = 0; i < accepts.length; i++) {
IDfm next = dfm.advance(accepts[i]);
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java
index 2d2d0a0..2aab98d 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java
@@ -207,7 +207,7 @@
for (int i = 0; i != variables.length; i++) {
int[] offsets = variables[i].getOffsets();
for (int j = 0; j != offsets.length; j++) {
- list.add(new Integer(offsets[j]));
+ list.add(Integer.valueOf(offsets[j]));
}
}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java
index f600fe4..e2276d1 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java
@@ -162,7 +162,7 @@
MarkerUtilities.setLineNumber(attributes, problem.getLineNumber());
MarkerUtilities.setCharStart(attributes, problem.getOffset());
MarkerUtilities.setCharEnd(attributes, problem.getOffset() + problem.getLength());
- attributes.put(IMarker.SEVERITY, new Integer(severity));
+ attributes.put(IMarker.SEVERITY, Integer.valueOf(severity));
return attributes;
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/AbstractJavacPatternMatcher.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/AbstractJavacPatternMatcher.java
index 65bed28..93b05c4 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/AbstractJavacPatternMatcher.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/AbstractJavacPatternMatcher.java
@@ -41,8 +41,8 @@
private Map<String, IFile> fFileNameToIFile = new HashMap<>();
private JavacMarkerCreator fMarkerCreator;
- protected static final Integer fgWarningType = new Integer(IMarker.SEVERITY_WARNING);
- protected static final Integer fgErrorType = new Integer(IMarker.SEVERITY_ERROR);
+ protected static final Integer fgWarningType = Integer.valueOf(IMarker.SEVERITY_WARNING);
+ protected static final Integer fgErrorType = Integer.valueOf(IMarker.SEVERITY_ERROR);
/*
* (non-Javadoc)
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/JavacMarkerCreator.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/JavacMarkerCreator.java
index 10d7d44..f5bd858 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/JavacMarkerCreator.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/JavacMarkerCreator.java
@@ -114,7 +114,7 @@
for (MarkerInfo info : infos) {
IMarker marker = file.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
Map<String, Object> attributes = new HashMap<>(3);
- attributes.put(IMarker.LINE_NUMBER, new Integer(info.fLineNumber));
+ attributes.put(IMarker.LINE_NUMBER, Integer.valueOf(info.fLineNumber));
String message = getMessage(info);
attributes.put(IMarker.MESSAGE, message);
attributes.put(IMarker.SEVERITY, info.fType);
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntAugmentTaskNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntAugmentTaskNode.java
index b6f8be9..0225e90 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntAugmentTaskNode.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntAugmentTaskNode.java
@@ -102,7 +102,7 @@
ArrayList<Integer> list = new ArrayList<>();
int idx = text.indexOf(attrId);
if (idx > -1) {
- list.add(new Integer(getOffset() + idx));
+ list.add(Integer.valueOf(getOffset() + idx));
}
return list;
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntProjectNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntProjectNode.java
index 9c232d6..bbadff8 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntProjectNode.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntProjectNode.java
@@ -154,7 +154,7 @@
String newidentifier = new StringBuffer("\"").append(identifier).append('"').toString(); //$NON-NLS-1$
int defaultTargetNameOffset = textToSearch.indexOf(IAntCoreConstants.DEFAULT);
defaultTargetNameOffset = textToSearch.indexOf(newidentifier, defaultTargetNameOffset);
- results.add(new Integer(getOffset() + defaultTargetNameOffset + 1));
+ results.add(Integer.valueOf(getOffset() + defaultTargetNameOffset + 1));
return results;
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntPropertyNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntPropertyNode.java
index 1cd179c..39167f0 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntPropertyNode.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntPropertyNode.java
@@ -241,7 +241,7 @@
if (fBaseLabel.equals(identifier)) {
int nameOffset = textToSearch.indexOf(IAntCoreConstants.NAME);
nameOffset = textToSearch.indexOf(identifier, nameOffset + 1);
- results.add(new Integer(getOffset() + nameOffset));
+ results.add(Integer.valueOf(getOffset() + nameOffset));
}
}
if (fValue != null) {
@@ -252,7 +252,7 @@
if (valueOffset == -1 || valueOffset > endOffset) {
break;
}
- results.add(new Integer(getOffset() + valueOffset));
+ results.add(Integer.valueOf(getOffset() + valueOffset));
valueOffset += identifier.length();
}
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntTargetNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntTargetNode.java
index bf03df3..c3ba450 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntTargetNode.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntTargetNode.java
@@ -210,19 +210,19 @@
if (getTargetName().equals(identifier)) {
int nameOffset = textToSearch.indexOf(IAntCoreConstants.NAME);
nameOffset = textToSearch.indexOf(identifier, nameOffset);
- results.add(new Integer(getOffset() + nameOffset));
+ results.add(Integer.valueOf(getOffset() + nameOffset));
} else {
String ifString = fTarget.getIf();
if (ifString != null && ifString.endsWith(identifier)) {
int ifOffset = textToSearch.indexOf("if"); //$NON-NLS-1$
ifOffset = textToSearch.indexOf(identifier, ifOffset);
- results.add(new Integer(getOffset() + ifOffset));
+ results.add(Integer.valueOf(getOffset() + ifOffset));
} else {
String unlessString = fTarget.getUnless();
if (unlessString != null && unlessString.endsWith(identifier)) {
int unlessOffset = textToSearch.indexOf("unless"); //$NON-NLS-1$
unlessOffset = textToSearch.indexOf(identifier, unlessOffset);
- results.add(new Integer(getOffset() + unlessOffset));
+ results.add(Integer.valueOf(getOffset() + unlessOffset));
} else {
int dependsOffset = textToSearch.indexOf("depends"); //$NON-NLS-1$
while (dependsOffset > 0 && !Character.isWhitespace(textToSearch.charAt(dependsOffset - 1))) {
@@ -239,7 +239,7 @@
}
char delimiter = textToSearch.charAt(dependsOffset - 1);
if (delimiter == ',' || delimiter == '"' || delimiter == ' ') {
- results.add(new Integer(getOffset() + dependsOffset));
+ results.add(Integer.valueOf(getOffset() + dependsOffset));
}
dependsOffset += identifier.length();
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntTaskNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntTaskNode.java
index eeabfdd..98b0d52 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntTaskNode.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntTaskNode.java
@@ -210,7 +210,7 @@
// so if the line separator is greater than 1 in length we need to correct for this
int resultOffset = getOffset() + valueOffset + withinValueOffset + identifierCorrection
+ ((resultLine - valueLine) * (lineSep.length() - 1));
- results.add(new Integer(resultOffset));
+ results.add(Integer.valueOf(resultOffset));
withinValueOffset = value.indexOf(identifier, withinValueOffset + 1);
}
}
@@ -220,7 +220,7 @@
if (text.length() > 0) {
int offset = textToSearch.indexOf(text.toString());
offset = textToSearch.indexOf(identifier, offset);
- results.add(new Integer(offset + getOffset()));
+ results.add(Integer.valueOf(offset + getOffset()));
}
return results;
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPage.java
index 99c7e2b..94682c2 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPage.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPage.java
@@ -137,7 +137,7 @@
Button button = new Button(parent, SWT.PUSH);
button.setFont(parent.getFont());
button.setText(buttonText);
- button.setData(new Integer(buttonId));
+ button.setData(Integer.valueOf(buttonId));
button.addSelectionListener(selectionAdapter);
preferencePage.setButtonLayoutData(button);
return button;
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencePage.java
index ce19653..0bf0a6d 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencePage.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencePage.java
@@ -161,8 +161,8 @@
int maxValue = 1200000;
timeout.setValidRange(minValue, maxValue);
timeout.setValidateStrategy(StringFieldEditor.VALIDATE_ON_KEY_STROKE);
- timeout.setErrorMessage(MessageFormat.format(AntPreferencesMessages.AntPreferencePage_14, new Object[] { new Integer(minValue),
- new Integer(maxValue) }));
+ timeout.setErrorMessage(MessageFormat.format(AntPreferencesMessages.AntPreferencePage_14, new Object[] { Integer.valueOf(minValue),
+ Integer.valueOf(maxValue) }));
addField(timeout);
editor = new URLFieldEditor(IAntUIPreferenceConstants.DOCUMENTATION_URL, AntPreferencesMessages.AntPreferencePage_2, getFieldEditorParent());
diff --git a/update/org.eclipse.update.core/.classpath b/update/org.eclipse.update.core/.classpath
index a75596f..7958637 100644
--- a/update/org.eclipse.update.core/.classpath
+++ b/update/org.eclipse.update.core/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="jarprocessor"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/update/org.eclipse.update.core/.settings/org.eclipse.jdt.core.prefs b/update/org.eclipse.update.core/.settings/org.eclipse.jdt.core.prefs
index 23d6e87..e2e9143 100644
--- a/update/org.eclipse.update.core/.settings/org.eclipse.jdt.core.prefs
+++ b/update/org.eclipse.update.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,14 @@
-#Wed Feb 11 12:06:10 EST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=error
@@ -18,7 +17,7 @@
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -83,4 +82,4 @@
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/update/org.eclipse.update.core/META-INF/MANIFEST.MF b/update/org.eclipse.update.core/META-INF/MANIFEST.MF
index 418f8c2..5153e1d 100644
--- a/update/org.eclipse.update.core/META-INF/MANIFEST.MF
+++ b/update/org.eclipse.update.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.update.core; singleton:=true
-Bundle-Version: 3.2.900.qualifier
+Bundle-Version: 3.3.0.qualifier
Bundle-Activator: org.eclipse.update.internal.core.UpdateCore
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -26,8 +26,7 @@
org.eclipse.update.configurator;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.net;bundle-version="[1.0.0,2.0.0)"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,
- CDC-1.1/Foundation-1.1
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.xml.parsers,
org.w3c.dom,
org.xml.sax,
diff --git a/update/org.eclipse.update.core/pom.xml b/update/org.eclipse.update.core/pom.xml
index 6ce7387..7b8fe3e 100644
--- a/update/org.eclipse.update.core/pom.xml
+++ b/update/org.eclipse.update.core/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.update</groupId>
<artifactId>org.eclipse.update.core</artifactId>
- <version>3.2.900-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
index 0ceea5a..6802b82 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
@@ -578,7 +578,7 @@
return result;
StringTokenizer tokenizer = new StringTokenizer(executables, ","); //$NON-NLS-1$
- Integer defaultExecutablePermission = new Integer(ContentReference.DEFAULT_EXECUTABLE_PERMISSION);
+ Integer defaultExecutablePermission = Integer.valueOf(ContentReference.DEFAULT_EXECUTABLE_PERMISSION);
while (tokenizer.hasMoreTokens()) {
FileFilter filter = new FileFilter(tokenizer.nextToken());
result.put(filter, defaultExecutablePermission);
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
index e60d979..313fe2b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
@@ -149,7 +149,7 @@
* @since 2.0
*/
public SiteModel parse(InputStream in) throws SAXException, IOException {
- stateStack.push(new Integer(STATE_INITIAL));
+ stateStack.push(Integer.valueOf(STATE_INITIAL));
currentState = ((Integer) stateStack.peek()).intValue();
parser.parse(new InputSource(in), this);
if (objectStack.isEmpty())
@@ -385,7 +385,7 @@
private void handleInitialState(String elementName, Attributes attributes) throws SAXException {
if (elementName.equals(SITE)) {
- stateStack.push(new Integer(STATE_SITE));
+ stateStack.push(Integer.valueOf(STATE_SITE));
processSite(attributes);
} else {
internalErrorUnknownTag(NLS.bind(Messages.DefaultSiteParser_UnknownElement, (new String[] { elementName, getState(currentState) })));
@@ -397,16 +397,16 @@
private void handleSiteState(String elementName, Attributes attributes) {
if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION_SITE));
+ stateStack.push(Integer.valueOf(STATE_DESCRIPTION_SITE));
processInfo(attributes);
} else if (elementName.equals(FEATURE)) {
- stateStack.push(new Integer(STATE_FEATURE));
+ stateStack.push(Integer.valueOf(STATE_FEATURE));
processFeature(attributes);
} else if (elementName.equals(ARCHIVE)) {
- stateStack.push(new Integer(STATE_ARCHIVE));
+ stateStack.push(Integer.valueOf(STATE_ARCHIVE));
processArchive(attributes);
} else if (elementName.equals(CATEGORY_DEF)) {
- stateStack.push(new Integer(STATE_CATEGORY_DEF));
+ stateStack.push(Integer.valueOf(STATE_CATEGORY_DEF));
processCategoryDef(attributes);
} else
internalErrorUnknownTag(NLS.bind(Messages.DefaultSiteParser_UnknownElement, (new String[] { elementName, getState(currentState) })));
@@ -414,19 +414,19 @@
private void handleFeatureState(String elementName, Attributes attributes) {
if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION_SITE));
+ stateStack.push(Integer.valueOf(STATE_DESCRIPTION_SITE));
processInfo(attributes);
} else if (elementName.equals(FEATURE)) {
- stateStack.push(new Integer(STATE_FEATURE));
+ stateStack.push(Integer.valueOf(STATE_FEATURE));
processFeature(attributes);
} else if (elementName.equals(ARCHIVE)) {
- stateStack.push(new Integer(STATE_ARCHIVE));
+ stateStack.push(Integer.valueOf(STATE_ARCHIVE));
processArchive(attributes);
} else if (elementName.equals(CATEGORY_DEF)) {
- stateStack.push(new Integer(STATE_CATEGORY_DEF));
+ stateStack.push(Integer.valueOf(STATE_CATEGORY_DEF));
processCategoryDef(attributes);
} else if (elementName.equals(CATEGORY)) {
- stateStack.push(new Integer(STATE_CATEGORY));
+ stateStack.push(Integer.valueOf(STATE_CATEGORY));
processCategory(attributes);
} else
internalErrorUnknownTag(NLS.bind(Messages.DefaultSiteParser_UnknownElement, (new String[] { elementName, getState(currentState) })));
@@ -434,16 +434,16 @@
private void handleCategoryDefState(String elementName, Attributes attributes) {
if (elementName.equals(FEATURE)) {
- stateStack.push(new Integer(STATE_FEATURE));
+ stateStack.push(Integer.valueOf(STATE_FEATURE));
processFeature(attributes);
} else if (elementName.equals(ARCHIVE)) {
- stateStack.push(new Integer(STATE_ARCHIVE));
+ stateStack.push(Integer.valueOf(STATE_ARCHIVE));
processArchive(attributes);
} else if (elementName.equals(CATEGORY_DEF)) {
- stateStack.push(new Integer(STATE_CATEGORY_DEF));
+ stateStack.push(Integer.valueOf(STATE_CATEGORY_DEF));
processCategoryDef(attributes);
} else if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION_CATEGORY_DEF));
+ stateStack.push(Integer.valueOf(STATE_DESCRIPTION_CATEGORY_DEF));
processInfo(attributes);
} else
internalErrorUnknownTag(NLS.bind(Messages.DefaultSiteParser_UnknownElement, (new String[] { elementName, getState(currentState) })));
@@ -451,19 +451,19 @@
private void handleCategoryState(String elementName, Attributes attributes) {
if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION_SITE));
+ stateStack.push(Integer.valueOf(STATE_DESCRIPTION_SITE));
processInfo(attributes);
} else if (elementName.equals(FEATURE)) {
- stateStack.push(new Integer(STATE_FEATURE));
+ stateStack.push(Integer.valueOf(STATE_FEATURE));
processFeature(attributes);
} else if (elementName.equals(ARCHIVE)) {
- stateStack.push(new Integer(STATE_ARCHIVE));
+ stateStack.push(Integer.valueOf(STATE_ARCHIVE));
processArchive(attributes);
} else if (elementName.equals(CATEGORY_DEF)) {
- stateStack.push(new Integer(STATE_CATEGORY_DEF));
+ stateStack.push(Integer.valueOf(STATE_CATEGORY_DEF));
processCategoryDef(attributes);
} else if (elementName.equals(CATEGORY)) {
- stateStack.push(new Integer(STATE_CATEGORY));
+ stateStack.push(Integer.valueOf(STATE_CATEGORY));
processCategory(attributes);
} else
internalErrorUnknownTag(NLS.bind(Messages.DefaultSiteParser_UnknownElement, (new String[] { elementName, getState(currentState) })));
@@ -742,7 +742,7 @@
*
*/
private void internalErrorUnknownTag(String msg) {
- stateStack.push(new Integer(STATE_IGNORED_ELEMENT));
+ stateStack.push(Integer.valueOf(STATE_IGNORED_ELEMENT));
internalError(msg);
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallLogParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallLogParser.java
index 495d38c..b97b68c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallLogParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallLogParser.java
@@ -63,11 +63,11 @@
InstallConfiguration[] configs = (InstallConfiguration[])SiteManager.getLocalSite().getConfigurationHistory();
for (int i=0;i<configs.length; i++){
if (!configs[i].isCurrent())
- installConfigMap.put(new Long(configs[i].getCreationDate().getTime()), configs[i]);
+ installConfigMap.put(Long.valueOf(configs[i].getCreationDate().getTime()), configs[i]);
}
// Need to make a copy of the current config instead
InstallConfiguration config = getConfigCopy((InstallConfiguration)SiteManager.getLocalSite().getCurrentConfiguration());
- installConfigMap.put(new Long(config.getCreationDate().getTime()), config);
+ installConfigMap.put(Long.valueOf(config.getCreationDate().getTime()), config);
} catch (CoreException e) {
UpdateCore.log(e);
@@ -163,7 +163,7 @@
date.append(" "); //$NON-NLS-1$
date.append(htmlCode.nextToken());
}
- currentConfiguration = (InstallConfiguration)installConfigMap.get(new Long(time));
+ currentConfiguration = (InstallConfiguration)installConfigMap.get(Long.valueOf(time));
}
}
} catch (Exception e) {
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalFeatureParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalFeatureParser.java
index dd71997..8b4d824 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalFeatureParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalFeatureParser.java
@@ -155,7 +155,7 @@
public void internalInit(FeatureModelFactory factory, String location) {
init(factory, location);
- stateStack.push(new Integer(STATE_INITIAL));
+ stateStack.push(Integer.valueOf(STATE_INITIAL));
currentState = ((Integer) stateStack.peek()).intValue();
}
@@ -187,7 +187,7 @@
* @since 2.0
*/
public FeatureModel parse(InputStream in) throws SAXException, IOException {
- stateStack.push(new Integer(STATE_INITIAL));
+ stateStack.push(Integer.valueOf(STATE_INITIAL));
currentState = ((Integer) stateStack.peek()).intValue();
parser.parse(new InputSource(in), this);
return getFeatureModel();
@@ -578,7 +578,7 @@
private void handleInitialState(String elementName, Attributes attributes) throws SAXException {
if (elementName.equals(FEATURE)) {
- stateStack.push(new Integer(STATE_FEATURE));
+ stateStack.push(Integer.valueOf(STATE_FEATURE));
processFeature(attributes);
} else
internalErrorUnknownTag(NLS.bind(Messages.DefaultFeatureParser_UnknownElement, (new String[] { elementName, getState(currentState) })));
@@ -586,31 +586,31 @@
private void handleFeatureState(String elementName, Attributes attributes) throws SAXException {
if (elementName.equals(HANDLER)) {
- stateStack.push(new Integer(STATE_HANDLER));
+ stateStack.push(Integer.valueOf(STATE_HANDLER));
processHandler(attributes);
} else if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION));
+ stateStack.push(Integer.valueOf(STATE_DESCRIPTION));
processInfo(attributes);
} else if (elementName.equals(COPYRIGHT)) {
- stateStack.push(new Integer(STATE_COPYRIGHT));
+ stateStack.push(Integer.valueOf(STATE_COPYRIGHT));
processInfo(attributes);
} else if (elementName.equals(LICENSE)) {
- stateStack.push(new Integer(STATE_LICENSE));
+ stateStack.push(Integer.valueOf(STATE_LICENSE));
processInfo(attributes);
} else if (elementName.equals(URL)) {
- stateStack.push(new Integer(STATE_URL));
+ stateStack.push(Integer.valueOf(STATE_URL));
//No process as URL tag does not contain any element itself
} else if (elementName.equals(INCLUDES)) {
- stateStack.push(new Integer(STATE_INCLUDES));
+ stateStack.push(Integer.valueOf(STATE_INCLUDES));
processIncludes(attributes);
} else if (elementName.equals(REQUIRES)) {
- stateStack.push(new Integer(STATE_REQUIRES));
+ stateStack.push(Integer.valueOf(STATE_REQUIRES));
processRequire(attributes);
} else if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
+ stateStack.push(Integer.valueOf(STATE_PLUGIN));
processPlugin(attributes);
} else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
+ stateStack.push(Integer.valueOf(STATE_DATA));
processData(attributes);
} else
internalErrorUnknownTag(NLS.bind(Messages.DefaultFeatureParser_UnknownElement, (new String[] { elementName, getState(currentState) })));
@@ -618,10 +618,10 @@
private void handleURLState(String elementName, Attributes attributes) throws SAXException {
if (elementName.equals(UPDATE)) {
- stateStack.push(new Integer(STATE_UPDATE));
+ stateStack.push(Integer.valueOf(STATE_UPDATE));
processURLInfo(attributes);
} else if (elementName.equals(DISCOVERY)) {
- stateStack.push(new Integer(STATE_DISCOVERY));
+ stateStack.push(Integer.valueOf(STATE_DISCOVERY));
processURLInfo(attributes);
} else
internalErrorUnknownTag(NLS.bind(Messages.DefaultFeatureParser_UnknownElement, (new String[] { elementName, getState(currentState) })));
@@ -629,44 +629,44 @@
private void handleRequiresState(String elementName, Attributes attributes) throws SAXException {
if (elementName.equals(IMPORT)) {
- stateStack.push(new Integer(STATE_IMPORT));
+ stateStack.push(Integer.valueOf(STATE_IMPORT));
processImport(attributes);
} else
internalErrorUnknownTag(NLS.bind(Messages.DefaultFeatureParser_UnknownElement, (new String[] { elementName, getState(currentState) })));
}
private void handleUpdateDiscoveryState(String elementName, Attributes attributes) throws SAXException {
if (elementName.equals(HANDLER)) {
- stateStack.push(new Integer(STATE_HANDLER));
+ stateStack.push(Integer.valueOf(STATE_HANDLER));
processHandler(attributes);
} else if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION));
+ stateStack.push(Integer.valueOf(STATE_DESCRIPTION));
processInfo(attributes);
} else if (elementName.equals(COPYRIGHT)) {
- stateStack.push(new Integer(STATE_COPYRIGHT));
+ stateStack.push(Integer.valueOf(STATE_COPYRIGHT));
processInfo(attributes);
} else if (elementName.equals(LICENSE)) {
- stateStack.push(new Integer(STATE_LICENSE));
+ stateStack.push(Integer.valueOf(STATE_LICENSE));
processInfo(attributes);
} else if (elementName.equals(URL)) {
- stateStack.push(new Integer(STATE_URL));
+ stateStack.push(Integer.valueOf(STATE_URL));
//No process as URL tag does not contain any element itself
} else if (elementName.equals(INCLUDES)) {
- stateStack.push(new Integer(STATE_INCLUDES));
+ stateStack.push(Integer.valueOf(STATE_INCLUDES));
processIncludes(attributes);
} else if (elementName.equals(REQUIRES)) {
- stateStack.push(new Integer(STATE_REQUIRES));
+ stateStack.push(Integer.valueOf(STATE_REQUIRES));
processRequire(attributes);
} else if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
+ stateStack.push(Integer.valueOf(STATE_PLUGIN));
processPlugin(attributes);
} else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
+ stateStack.push(Integer.valueOf(STATE_DATA));
processData(attributes);
} else if (elementName.equals(UPDATE)) {
- stateStack.push(new Integer(STATE_UPDATE));
+ stateStack.push(Integer.valueOf(STATE_UPDATE));
processURLInfo(attributes);
} else if (elementName.equals(DISCOVERY)) {
- stateStack.push(new Integer(STATE_DISCOVERY));
+ stateStack.push(Integer.valueOf(STATE_DISCOVERY));
processURLInfo(attributes);
} else
internalErrorUnknownTag(NLS.bind(Messages.DefaultFeatureParser_UnknownElement, (new String[] { elementName, getState(currentState) })));
@@ -676,34 +676,34 @@
private void handleImportState(String elementName, Attributes attributes) throws SAXException {
if (elementName.equals(HANDLER)) {
- stateStack.push(new Integer(STATE_HANDLER));
+ stateStack.push(Integer.valueOf(STATE_HANDLER));
processHandler(attributes);
} else if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION));
+ stateStack.push(Integer.valueOf(STATE_DESCRIPTION));
processInfo(attributes);
} else if (elementName.equals(COPYRIGHT)) {
- stateStack.push(new Integer(STATE_COPYRIGHT));
+ stateStack.push(Integer.valueOf(STATE_COPYRIGHT));
processInfo(attributes);
} else if (elementName.equals(LICENSE)) {
- stateStack.push(new Integer(STATE_LICENSE));
+ stateStack.push(Integer.valueOf(STATE_LICENSE));
processInfo(attributes);
} else if (elementName.equals(URL)) {
- stateStack.push(new Integer(STATE_URL));
+ stateStack.push(Integer.valueOf(STATE_URL));
//No process as URL tag does not contain any element itself
} else if (elementName.equals(INCLUDES)) {
- stateStack.push(new Integer(STATE_INCLUDES));
+ stateStack.push(Integer.valueOf(STATE_INCLUDES));
processIncludes(attributes);
} else if (elementName.equals(REQUIRES)) {
- stateStack.push(new Integer(STATE_REQUIRES));
+ stateStack.push(Integer.valueOf(STATE_REQUIRES));
processRequire(attributes);
} else if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
+ stateStack.push(Integer.valueOf(STATE_PLUGIN));
processPlugin(attributes);
} else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
+ stateStack.push(Integer.valueOf(STATE_DATA));
processData(attributes);
} else if (elementName.equals(IMPORT)) {
- stateStack.push(new Integer(STATE_IMPORT));
+ stateStack.push(Integer.valueOf(STATE_IMPORT));
processImport(attributes);
} else
internalErrorUnknownTag(NLS.bind(Messages.DefaultFeatureParser_UnknownElement, (new String[] { elementName, getState(currentState) })));
@@ -1205,7 +1205,7 @@
}
private void internalErrorUnknownTag(String msg) {
- stateStack.push(new Integer(STATE_IGNORED_ELEMENT));
+ stateStack.push(Integer.valueOf(STATE_IGNORED_ELEMENT));
internalError(msg);
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
index f016501..f53dd59 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
@@ -183,11 +183,11 @@
sites.put(site.getURL().toExternalForm(), site);
UpdateCore.getPlugin().getUpdateSession().markVisited(site.getURL());
if (site instanceof ITimestamp) {
- siteTimestamps.put(site.getURL(), new Long(((ITimestamp)site).getTimestamp().getTime()));
+ siteTimestamps.put(site.getURL(), Long.valueOf(((ITimestamp)site).getTimestamp().getTime()));
} else {
try {
IResponse response = ConnectionFactory.get(URLEncoder.encode(siteURL));
- siteTimestamps.put(siteURL, new Long(response.getLastModified()));
+ siteTimestamps.put(siteURL, Long.valueOf(response.getLastModified()));
} catch (MalformedURLException e) {
} catch (IOException e) {
}
@@ -368,13 +368,13 @@
return;
String host = url.getHost();
long sizeByTime = (time == 0) ? 0 : downloadSize / time;
- Long value = new Long(sizeByTime);
+ Long value = Long.valueOf(sizeByTime);
if (estimates == null) {
estimates = new HashMap();
} else {
Long previous = (Long) estimates.get(host);
if (previous != null) {
- value = new Long((previous.longValue() + sizeByTime) / 2);
+ value = Long.valueOf((previous.longValue() + sizeByTime) / 2);
}
}
estimates.put(host, value);
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java
index 3200a9f..e0354c8 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java
@@ -105,7 +105,7 @@
if (mustEncode(c)) {
byte[] bytes = null;
try {
- bytes = new Character(c).toString().getBytes("UTF8"); //$NON-NLS-1$
+ bytes = Character.valueOf(c).toString().getBytes("UTF8"); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
Assert.isTrue(false, e.getMessage());
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
index d1e713a..867e8d5 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
@@ -48,10 +48,10 @@
static {
table = new HashMap();
- table.put("compatible", new Integer(IUpdateConstants.RULE_COMPATIBLE)); //$NON-NLS-1$
- table.put("perfect", new Integer(IUpdateConstants.RULE_PERFECT)); //$NON-NLS-1$
- table.put("equivalent", new Integer(IUpdateConstants.RULE_EQUIVALENT)); //$NON-NLS-1$
- table.put("greaterOrEqual", new Integer(IUpdateConstants.RULE_GREATER_OR_EQUAL)); //$NON-NLS-1$
+ table.put("compatible", Integer.valueOf(IUpdateConstants.RULE_COMPATIBLE)); //$NON-NLS-1$
+ table.put("perfect", Integer.valueOf(IUpdateConstants.RULE_PERFECT)); //$NON-NLS-1$
+ table.put("equivalent", Integer.valueOf(IUpdateConstants.RULE_EQUIVALENT)); //$NON-NLS-1$
+ table.put("greaterOrEqual", Integer.valueOf(IUpdateConstants.RULE_GREATER_OR_EQUAL)); //$NON-NLS-1$
}
// manage URL to File
@@ -465,7 +465,7 @@
if (result != UpdateCore.HTTP_OK) {
String serverMsg = response.getStatusMessage();
response.close();
- throw new FatalIOException(NLS.bind(Messages.ContentReference_HttpNok, (new Object[] { new Integer(result), serverMsg, url })));
+ throw new FatalIOException(NLS.bind(Messages.ContentReference_HttpNok, (new Object[] { Integer.valueOf(result), serverMsg, url })));
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UnconfigureAndUninstallFeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UnconfigureAndUninstallFeatureOperation.java
index ed22c60..03207fa 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UnconfigureAndUninstallFeatureOperation.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UnconfigureAndUninstallFeatureOperation.java
@@ -54,7 +54,7 @@
FileInputStream fis = new FileInputStream(f);
Properties toBeUninstalled = new Properties();
toBeUninstalled.load(fis);
- toBeUninstalled.put(new Integer(toBeUninstalled.size()+1).toString(), targetSite.getSite().getURL() + ";" + feature.getVersionedIdentifier().toString()); //$NON-NLS-1$
+ toBeUninstalled.put(Integer.valueOf(toBeUninstalled.size()+1).toString(), targetSite.getSite().getURL() + ";" + feature.getVersionedIdentifier().toString()); //$NON-NLS-1$
fis.close();
FileOutputStream fos = new FileOutputStream(f);
toBeUninstalled.store(fos, "to be uninstalled on start-up"); //$NON-NLS-1$
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/provisional/SiteOptimizerApplication.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/provisional/SiteOptimizerApplication.java
index 1a979a2..4fff6b8 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/provisional/SiteOptimizerApplication.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/provisional/SiteOptimizerApplication.java
@@ -72,7 +72,7 @@
* @since 3.2
*/
public class SiteOptimizerApplication implements IPlatformRunnable {
- public final static Integer EXIT_ERROR = new Integer(1);
+ public final static Integer EXIT_ERROR = Integer.valueOf(1);
public final static String JAR_PROCESSOR = "-jarProcessor"; //$NON-NLS-1$
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java
index f27932f..45d8f4a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java
@@ -28,7 +28,7 @@
*/
public class StandaloneUpdateApplication implements IPlatformRunnable {
- public final static Integer EXIT_ERROR = new Integer(1);
+ public final static Integer EXIT_ERROR = Integer.valueOf(1);
private static boolean loggedException = false;
/* (non-Javadoc)
