unnecessary autoboxing removed

thurka · thurka · commit a46ebc8149fd · 2019-01-22T17:29:24.000+01:00
diff --git a/visualvm/application/src/org/graalvm/visualvm/application/ApplicationSupport.java b/visualvm/application/src/org/graalvm/visualvm/application/ApplicationSupport.java
@@ -50,7 +50,7 @@ public static synchronized ApplicationSupport getInstance() {
     
     Application createCurrentApplication() {
         String selfName = ManagementFactory.getRuntimeMXBean().getName();
-        final int selfPid = Integer.valueOf(selfName.substring(0, selfName.indexOf('@')));
+        final Integer selfPid = Integer.valueOf(selfName.substring(0, selfName.indexOf('@')));
         return new CurrentApplication(selfPid, Host.LOCALHOST, Host.LOCALHOST.getHostName() + "-" + selfPid);
     }
     
diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/options/NetworkOptionsModel.java b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/options/NetworkOptionsModel.java
@@ -265,7 +265,7 @@ private static void testProxy(NetworkOptionsPanel panel, int proxyType,
                     String host = ProxySettings.getTestSystemHttpHost();
                     int port = 0;
                     try {
-                        port = Integer.valueOf(ProxySettings.getTestSystemHttpPort());
+                        port = Integer.parseInt(ProxySettings.getTestSystemHttpPort());
                     } catch (NumberFormatException ex) {
                         LOGGER.log(Level.INFO, "Cannot parse port number", ex); //NOI18N
                     }
@@ -278,7 +278,7 @@ private static void testProxy(NetworkOptionsPanel panel, int proxyType,
                     testingProxy = Proxy.NO_PROXY;
                 } else {
                     try {
-                        int proxyPort = Integer.valueOf(proxyPortString);
+                        int proxyPort = Integer.parseInt(proxyPortString);
                         testingProxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort));
                     } catch (NumberFormatException ex) {
                         // shouldn't fall into this code
diff --git a/visualvm/core/src/org/graalvm/visualvm/core/datasupport/Positionable.java b/visualvm/core/src/org/graalvm/visualvm/core/datasupport/Positionable.java
@@ -121,13 +121,11 @@ public int compare(Object o1, Object o2) {
             if (result != 0) return result;
             
             // Compare using System.identityHashCode(o)
-            result = Integer.valueOf(System.identityHashCode(o1)).compareTo(
-                     Integer.valueOf(System.identityHashCode(o2)));
+            result = Integer.compare(System.identityHashCode(o1), System.identityHashCode(o2));
             if (result != 0) return result;
             
             // Compare using o.hashCode()
-            result = Integer.valueOf(o1.hashCode()).compareTo(
-                     Integer.valueOf(o2.hashCode()));
+            result = Integer.compare(o1.hashCode(), o2.hashCode());
             if (result != 0) return result;
             
             // Give up, pretend that second number is greater
diff --git a/visualvm/core/src/org/graalvm/visualvm/core/datasupport/Utils.java b/visualvm/core/src/org/graalvm/visualvm/core/datasupport/Utils.java
@@ -201,8 +201,8 @@ public DataSourcePath(X dataSource) {
         }
 
         public int compareTo(DataSourcePath dataSourcePath) {
-            Integer thisSize = size();
-            return thisSize.compareTo(dataSourcePath.size());
+            int thisSize = size();
+            return Integer.compare(thisSize, dataSourcePath.size());
         }
         
         public X getDataSource() {
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/CCTDisplay.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/CCTDisplay.java
@@ -675,7 +675,7 @@ protected String getNodeSecondaryTime(long time) {
     }
 
     protected String getNodeInvocations(int nCalls) {
-        return Integer.valueOf(nCalls).toString();
+        return Integer.toString(nCalls);
     }
     
     private void initFilterPanel() {        
@@ -759,7 +759,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < columnCount; i++) {
             menuItem = new JCheckBoxMenuItem(columnNames[i]);
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (treeTable != null) {
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/DiffCCTDisplay.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/DiffCCTDisplay.java
@@ -80,7 +80,7 @@ protected String getNodeSecondaryTime(long time) {
     }
 
     protected String getNodeInvocations(int nCalls) {
-        return (nCalls > 0 ? "+" : "") + Integer.valueOf(nCalls).toString(); // NOI18N
+        return (nCalls > 0 ? "+" : "") + Integer.toString(nCalls); // NOI18N
     }
     
     protected void initColumnsData() {
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/FlatProfilePanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/FlatProfilePanel.java
@@ -418,7 +418,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < columnCount; i++) {
             menuItem = new JCheckBoxMenuItem(columnNames[i]);
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (resTable != null) {
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/ReverseCallGraphPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/ReverseCallGraphPanel.java
@@ -671,7 +671,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < columnCount; i++) {
             menuItem = new JCheckBoxMenuItem(columnNames[i]);
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (treeTable != null) {
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/SubtreeCallGraphPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/SubtreeCallGraphPanel.java
@@ -647,7 +647,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < columnCount; i++) {
             menuItem = new JCheckBoxMenuItem(columnNames[i]);
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (treeTable != null) {
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/AllocResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/AllocResultsPanel.java
@@ -350,7 +350,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < columnNames.length; i++) {
             menuItem = new JCheckBoxMenuItem(columnNames[i]);
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (resTable != null) {
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LivenessResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LivenessResultsPanel.java
@@ -505,7 +505,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < columnNames.length; i++) {
             menuItem = new JCheckBoxMenuItem(columnNames[i]);
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (resTable != null) {
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/ReverseMemCallGraphPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/ReverseMemCallGraphPanel.java
@@ -230,7 +230,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < columnCount; i++) {
             menuItem = new JCheckBoxMenuItem(columnNames[i]);
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (treeTable != null) {
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/SampledResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/SampledResultsPanel.java
@@ -348,7 +348,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < columnNames.length; i++) {
             menuItem = new JCheckBoxMenuItem(columnNames[i]);
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (resTable != null) {
diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/HprofInstanceValue.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/HprofInstanceValue.java
@@ -114,12 +114,12 @@ static Object getTypeValue(final HprofByteBuffer dumpBuffer, final long position
 
                 byte bt = dumpBuffer.get(position);
 
-                return new Byte(bt);
+                return Byte.valueOf(bt);
             case HprofHeap.SHORT:
 
                 short sh = dumpBuffer.getShort(position);
 
-                return new Short(sh);
+                return Short.valueOf(sh);
             case HprofHeap.INT:
 
                 int i = dumpBuffer.getInt(position);
@@ -129,7 +129,7 @@ static Object getTypeValue(final HprofByteBuffer dumpBuffer, final long position
 
                 long lg = dumpBuffer.getLong(position);
 
-                return new Long(lg);
+                return Long.valueOf(lg);
             default:
                 return "Invalid type " + type; // NOI18N
         }
diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/CPUCCTContainer.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/CPUCCTContainer.java
@@ -410,7 +410,7 @@ protected void setWaitTime0ForNodeOfs(int dataOfs, long waitTime0) {
 
     protected void addFlatProfTimeForNode(int dataOfs) {
         int methodId = getMethodIdForNodeOfs(dataOfs);
-        Integer methodIdInt = new Integer(methodId);
+        Integer methodIdInt = Integer.valueOf(methodId);
         boolean isRecursiveCall = methodsOnStack.contains(methodIdInt);
         
         if (methodId >= invPerMethodId.length) {
diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/jdbc/SQLStatement.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/jdbc/SQLStatement.java
@@ -233,7 +233,7 @@ void setBytes(int parameterIndex, byte[] x) {
 
     void setDate(int parameterIndex, String x) {
         ensureCapacity(parameterIndex);
-        long time = Long.valueOf(x);
+        long time = Long.parseLong(x);
         if (JDBC_LOGGER.isLoggable(Level.FINER)) {
             JDBC_LOGGER.log(Level.FINER, "setDate index:{0} value:{1}", new Object[]{parameterIndex,new Date(time)});
         }
@@ -246,7 +246,7 @@ void setTime(int parameterIndex, Time x) {
 
     void setTimestamp(int parameterIndex, String x) {
         ensureCapacity(parameterIndex);
-        long time = Long.valueOf(x);
+        long time = Long.parseLong(x);
         if (JDBC_LOGGER.isLoggable(Level.FINER)) {
             JDBC_LOGGER.log(Level.FINER, "setTime index:{0} value:{1}", new Object[]{parameterIndex,new Timestamp(time)});
         }
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ui/ClassesListControllerUI.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ui/ClassesListControllerUI.java
@@ -418,7 +418,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < realClassesListTableModel.getColumnCount(); i++) {
             menuItem = new JCheckBoxMenuItem(realClassesListTableModel.getColumnName(i));
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (classesListTable != null) {
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ui/FieldsBrowserControllerUI.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ui/FieldsBrowserControllerUI.java
@@ -421,7 +421,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < realFieldsListTableModel.getColumnCount(); i++) {
             menuItem = new JCheckBoxMenuItem(realFieldsListTableModel.getColumnName(i));
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (fieldsListTable != null) {
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ui/InstancesListControllerUI.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ui/InstancesListControllerUI.java
@@ -452,7 +452,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < realInstancesListModel.getColumnCount(); i++) {
             menuItem = new JCheckBoxMenuItem(realInstancesListModel.getColumnName(i));
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (instancesListTable != null) {
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ui/ReferencesBrowserControllerUI.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ui/ReferencesBrowserControllerUI.java
@@ -448,7 +448,7 @@ protected void initColumnSelectorItems() {
 
         for (int i = 0; i < realFieldsListTableModel.getColumnCount(); i++) {
             menuItem = new JCheckBoxMenuItem(realFieldsListTableModel.getColumnName(i));
-            menuItem.setActionCommand(Integer.valueOf(i).toString());
+            menuItem.setActionCommand(Integer.toString(i));
             addMenuItemListener(menuItem);
 
             if (fieldsListTable != null) {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static synchronized ApplicationSupport getInstance() {`
`50`	`50`
`51`	`51`	`Application createCurrentApplication() {`
`52`	`52`	`String selfName = ManagementFactory.getRuntimeMXBean().getName();`
`53`		`- final int selfPid = Integer.valueOf(selfName.substring(0, selfName.indexOf('@')));`
	`53`	`+ final Integer selfPid = Integer.valueOf(selfName.substring(0, selfName.indexOf('@')));`
`54`	`54`	`return new CurrentApplication(selfPid, Host.LOCALHOST, Host.LOCALHOST.getHostName() + "-" + selfPid);`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -201,8 +201,8 @@ public DataSourcePath(X dataSource) {`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`public int compareTo(DataSourcePath dataSourcePath) {`
`204`		`- Integer thisSize = size();`
`205`		`- return thisSize.compareTo(dataSourcePath.size());`
	`204`	`+ int thisSize = size();`
	`205`	`+ return Integer.compare(thisSize, dataSourcePath.size());`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`public X getDataSource() {`
Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ protected String getNodeSecondaryTime(long time) {`
`675`	`675`	`}`
`676`	`676`
`677`	`677`	`protected String getNodeInvocations(int nCalls) {`
`678`		`- return Integer.valueOf(nCalls).toString();`
	`678`	`+ return Integer.toString(nCalls);`
`679`	`679`	`}`
`680`	`680`
`681`	`681`	`private void initFilterPanel() {`
`@@ -759,7 +759,7 @@ protected void initColumnSelectorItems() {`
`759`	`759`
`760`	`760`	`for (int i = 0; i < columnCount; i++) {`
`761`	`761`	`menuItem = new JCheckBoxMenuItem(columnNames[i]);`
`762`		`- menuItem.setActionCommand(Integer.valueOf(i).toString());`
	`762`	`+ menuItem.setActionCommand(Integer.toString(i));`
`763`	`763`	`addMenuItemListener(menuItem);`
`764`	`764`
`765`	`765`	`if (treeTable != null) {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ protected String getNodeSecondaryTime(long time) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`protected String getNodeInvocations(int nCalls) {`
`83`		`- return (nCalls > 0 ? "+" : "") + Integer.valueOf(nCalls).toString(); // NOI18N`
	`83`	`+ return (nCalls > 0 ? "+" : "") + Integer.toString(nCalls); // NOI18N`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`protected void initColumnsData() {`