minor performance improvements

thurka · thurka · commit 980dfb0609e5 · 2022-08-28T09:34:31.000+02:00
diff --git a/visualvm/application/src/org/graalvm/visualvm/application/ApplicationDescriptor.java b/visualvm/application/src/org/graalvm/visualvm/application/ApplicationDescriptor.java
@@ -171,7 +171,7 @@ protected static String resolveCustomName(Application application) {
 
             if (propIndex != -1) {  // display name propery detected on commandline
                 propIndex += DISPLAY_NAME_PROPERTY.length();
-                int endIndex = args.indexOf(" ", propIndex); // NOI18N
+                int endIndex = args.indexOf(' ', propIndex); // NOI18N
                 if (endIndex == -1) return args.substring(propIndex);
                 else return args.substring(propIndex, endIndex);
             }
diff --git a/visualvm/application/src/org/graalvm/visualvm/application/type/NetBeansBasedApplicationType.java b/visualvm/application/src/org/graalvm/visualvm/application/type/NetBeansBasedApplicationType.java
@@ -71,11 +71,11 @@ public Set<String> getClusters() {
      */
     public String getName() {
         if (fullVersionString != null) {
-            int index = fullVersionString.indexOf("("); // NOI18N
+            int index = fullVersionString.indexOf('('); // NOI18N
             if (index != -1) {
                 return fullVersionString.substring(0,index).trim();
             }
-            index = fullVersionString.lastIndexOf(" "); // NOI18N
+            index = fullVersionString.lastIndexOf(' '); // NOI18N
             if (index != -1) {
                 String buildNo = fullVersionString.substring(index+1);
                 if (buildNo.length()>19 && buildNo.charAt(8)=='-') { // NOI18N
diff --git a/visualvm/charts/src/org/graalvm/visualvm/charts/SimpleXYChartDescriptor.java b/visualvm/charts/src/org/graalvm/visualvm/charts/SimpleXYChartDescriptor.java
@@ -268,11 +268,11 @@ public void setYAxisDescription(String yAxisDescription) {
 
 
     String[] getItemNames() {
-        return itemNames.toArray(new String[itemNames.size()]);
+        return itemNames.toArray(new String[0]);
     }
 
     Color[] getItemColors() {
-        return itemColors.toArray(new Color[itemColors.size()]);
+        return itemColors.toArray(new Color[0]);
     }
 
     float[] getLineWidths() {
@@ -284,17 +284,17 @@ float[] getLineWidths() {
 
     Color[] getLineColors() {
         return lineColors.isEmpty() ? null :
-               lineColors.toArray(new Color[lineColors.size()]);
+               lineColors.toArray(new Color[0]);
     }
 
     Color[] getFillColors1() {
         return fillColors1.isEmpty() ? null :
-               fillColors1.toArray(new Color[fillColors1.size()]);
+               fillColors1.toArray(new Color[0]);
     }
 
     Color[] getFillColors2() {
         return fillColors2.isEmpty() ? null :
-               fillColors2.toArray(new Color[fillColors2.size()]);
+               fillColors2.toArray(new Color[0]);
     }
 
     String[] getDetailsItems() {
diff --git a/visualvm/core/src/org/graalvm/visualvm/core/datasupport/Utils.java b/visualvm/core/src/org/graalvm/visualvm/core/datasupport/Utils.java
@@ -220,7 +220,7 @@ public X getDataSource() {
      * @return filename without extension.
      */
     public static String getFileBase(String fileName) {
-        int extIndex = fileName.lastIndexOf("."); // NOI18N
+        int extIndex = fileName.lastIndexOf('.'); // NOI18N
         if (extIndex == -1) return fileName;
         return fileName.substring(0, extIndex);
     }
@@ -232,7 +232,7 @@ public static String getFileBase(String fileName) {
      * @return file extension.
      */
     public static String getFileExt(String fileName) {
-        int extIndex = fileName.lastIndexOf("."); // NOI18N
+        int extIndex = fileName.lastIndexOf('.'); // NOI18N
         if (extIndex == -1) return ""; // NOI18N
         return fileName.substring(extIndex);
     }
diff --git a/visualvm/core/src/org/graalvm/visualvm/core/explorer/ExplorerSupport.java b/visualvm/core/src/org/graalvm/visualvm/core/explorer/ExplorerSupport.java
@@ -104,7 +104,7 @@ public void run() {
                     ExplorerNode node = getNode(dataSource);
                     if (node != null) selectedPaths.add(getPath(node));
                 }
-                mainTree.setSelectionPaths(selectedPaths.isEmpty() ? null : selectedPaths.toArray(new TreePath[selectedPaths.size()]));
+                mainTree.setSelectionPaths(selectedPaths.isEmpty() ? null : selectedPaths.toArray(new TreePath[0]));
             } 
         });
     }
diff --git a/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/SourcesRoot.java b/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/SourcesRoot.java
@@ -175,7 +175,7 @@ private static boolean isFile(Path path) {
     
     
     private static Object[] resolve(String root) {
-        int idx = root.indexOf("[");                                            // NOI18N
+        int idx = root.indexOf('[');                                            // NOI18N
         String[] subpaths = null;
         Charset encoding = StandardCharsets.UTF_8;
         
diff --git a/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/java/JavaSourceUtils.java b/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/java/JavaSourceUtils.java
@@ -75,7 +75,7 @@ private JavaSourceUtils() {}
     
     static String toplevelClassName(String className) {
         className = className.replace("[]", "");                                // NOI18N
-        int innerIndex = className.indexOf("$");                                // NOI18N
+        int innerIndex = className.indexOf('$');                                // NOI18N
         return innerIndex == -1 ? className : className.substring(0, innerIndex);
     }
     
@@ -85,7 +85,7 @@ static String toplevelClassFile(String toplevelClassName) {
     
     
     static String plainClassName(String className) {
-        int index = className.lastIndexOf(".");                                 // NOI18N
+        int index = className.lastIndexOf('.');                                 // NOI18N
         return index == -1 ? className : className.substring(index + 1);
     }
     
diff --git a/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/truffle/TruffleSourceHandleProvider.java b/visualvm/gotosource/src/org/graalvm/visualvm/gotosource/truffle/TruffleSourceHandleProvider.java
@@ -62,7 +62,7 @@ public final class TruffleSourceHandleProvider extends SourceHandleProvider {
     
     @Override
     public SourceHandle createHandle(String className, String methodName, String methodSignature, int line) {        
-        int langIdIdx = className.indexOf(".");                                 // NOI18N
+        int langIdIdx = className.indexOf('.');                                 // NOI18N
         String langId = langIdIdx == -1 ? className : className.substring(0, langIdIdx);
         String language = SUPPORTED_LANGUAGES.get(langId);
         
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/JavaGoToSourceAction.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/JavaGoToSourceAction.java
@@ -86,7 +86,7 @@ private GoToSourceAction(StackFrameNode sfNode) {
             
             String name = sfNode.getName();
             
-            int fileIdx = name.indexOf("("); // NOI18N
+            int fileIdx = name.indexOf('('); // NOI18N
             String methodName = name.substring(0, fileIdx);
             String fileName = name.substring(fileIdx);
             
diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/exceptions/ExceptionsRenderers.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/exceptions/ExceptionsRenderers.java
@@ -78,7 +78,7 @@ public void setValue(Object value, int row) {
             if (node instanceof ExceptionsNode.Class) {
                 javaRenderer.setVisible(true);
                 String name = node.name;
-                int colon = name.indexOf(":");                                  // NOI18N
+                int colon = name.indexOf(':');                                  // NOI18N
                 if (colon > 0) {
                     javaRenderer.setValue(name.substring(0, colon).trim(), row);
                     simpleRenderer.setVisible(true);
diff --git a/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/JmxApplication.java b/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/JmxApplication.java
@@ -103,7 +103,7 @@ public int getPid() {
                     if (rt != null) {
                         String name = rt.getName();
                         if (name != null && name.contains("@")) { // NOI18N
-                            name = name.substring(0, name.indexOf("@")); // NOI18N
+                            name = name.substring(0, name.indexOf('@')); // NOI18N
                             pid = Integer.parseInt(name);
                         }
                     }
@@ -302,7 +302,7 @@ private boolean checkHostName(RuntimeMXBean localRuntime, RuntimeMXBean remoteRu
     
     private String getHostName(String runtimeName) {
         if (runtimeName == null) return null;
-        int index = runtimeName.indexOf("@");       // NOI18N
+        int index = runtimeName.indexOf('@');       // NOI18N
 
         if (index >= 0) {
             return runtimeName.substring(index+1);
diff --git a/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/JmxApplicationProvider.java b/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/JmxApplicationProvider.java
@@ -343,15 +343,15 @@ private String getHostName(JMXServiceURL serviceURL) {
                 if ('/' == urlPath.charAt(0)) { // NOI18N
                     hostname = "localhost"; // NOI18N
                 } else if ('[' == urlPath.charAt(0)) { // IPv6 address  // NOI18N
-                    int closingSquareBracketIndex = urlPath.indexOf("]"); // NOI18N
+                    int closingSquareBracketIndex = urlPath.indexOf(']'); // NOI18N
                     if (closingSquareBracketIndex == -1) {
                         hostname = null;
                     } else {
                         hostname = urlPath.substring(0, closingSquareBracketIndex + 1);
                     }
                 } else {
-                    int colonIndex = urlPath.indexOf(":"); // NOI18N
-                    int slashIndex = urlPath.indexOf("/"); // NOI18N
+                    int colonIndex = urlPath.indexOf(':'); // NOI18N
+                    int slashIndex = urlPath.indexOf('/'); // NOI18N
                     int min = Math.min(colonIndex, slashIndex); // NOTE: can be -1!!!
                     if (min == -1) {
                         min = 0;
diff --git a/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/JmxModelImpl.java b/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/JmxModelImpl.java
@@ -160,7 +160,7 @@ class JmxModelImpl extends JmxModel {
                     while (st.hasMoreTokens()) {
                         String token = st.nextToken();
                         if (token.startsWith("-Dcom.sun.management.jmxremote.port=")) { // NOI18N
-                            port = Integer.parseInt(token.substring(token.indexOf("=") + 1)); // NOI18N
+                            port = Integer.parseInt(token.substring(token.indexOf('=') + 1)); // NOI18N
                         } else if (token.equals("-Dcom.sun.management.jmxremote.authenticate=true")) { // NOI18N
                             authenticate = true;
                         }
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/charts/PieChart.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/charts/PieChart.java
@@ -172,7 +172,7 @@ public int[] getSelectedItems() {
         int[] items = new int[selectedItems.size()];
 
         for (int i = 0; i < selectedItems.size(); i++) {
-            items[i] = ((Integer) selectedItems.get(i)).intValue();
+            items[i] = selectedItems.get(i).intValue();
         }
 
         return items;
diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/ClassMethodSelector.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/ClassMethodSelector.java
@@ -511,7 +511,7 @@ public boolean accept(File f) {
                             }
                             String ext = null;
                             String n = f.getName();
-                            int index = n.lastIndexOf("."); // NOI18N
+                            int index = n.lastIndexOf('.'); // NOI18N
                             if (index > -1) {
                                 ext = n.substring(index + 1);
                             }
diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/SnapshotsWindowUI.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/SnapshotsWindowUI.java
@@ -742,7 +742,7 @@ void loadDetails() {
             }
             customName = fileName.equals(displayName);
             if (!customName) {
-                String _timestamp = fileName.substring(fileName.lastIndexOf("-")); // NOI18N
+                String _timestamp = fileName.substring(fileName.lastIndexOf('-')); // NOI18N
                 try { timestamp = Long.parseLong(_timestamp); } catch (NumberFormatException e) {}
             }
         }
diff --git a/visualvm/profiler/src/org/graalvm/visualvm/profiler/ProfilerSupport.java b/visualvm/profiler/src/org/graalvm/visualvm/profiler/ProfilerSupport.java
@@ -362,11 +362,11 @@ static boolean classSharingBreaksProfiling(Application application) {
     }
     
     private static int getUpdateNumber(String javaRTVersion) {
-        int underscoreIndex = javaRTVersion.indexOf("_"); // NOI18N
+        int underscoreIndex = javaRTVersion.indexOf('_'); // NOI18N
         if (underscoreIndex == -1) return 0; // Assumes no update, may be incorrect for unexpected javaRTVersion format
         
         try {
-            String updateNumberString = javaRTVersion.substring(underscoreIndex + "_".length(), javaRTVersion.indexOf("-")); // NOI18N
+            String updateNumberString = javaRTVersion.substring(underscoreIndex + "_".length(), javaRTVersion.indexOf('-')); // NOI18N
             return Integer.parseInt(updateNumberString);
         } catch (Exception e) {}
         
diff --git a/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilerPresets.java b/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilerPresets.java
@@ -296,7 +296,7 @@ private static String getDefaultRootsP(Application application) {
         if (application == null) return DEFINE_CLASSES;
         String mainClass = getMainClass(application);
         if ("".equals(mainClass)) return DEFINE_CLASSES; // unknown main class
-        int dotIndex = mainClass.lastIndexOf("."); // NOI18N
+        int dotIndex = mainClass.lastIndexOf('.'); // NOI18N
         if (dotIndex == -1) return mainClass;  // default package
         else return mainClass.substring(0, dotIndex + 1) + "**"; // NOI18N
     }

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ protected static String resolveCustomName(Application application) {`
`171`	`171`
`172`	`172`	`if (propIndex != -1) { // display name propery detected on commandline`
`173`	`173`	`propIndex += DISPLAY_NAME_PROPERTY.length();`
`174`		`- int endIndex = args.indexOf(" ", propIndex); // NOI18N`
	`174`	`+ int endIndex = args.indexOf(' ', propIndex); // NOI18N`
`175`	`175`	`if (endIndex == -1) return args.substring(propIndex);`
`176`	`176`	`else return args.substring(propIndex, endIndex);`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,11 +268,11 @@ public void setYAxisDescription(String yAxisDescription) {`
`268`	`268`
`269`	`269`
`270`	`270`	`String[] getItemNames() {`
`271`		`- return itemNames.toArray(new String[itemNames.size()]);`
	`271`	`+ return itemNames.toArray(new String[0]);`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`Color[] getItemColors() {`
`275`		`- return itemColors.toArray(new Color[itemColors.size()]);`
	`275`	`+ return itemColors.toArray(new Color[0]);`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`float[] getLineWidths() {`
`@@ -284,17 +284,17 @@ float[] getLineWidths() {`
`284`	`284`
`285`	`285`	`Color[] getLineColors() {`
`286`	`286`	`return lineColors.isEmpty() ? null :`
`287`		`- lineColors.toArray(new Color[lineColors.size()]);`
	`287`	`+ lineColors.toArray(new Color[0]);`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`Color[] getFillColors1() {`
`291`	`291`	`return fillColors1.isEmpty() ? null :`
`292`		`- fillColors1.toArray(new Color[fillColors1.size()]);`
	`292`	`+ fillColors1.toArray(new Color[0]);`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`Color[] getFillColors2() {`
`296`	`296`	`return fillColors2.isEmpty() ? null :`
`297`		`- fillColors2.toArray(new Color[fillColors2.size()]);`
	`297`	`+ fillColors2.toArray(new Color[0]);`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`String[] getDetailsItems() {`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public void run() {`
`104`	`104`	`ExplorerNode node = getNode(dataSource);`
`105`	`105`	`if (node != null) selectedPaths.add(getPath(node));`
`106`	`106`	`}`
`107`		`- mainTree.setSelectionPaths(selectedPaths.isEmpty() ? null : selectedPaths.toArray(new TreePath[selectedPaths.size()]));`
	`107`	`+ mainTree.setSelectionPaths(selectedPaths.isEmpty() ? null : selectedPaths.toArray(new TreePath[0]));`
`108`	`108`	`}`
`109`	`109`	`});`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ private JavaSourceUtils() {}`
`75`	`75`
`76`	`76`	`static String toplevelClassName(String className) {`
`77`	`77`	`className = className.replace("[]", ""); // NOI18N`
`78`		`- int innerIndex = className.indexOf("$"); // NOI18N`
	`78`	`+ int innerIndex = className.indexOf('$'); // NOI18N`
`79`	`79`	`return innerIndex == -1 ? className : className.substring(0, innerIndex);`
`80`	`80`	`}`
`81`	`81`
`@@ -85,7 +85,7 @@ static String toplevelClassFile(String toplevelClassName) {`
`85`	`85`
`86`	`86`
`87`	`87`	`static String plainClassName(String className) {`
`88`		`- int index = className.lastIndexOf("."); // NOI18N`
	`88`	`+ int index = className.lastIndexOf('.'); // NOI18N`
`89`	`89`	`return index == -1 ? className : className.substring(index + 1);`
`90`	`90`	`}`
`91`	`91`