lower the number of javac warnings

thurka · thurka · commit f877ece443b3 · 2022-11-04T13:17:32.000+01:00
diff --git a/visualvm/libs.profiler/lib.profiler.heap/src/org/graalvm/visualvm/lib/jfluid/heap/HprofGCRoots.java b/visualvm/libs.profiler/lib.profiler.heap/src/org/graalvm/visualvm/lib/jfluid/heap/HprofGCRoots.java
@@ -137,8 +137,8 @@ private void computeGCRootsFor(TagBounds tagBounds) {
                     if (val == null) {
                         gcRoots.put(objectId, root);
                     } else if (val instanceof GCRoot) {
-                        Collection vals = new ArrayList(2);
-                        vals.add(val);
+                        Collection<GCRoot> vals = new ArrayList<>(2);
+                        vals.add((GCRoot)val);
                         vals.add(root);
                         gcRoots.put(objectId, vals);
                     } else {
diff --git a/visualvm/libs.profiler/lib.profiler.heap/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/HeapTest.java b/visualvm/libs.profiler/lib.profiler.heap/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/HeapTest.java
@@ -88,7 +88,7 @@ public void tearDown() {
     @Test
     public void testGetAllClasses() {
         System.out.println("getAllClasses");
-        List result = heap.getAllClasses();
+        List<JavaClass> result = heap.getAllClasses();
         assertEquals(443, result.size());
     }
 
@@ -116,7 +116,7 @@ public void testGetGCRoot() {
     @Test
     public void testGetGCRoots() {
         System.out.println("getGCRoots");
-        Collection result = heap.getGCRoots();
+        Collection<GCRoot> result = heap.getGCRoots();
         assertEquals(491, result.size());
     }
     
@@ -165,7 +165,7 @@ public void testGetJavaClassByID() {
     public void testGetJavaClassesByRegExp() {
         System.out.println("getJavaClassesByRegExp");
         String regexp = ".*Lock.*";
-        Collection result = heap.getJavaClassesByRegExp(regexp);
+        Collection<JavaClass> result = heap.getJavaClassesByRegExp(regexp);
         assertEquals(9, result.size());
     }
 
@@ -244,7 +244,7 @@ public void getInstancesIterator() {
         
         for (JavaClass clazz : classes) {
             List<Instance> instances = clazz.getInstances();
-            Iterator instIt = clazz.getInstancesIterator();
+            Iterator<Instance> instIt = clazz.getInstancesIterator();
             
             for (Instance i : instances) {
                 assertTrue(instIt.hasNext());
@@ -274,8 +274,7 @@ public void testHeapDumpLog() throws IOException, URISyntaxException {
         Collection<JavaClass> classes = heap.getAllClasses();
         out.println("Classes size "+classes.size());
         out.println("System properties: ");
-        for(Object en : heap.getSystemProperties().entrySet()) {
-            Map.Entry entry = (Map.Entry) en;
+        for(Map.Entry<?, ?> entry : heap.getSystemProperties().entrySet()) {
             
             out.println(entry.getKey()+" "+entry.getValue());
         }
diff --git a/visualvm/libs.profiler/profiler.attach/src/org/graalvm/visualvm/lib/profiler/attach/dialog/AttachDialog.java b/visualvm/libs.profiler/profiler.attach/src/org/graalvm/visualvm/lib/profiler/attach/dialog/AttachDialog.java
@@ -98,6 +98,7 @@
     "AttachDialog_ReloadProcesses=Reload processes", // NOI18N
     "AttachDialog_ShowDetails=Show process details", // NOI18N
     "AttachDialog_ConnectToSelected=&Always connect to selected process", // NOI18N
+    "# {0} - process name",   // NOI18N
     "AttachDialog_ConnectToProcess=&Always connect to \"{0}\"", // NOI18N
     "AttachDialog_FilterProcesses=Filter processes", // NOI18N
     "AttachDialog_Profile=&Profile:", // NOI18N
@@ -117,6 +118,7 @@
     "AttachDialog_DetailsUnknown=unknown", // NOI18N
     "AttachDialog_DetailsNone=none", // NOI18N
     "AttachDialog_BtnClose=Close", // NOI18N
+    "# {0} - process name",   // NOI18N
     "AttachDialog_DetailsCaption=Details of {0}", // NOI18N
     "AttachDialog_Steps=P&erform the following steps to start profiling:", // NOI18N
     "AttachDialog_ProcessNameTtp=Process name", // NOI18N
@@ -149,7 +151,7 @@ public boolean configured(AttachSettings settings) {
             RunningVM[] vms = JpsProxy.getRunningVMs();
             if (vms == null || vms.length == 0) return false; // no locally running processes for dynamic attach
             
-            List<RunningVM> targets = new ArrayList();
+            List<RunningVM> targets = new ArrayList<>();
             for (RunningVM vm : vms)
                 if (getProcessName(vm.getMainClass()).equals(name))
                     targets.add(vm); // all processes with the preferred process name ready for profiling
diff --git a/visualvm/libs.profiler/profiler.attach/src/org/graalvm/visualvm/lib/profiler/attach/providers/TargetPlatformEnum.java b/visualvm/libs.profiler/profiler.attach/src/org/graalvm/visualvm/lib/profiler/attach/providers/TargetPlatformEnum.java
@@ -90,8 +90,8 @@ public int hashCode() {
         return jvmIndex;
     }
 
-    public static Iterator iterator() {
-        List jvmList = new ArrayList(16);
+    public static Iterator<TargetPlatformEnum> iterator() {
+        List<TargetPlatformEnum> jvmList = new ArrayList<>(16);
         jvmList.add(JDK5);
         jvmList.add(JDK6);
         jvmList.add(JDK7);
diff --git a/visualvm/libs.profiler/profiler.attach/src/org/graalvm/visualvm/lib/profiler/attach/steps/BasicAttachStepsProvider.java b/visualvm/libs.profiler/profiler.attach/src/org/graalvm/visualvm/lib/profiler/attach/steps/BasicAttachStepsProvider.java
@@ -93,7 +93,7 @@ public class BasicAttachStepsProvider extends AttachStepsProvider {
     protected String currentARCH = LINK_64ARCH;
     
     
-    private final Set<ChangeListener> listeners = new HashSet();
+    private final Set<ChangeListener> listeners = new HashSet<>();
     
     public synchronized final void addChangeListener(ChangeListener listener) {
         listeners.add(listener);
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/api/DetailsSupport.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/api/DetailsSupport.java
@@ -92,8 +92,8 @@ private static List<ProviderClassPair> getCompatibleProviders(JavaClass cls) {
         if (cachedPairs != null) return cachedPairs;
         
         // All registered className|DetailsProvider pairs
-        List<ProviderClassPair> allPairs = new ArrayList();
-        List<ProviderClassPair> simplePairs = new ArrayList();
+        List<ProviderClassPair> allPairs = new ArrayList<>();
+        List<ProviderClassPair> simplePairs = new ArrayList<>();
         Collection<? extends DetailsProvider> providers = getProviders();
         for (DetailsProvider provider : providers) {
             String[] classes = provider.getSupportedClasses();
@@ -103,7 +103,7 @@ private static List<ProviderClassPair> getCompatibleProviders(JavaClass cls) {
             else simplePairs.add(new ProviderClassPair(provider, null));
         }
         
-        List<ProviderClassPair> pairs = new ArrayList();
+        List<ProviderClassPair> pairs = new ArrayList<>();
         
         // Only compatible className|DetailsProvider pairs
         if (!allPairs.isEmpty()) {
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/basic/ArrayDetailsProvider.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/basic/ArrayDetailsProvider.java
@@ -38,6 +38,7 @@
  */
 @NbBundle.Messages({
     "ArrayDetailsProvider_OneItemString=1 item",                                // NOI18N
+    "# {0} - number of items",                                                  // NOI18N
     "ArrayDetailsProvider_ItemsNumberString={0} items"                          // NOI18N
 })
 @ServiceProvider(service=DetailsProvider.class)
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/IoDetailsProvider.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/IoDetailsProvider.java
@@ -74,7 +74,7 @@ public String getDetailsString(String className, Instance instance) {
             case FD_MASK: // FileDescriptor
                 synchronized (CACHE_LOCK) {
                     if (CACHE == null) {
-                        CACHE = new WeakHashMap();
+                        CACHE = new WeakHashMap<>();
                     }
                     Heap heap = instance.getJavaClass().getHeap();
                     Map<Long,String> heapCache = CACHE.get(heap);
@@ -92,7 +92,7 @@ public String getDetailsString(String className, Instance instance) {
     }
 
     private Map<Long, String> computeFDCache(Heap heap, JavaClass fdClass) {
-        Map<Long, String> cache = new HashMap();
+        Map<Long, String> cache = new HashMap<>();
         computeFDCacheForClass(heap, FD_RAF_CLASS, "fd", cache);                // NOI18N
         computeFDCacheForClass(heap, FD_FIS_CLASS, "fd", cache);                // NOi18N
         computeFDCacheForClass(heap, FD_FOS_CLASS, "fd", cache);                // NOI18N
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/NetDetailsProvider.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/NetDetailsProvider.java
@@ -81,7 +81,7 @@ public String getDetailsString(String className, Instance instance) {
                     // JDK-8015743, variant with holder (6u65, 7u45, 8)
                     host = DetailsUtils.getInstanceFieldString(holder, "hostName");                               // NOI18N
                     if (INET4_ADDRESS_MASK.equals(className)) {
-                        instance = (Instance) holder;
+                        instance = holder;
                     } else {
                         instance = (Instance) instance.getValueOfField("holder6");
                     }
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/UtilDetailsProvider.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/UtilDetailsProvider.java
@@ -225,6 +225,7 @@ public String getDetailsString(String className, Instance instance) {
     
     @NbBundle.Messages({
         "UtilDetailsProvider_OneItemString=1 element",                          // NOI18N
+        "# {0} - number of elements",                                           // NOI18N
         "UtilDetailsProvider_ItemsNumberString={0} elements"                    // NOI18N
     })
     private static String getElementsString(int length) {
@@ -295,7 +296,7 @@ public String getMessage() {
         public Object[] getParameters() {
             Object pars = record.getValueOfField("parameters");
             if (pars instanceof ObjectArrayInstance) {
-                List parameters = new ArrayList();
+                List<String> parameters = new ArrayList<>();
 
                 for (Instance o : ((ObjectArrayInstance)pars).getValues()) {
                     String par = null;
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/ButtonBuilders.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/ButtonBuilders.java
@@ -30,6 +30,7 @@
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
@@ -54,7 +55,7 @@
 final class ButtonBuilders {
 
     // Make sure subclasses are listed before base class if using isSubclassOf
-    static ComponentBuilder getBuilder(Instance instance) {
+    static ComponentBuilder<? extends JComponent> getBuilder(Instance instance) {
         if (DetailsUtils.isSubclassOf(instance, JButton.class.getName())) {
             return new JButtonBuilder(instance);
         } else if (DetailsUtils.isSubclassOf(instance, JCheckBox.class.getName())) {
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/ComponentBuilders.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/ComponentBuilders.java
@@ -90,7 +90,7 @@ private static final class ChildrenBuilder extends InstanceBuilder<Component[]>
         ChildrenBuilder(Instance instance) {
             super(instance);
             
-            component = new ArrayList();
+            component = new ArrayList<>();
             
             if (instance instanceof ObjectArrayInstance) {                      // Component[] (JDK 5-)
                 List<Instance> components = ((ObjectArrayInstance)instance).getValues();
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/DataViewBuilders.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/DataViewBuilders.java
@@ -30,6 +30,7 @@
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.DefaultListModel;
 import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.JList;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
@@ -54,7 +55,7 @@
 final class DataViewBuilders {
 
     // Make sure subclasses are listed before base class if using isSubclassOf
-    static ComponentBuilder getBuilder(Instance instance) {
+    static ComponentBuilder<? extends JComponent> getBuilder(Instance instance) {
         if (DetailsUtils.isSubclassOf(instance, JComboBox.class.getName())) {
             return new JComboBoxBuilder(instance);
         } else if (DetailsUtils.isSubclassOf(instance, JList.class.getName())) {
@@ -70,7 +71,7 @@ static ComponentBuilder getBuilder(Instance instance) {
     }
     
     
-    private static class JComboBoxBuilder extends JComponentBuilder<JComboBox> {
+    private static class JComboBoxBuilder extends JComponentBuilder<JComboBox<String>> {
         
         private final boolean isEditable;
         private final String selectedObject;
@@ -98,27 +99,27 @@ private static class JComboBoxBuilder extends JComponentBuilder<JComboBox> {
             selectedObject = _selectedObject;
         }
         
-        protected void setupInstance(JComboBox instance) {
+        protected void setupInstance(JComboBox<String> instance) {
             super.setupInstance(instance);
             
             instance.setEditable(isEditable);
             if (selectedObject != null) instance.addItem(selectedObject);
         }
         
-        protected JComboBox createInstanceImpl() {
-            return new JComboBox();
+        protected JComboBox<String> createInstanceImpl() {
+            return new JComboBox<>();
         }
         
     }
     
-    private static class DefaultListModelBuilder extends InstanceBuilder<DefaultListModel> {
+    private static class DefaultListModelBuilder extends InstanceBuilder<DefaultListModel<String>> {
         
         private final List<String> model;
         
         DefaultListModelBuilder(Instance instance) {
             super(instance);
             
-            model = new ArrayList();
+            model = new ArrayList<>();
             
             Object _delegate = instance.getValueOfField("delegate");
             if (_delegate instanceof Instance) {
@@ -149,19 +150,19 @@ static DefaultListModelBuilder fromField(Instance instance, String field) {
             return new DefaultListModelBuilder((Instance)model);
         }
         
-        protected void setupInstance(DefaultListModel instance) {
+        protected void setupInstance(DefaultListModel<String> instance) {
             super.setupInstance(instance);
             
             for (String item : model) instance.addElement(item);
         }
         
-        protected DefaultListModel createInstanceImpl() {
-            return new DefaultListModel();
+        protected DefaultListModel<String> createInstanceImpl() {
+            return new DefaultListModel<>();
         }
         
     }
     
-    private static class JListBuilder extends JComponentBuilder<JList> {
+    private static class JListBuilder extends JComponentBuilder<JList<String>> {
         
         private final DefaultListModelBuilder dataModel;
         
@@ -171,15 +172,15 @@ private static class JListBuilder extends JComponentBuilder<JList> {
             dataModel = DefaultListModelBuilder.fromField(instance, "dataModel");
         }
         
-        protected void setupInstance(JList instance) {
+        protected void setupInstance(JList<String> instance) {
             super.setupInstance(instance);
             
-            ListModel model = dataModel == null ? null : dataModel.createInstance();
+            ListModel<String> model = dataModel == null ? null : dataModel.createInstance();
             if (model != null) instance.setModel(model);
         }
         
-        protected JList createInstanceImpl() {
-            return new JList();
+        protected JList<String> createInstanceImpl() {
+            return new JList<>();
         }
         
     }
@@ -240,7 +241,7 @@ private static class TableColumnModelBuilder extends InstanceBuilder<DefaultTabl
         TableColumnModelBuilder(Instance instance) {
             super(instance);
             
-            tableColumns = new ArrayList();
+            tableColumns = new ArrayList<>();
             columnMargin = DetailsUtils.getIntFieldValue(instance, "columnMargin", 1);
             
             Object _columns = instance.getValueOfField("tableColumns");
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/JComponentBuilders.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/JComponentBuilders.java
@@ -28,6 +28,7 @@
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.DefaultBoundedRangeModel;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
@@ -53,7 +54,7 @@
 final class JComponentBuilders {
 
     // Make sure subclasses are listed before base class if using isSubclassOf
-    static ComponentBuilder getBuilder(Instance instance) {
+    static ComponentBuilder<? extends JComponent> getBuilder(Instance instance) {
         if (DetailsUtils.isSubclassOf(instance, JLabel.class.getName())) {
             return new JLabelBuilder(instance);
         } else if (DetailsUtils.isSubclassOf(instance, JPanel.class.getName())) {
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/PaneBuilders.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/PaneBuilders.java
@@ -26,6 +26,7 @@
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Container;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.JScrollPane;
@@ -53,7 +54,7 @@
 final class PaneBuilders {
 
     // Make sure subclasses are listed before base class if using isSubclassOf
-    static ComponentBuilder getBuilder(Instance instance) {
+    static ComponentBuilder<? extends Container> getBuilder(Instance instance) {
         if (DetailsUtils.isSubclassOf(instance, JViewport.class.getName())) {
             return new JViewportBuilder(instance);
         } else if (DetailsUtils.isSubclassOf(instance, JScrollPane.class.getName())) {
@@ -186,7 +187,7 @@ private static class PageImplBuilder extends InstanceBuilder<List<PageImpl>> {
         PageImplBuilder(Instance instance) {
             super(instance);
             
-            pages = new ArrayList(1);
+            pages = new ArrayList<>(1);
             
             Object _elementData = instance.getValueOfField("elementData");
             if (_elementData instanceof ObjectArrayInstance) {
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/TextComponentBuilders.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/TextComponentBuilders.java
@@ -44,7 +44,7 @@
 final class TextComponentBuilders {
 
     // Make sure subclasses are listed before base class if using isSubclassOf
-    static ComponentBuilders.ComponentBuilder getBuilder(Instance instance) {
+    static ComponentBuilders.ComponentBuilder<? extends JTextComponent> getBuilder(Instance instance) {
         if (DetailsUtils.isSubclassOf(instance, JTextField.class.getName())) {
             return new JTextFieldBuilder(instance);
         } else if (DetailsUtils.isSubclassOf(instance, JTextArea.class.getName())) {
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/Utils.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/Utils.java
@@ -85,7 +85,7 @@ static String getFieldString(Instance instance, String field) {
         Object _s = instance.getValueOfField(field);
         if (_s instanceof Instance) {
             try {
-                Class proxy = Class.forName("org.graalvm.visualvm.lib.jfluid.heap.HprofProxy"); // NOI18N
+                Class<?> proxy = Class.forName("org.graalvm.visualvm.lib.jfluid.heap.HprofProxy"); // NOI18N
                 Method method = proxy.getDeclaredMethod("getString", Instance.class); // NOI18N
                 method.setAccessible(true);
                 return (String) method.invoke(proxy, _s);
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/WindowBuilders.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/WindowBuilders.java
@@ -55,7 +55,7 @@
 final class WindowBuilders {
 
     // Make sure subclasses are listed before base class if using isSubclassOf
-    static ComponentBuilder getBuilder(Instance instance) {
+    static ComponentBuilder<? extends Component> getBuilder(Instance instance) {
         if (DetailsUtils.isSubclassOf(instance, JRootPane.class.getName())) {
             return new JRootPaneBuilder(instance);
         } else if (DetailsUtils.isSubclassOf(instance, JDesktopPane.class.getName())) {
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/netbeans/EditorDetailsProvider.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/netbeans/EditorDetailsProvider.java

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public String getDetailsString(String className, Instance instance) {`
`81`	`81`	`// JDK-8015743, variant with holder (6u65, 7u45, 8)`
`82`	`82`	`host = DetailsUtils.getInstanceFieldString(holder, "hostName"); // NOI18N`
`83`	`83`	`if (INET4_ADDRESS_MASK.equals(className)) {`
`84`		`- instance = (Instance) holder;`
	`84`	`+ instance = holder;`
`85`	`85`	`} else {`
`86`	`86`	`instance = (Instance) instance.getValueOfField("holder6");`
`87`	`87`	`}`