Bug 527018 - [refactoring] Replace use of Number constructors by valueOf
Change-Id: I2176addf3ff822dad5067f2a485e416f66a5dc90
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/ObjectMapTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/ObjectMapTest.java
index bfbf245..497c8b2 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/ObjectMapTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/ObjectMapTest.java
@@ -55,7 +55,7 @@
int max = 100;
Object[] values = new Object[max];
for (int i = 0; i < max; i++) {
- values[i] = new Long(System.currentTimeMillis());
+ values[i] = Long.valueOf(System.currentTimeMillis());
}
// add each object to the map
@@ -156,7 +156,7 @@
ObjectMap<Integer, Object> map = new ObjectMap<>();
values = new Object[max];
for (int i = 0; i < max; i++) {
- values[i] = new Long(System.currentTimeMillis());
+ values[i] = Long.valueOf(System.currentTimeMillis());
map.put(Integer.valueOf(i), values[i]);
}
assertEquals("#populateMap", max, map.size());
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java
index 3bdba91..dbcc2f5 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java
@@ -313,9 +313,9 @@
/**
* Returns interesting resource states. */
protected Integer[] interestingStates() {
- return new Integer[] {Integer.valueOf(S_WORKSPACE_ONLY), Integer.valueOf(S_FILESYSTEM_ONLY), Integer.valueOf(S_UNCHANGED), new Integer(S_CHANGED), new Integer(S_DOES_NOT_EXIST),
- // new Integer(S_FOLDER_TO_FILE),
- // new Integer(S_FILE_TO_FOLDER),
+ return new Integer[] {Integer.valueOf(S_WORKSPACE_ONLY), Integer.valueOf(S_FILESYSTEM_ONLY), Integer.valueOf(S_UNCHANGED), Integer.valueOf(S_CHANGED), new Integer(S_DOES_NOT_EXIST),
+ // Integer.valueOf(S_FOLDER_TO_FILE),
+ // Integer.valueOf(S_FILE_TO_FOLDER),
};
}
@@ -1517,7 +1517,7 @@
}
assertTrue("3.3." + project.getFullPath(), project.getModificationStamp() != IResource.NULL_STAMP);
// cache the value for later use
- table.put(project.getFullPath(), new Long(project.getModificationStamp()));
+ table.put(project.getFullPath(), Long.valueOf(project.getModificationStamp()));
}
for (IResource resource : resources) {
if (resource.getType() != IResource.PROJECT) {
@@ -1525,7 +1525,7 @@
ensureExistsInWorkspace(resource, true);
assertTrue("3.5." + resource.getFullPath(), resource.getModificationStamp() != IResource.NULL_STAMP);
// cache the value for later use
- table.put(resource.getFullPath(), new Long(resource.getModificationStamp()));
+ table.put(resource.getFullPath(), Long.valueOf(resource.getModificationStamp()));
}
}
@@ -1577,7 +1577,7 @@
long old = ((Long) v).longValue();
assertTrue("6.1." + resource.getFullPath(), old != stamp);
// cache for next time
- tempTable.put(resource.getFullPath(), new Long(stamp));
+ tempTable.put(resource.getFullPath(), Long.valueOf(stamp));
}
}
table.clear();
@@ -1622,7 +1622,7 @@
assertNotNull("8.3." + resource.getFullPath(), v);
long old = ((Long) v).longValue();
assertTrue("8.4." + resource.getFullPath(), old != IResource.NULL_STAMP);
- tempTable.put(resource.getFullPath(), new Long(stamp));
+ tempTable.put(resource.getFullPath(), Long.valueOf(stamp));
}
}
table.clear();
@@ -2383,7 +2383,7 @@
}
interestingResources = buildInterestingResources();
- Long[] interestingTimes = new Long[] {new Long(-1), new Long(System.currentTimeMillis() - 1000), new Long(System.currentTimeMillis() - 100), new Long(System.currentTimeMillis()), new Long(Integer.MAX_VALUE * 512L)};
+ Long[] interestingTimes = new Long[] {Long.valueOf(-1), new Long(System.currentTimeMillis() - 1000), new Long(System.currentTimeMillis() - 100), new Long(System.currentTimeMillis()), new Long(Integer.MAX_VALUE * 512L)};
Object[][] inputs = new Object[][] {interestingResources, interestingTimes};
new TestPerformer("IResourceTest.testRefreshLocal") {
@@ -2396,7 +2396,7 @@
IResource receiver = (IResource) args[0];
long time = ((Long) args[1]).longValue();
long actual = receiver.setLocalTimeStamp(time);
- return new Long(actual);
+ return Long.valueOf(actual);
}
@Override
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerAttributeChangeListener.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerAttributeChangeListener.java
index aa27b97..b8c7103 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerAttributeChangeListener.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerAttributeChangeListener.java
@@ -59,7 +59,7 @@
private void checkDelta(IMarkerDelta[] deltas) throws AssertionFailedError {
assertEquals("wrong number of changes", attributeMap.size(), deltas.length);
for (IMarkerDelta delta : deltas) {
- Map<String, Object> values = attributeMap.get(new Long(delta.getId()));
+ Map<String, Object> values = attributeMap.get(Long.valueOf(delta.getId()));
assertEquals("Changes different from expecations", delta.getAttributes(), values);
}
}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_288315.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_288315.java
index 37be70b..ecd20c5 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_288315.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_288315.java
@@ -35,7 +35,7 @@
char[] chars = new char[65537];
Arrays.fill(chars, 'a');
String value1 = new String(chars);
- Float value2 = new Float(1.1);
+ Float value2 = Float.valueOf(1.1f);
IMarker nonPersistentMarker = ResourcesPlugin.getWorkspace().getRoot().createMarker(IMarker.MARKER);
try {
