489660: Change new wrapper classes to use valueOf instead
Calling new Integer() results in the creation of a new object instance, but
the Java implementation of Integer has a cache for small valued objects that
is consulted when calling with .valueOf() instead. Replace wrapper classes
that are instantiated with an equivalent .valueOf() call instead.
Change-Id: I0fbaa103e0f53f6ee3a7669d920239f0862684db
Signed-off-by: Alex Blewitt <alex.blewitt@gmail.com>
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/XmlMemento.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/XmlMemento.java
index 4210308..34eb6e4 100644
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/XmlMemento.java
+++ b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/XmlMemento.java
@@ -350,7 +350,7 @@
}
String strValue = attr.getValue();
try {
- return new Integer(strValue);
+ return Integer.valueOf(strValue);
} catch (NumberFormatException e) {
StatusHandler.log(new Status(IStatus.ERROR, ICommonsCoreConstants.ID_PLUGIN,
"Memento problem - invalid integer for key: " + key //$NON-NLS-1$
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/commons/ui/CommonImages.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/commons/ui/CommonImages.java
index 4b97f81..74848aa 100644
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/commons/ui/CommonImages.java
+++ b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/commons/ui/CommonImages.java
@@ -352,8 +352,8 @@
if (overlay != null) {
key += overlay.hashCode();
}
- key += new Boolean(top).hashCode();
- key += new Boolean(left).hashCode();
+ key += Boolean.valueOf(top).hashCode();
+ key += Boolean.valueOf(left).hashCode();
Image image = getImageRegistry().get(key);
diff --git a/org.eclipse.mylyn.commons.workbench/src/org/eclipse/mylyn/commons/workbench/search/TextSearchControl.java b/org.eclipse.mylyn.commons.workbench/src/org/eclipse/mylyn/commons/workbench/search/TextSearchControl.java
index d7e944d..bb47f83 100644
--- a/org.eclipse.mylyn.commons.workbench/src/org/eclipse/mylyn/commons/workbench/search/TextSearchControl.java
+++ b/org.eclipse.mylyn.commons.workbench/src/org/eclipse/mylyn/commons/workbench/search/TextSearchControl.java
@@ -224,7 +224,7 @@
style |= ICON_SEARCH;
}
testText = new Text(parent, style);
- useNativeSearchField = new Boolean((testText.getStyle() & ICON_CANCEL) != 0
+ useNativeSearchField = Boolean.valueOf((testText.getStyle() & ICON_CANCEL) != 0
&& (!automaticFind || (testText.getStyle() & ICON_SEARCH) != 0));
} finally {
if (testText != null) {
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryCategoryComparator.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryCategoryComparator.java
index 26c571c..9c0373e 100644
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryCategoryComparator.java
+++ b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryCategoryComparator.java
@@ -32,7 +32,7 @@
// don't have to worry about format, since they were already validated
// note that higher relevance appears first, thus the reverse order of
// the comparison.
- i = new Integer(r2).compareTo(new Integer(r1));
+ i = Integer.valueOf(r2).compareTo(Integer.valueOf(r1));
} else if (r1 == null) {
return 1;
} else {
diff --git a/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/DiscoveryViewer.java b/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/DiscoveryViewer.java
index 4c6eacd..176ad7d 100644
--- a/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/DiscoveryViewer.java
+++ b/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/DiscoveryViewer.java
@@ -397,7 +397,7 @@
Text testText = null;
try {
testText = new Text(composite, SWT.SEARCH | SWT.ICON_CANCEL);
- useNativeSearchField = new Boolean((testText.getStyle() & SWT.ICON_CANCEL) != 0);
+ useNativeSearchField = Boolean.valueOf((testText.getStyle() & SWT.ICON_CANCEL) != 0);
} finally {
if (testText != null) {
testText.dispose();
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DataOverviewCollector.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DataOverviewCollector.java
index a3cae5c..1766dc6 100644
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DataOverviewCollector.java
+++ b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DataOverviewCollector.java
@@ -93,7 +93,7 @@
long elapsed = event.getDate().getTime() - lastUserEvent.getDate().getTime();
if (elapsed < FIVEMININMS) {
if (!interactionHistoryActiveDuration.containsKey(userId)) {
- interactionHistoryActiveDuration.put(userId, new Long(0));
+ interactionHistoryActiveDuration.put(userId, Long.valueOf(0));
}
interactionHistoryActiveDuration.put(userId, interactionHistoryActiveDuration.get(userId) + elapsed);
}
