use lamdas

thurka · thurka · commit bf48da0a573a · 2025-07-18T22:15:16.000+02:00
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedComboBox.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedComboBox.java
@@ -94,12 +94,7 @@ protected void fireItemStateChanged(ItemEvent e) {
             case ItemEvent.SELECTED:
 
                 if (e.getItem() instanceof JSeparator) {
-                    SwingUtilities.invokeLater(new Runnable() {
-                            public void run() {
-                                selectNextItem();
-                            }
-                        });
-
+                    SwingUtilities.invokeLater(this::selectNextItem);
                 }
 
                 break;
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/CPUResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/CPUResultsPanel.java
@@ -161,11 +161,7 @@ protected JPopupMenu createPopupMenu() {
 
         Font boldfont = popup.getFont().deriveFont(Font.BOLD);
 
-        ActionListener menuListener = new ActionListener() {
-            public void actionPerformed(ActionEvent evt) {
-                menuActionPerformed(evt);
-            }
-        };
+        ActionListener menuListener = this::menuActionPerformed;
 
         boolean separator = true;
         if (popupShowSource != 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
@@ -635,14 +635,7 @@ protected JPopupMenu createPopupMenu() {
             popup.addSeparator();
         }
 
-
-        ActionListener menuListener = new ActionListener() {
-            public void actionPerformed(ActionEvent evt) {
-                menuActionPerformed(evt);
-            }
-        };
-
-        if (popupShowSource != null) popupShowSource.addActionListener(menuListener);
+        if (popupShowSource != null) popupShowSource.addActionListener(this::menuActionPerformed);
 
         return popup;
     }
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/StatisticsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/StatisticsPanel.java
@@ -129,14 +129,11 @@ private String getRelValue(double value) {
 
         private void initComponents() {
             filler.setOpaque(false);
-            nameLabel = new KeyboardAwareLabel(model.isSelectable(index), 
-                            new Runnable() {
-                                public void run() {
-                                    for (Listener l : listeners) {
-                                    l.itemClicked(index);
-                                }
-                            }
-                        });
+            nameLabel = new KeyboardAwareLabel(model.isSelectable(index), () -> {
+                for (Listener l : listeners) {
+                    l.itemClicked(index);
+                }
+            });
 
             valueLabel.setOpaque(false);
             valueLabel.setHorizontalAlignment(SwingConstants.TRAILING);
@@ -487,11 +484,7 @@ public StatisticsPanel(HTMLTextArea navArea, PieChart pieChart, Runnable navigat
 
         initComponents(navArea, pieChart);
 
-        pieChart.getModel().addChartModelListener(new ChartModelListener() {
-                public void chartDataChanged() {
-                    updateItemPresenters();
-                }
-            });
+        pieChart.getModel().addChartModelListener(this::updateItemPresenters);
     }
 
     //~ Methods ------------------------------------------------------------------------------------------------------------------
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/jdbc/SQLFilterPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/jdbc/SQLFilterPanel.java
@@ -177,9 +177,7 @@ protected void populatePopup(JPopupMenu popup) {
                             protected void fireActionPerformed(ActionEvent e) {
                                 if (!isSelected()) current.commands.add(command);
                                 else current.commands.remove(command);
-                                SwingUtilities.invokeLater(new Runnable() {
-                                    public void run() { apply(); }
-                                });
+                                SwingUtilities.invokeLater(SQLFilterPanel.this::apply);
                             }
                         };
                         popup.add(i);
@@ -204,9 +202,7 @@ protected void displayPopup() {
                         protected void selectionChanged(Collection<String> selected) {
                             current.tables.clear();
                             current.tables.addAll(selected);
-                            SwingUtilities.invokeLater(new Runnable() {
-                                public void run() { apply(); }
-                            });
+                            SwingUtilities.invokeLater(SQLFilterPanel.this::apply);
                         }
                     }.show(this);
                 }
@@ -228,29 +224,23 @@ protected void populatePopup(JPopupMenu popup) {
                     protected void fireActionPerformed(ActionEvent e) {
                         if (!isSelected()) current.statements.add(JdbcCCTProvider.SQL_STATEMENT);
                         else current.statements.remove(JdbcCCTProvider.SQL_STATEMENT);
-                        SwingUtilities.invokeLater(new Runnable() {
-                            public void run() { apply(); }
-                        });
+                        SwingUtilities.invokeLater(SQLFilterPanel.this::apply);
                     }
                 });
                 
                 popup.add(new JCheckBoxMenuItem(STATEMENT_PREPARED, !current.statements.contains(JdbcCCTProvider.SQL_PREPARED_STATEMENT)) {
                     protected void fireActionPerformed(ActionEvent e) {
                         if (!isSelected()) current.statements.add(JdbcCCTProvider.SQL_PREPARED_STATEMENT);
                         else current.statements.remove(JdbcCCTProvider.SQL_PREPARED_STATEMENT);
-                        SwingUtilities.invokeLater(new Runnable() {
-                            public void run() { apply(); }
-                        });
+                        SwingUtilities.invokeLater(SQLFilterPanel.this::apply);
                     }
                 });
                 
                 popup.add(new JCheckBoxMenuItem(STATEMENT_CALLABLE, !current.statements.contains(JdbcCCTProvider.SQL_CALLABLE_STATEMENT)) {
                     protected void fireActionPerformed(ActionEvent e) {
                         if (!isSelected()) current.statements.add(JdbcCCTProvider.SQL_CALLABLE_STATEMENT);
                         else current.statements.remove(JdbcCCTProvider.SQL_CALLABLE_STATEMENT);
-                        SwingUtilities.invokeLater(new Runnable() {
-                            public void run() { apply(); }
-                        });
+                        SwingUtilities.invokeLater(SQLFilterPanel.this::apply);
                     }
                 });
             }
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/MemoryResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/MemoryResultsPanel.java
@@ -177,11 +177,7 @@ public void actionPerformed(ActionEvent e) {
         jScrollPane.getViewport().setBackground(table.getBackground());
 
         if (!registeredMouseListenerWithResTable) {
-            jScrollPane.addMouseWheelListener(new MouseWheelListener() {
-                    public void mouseWheelMoved(MouseWheelEvent e) {
-                        table.mouseWheelMoved(e);
-                    }
-                });
+            jScrollPane.addMouseWheelListener(table);
 
             table.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
                     public void valueChanged(ListSelectionEvent e) {
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTreeTable.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTreeTable.java
@@ -588,9 +588,7 @@ protected TableRowSorter createRowSorter() {
         ProfilerRowSorter s = new ProfilerTreeTableSorter(getModel()) {
             public void allRowsChanged() {
                 // Must invoke later, JTree.getRowCount() not ready yet
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() { updateColumnsPreferredWidth(); }
-                });
+                SwingUtilities.invokeLater(ProfilerTreeTable.this::updateColumnsPreferredWidth);
             }
             protected void setSortKeysImpl(List newKeys) {
                 // TODO: Improve to not call createComparator(newKeys) here and from super
@@ -1473,9 +1471,7 @@ public void fireTreeCollapsed(TreePath path) {
                 super.removeDescendantToggledPaths(Collections.enumeration(Collections.singletonList(path)));
                 // NOTE: uncachePath() must be called for all DescendantToggledPaths once implemented!
                 ((SortedFilteredTreeModel)getModel()).clearPath(path);
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() { updateUI(); }
-                });
+                SwingUtilities.invokeLater(this::updateUI);
             }
         }
         
diff --git a/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/TimelineView.java b/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/TimelineView.java
@@ -164,19 +164,15 @@ JComponent getView() {
 
         selectAllButton = new JButton(Icons.getIcon(TracerIcons.SELECT_ALL)) {
             protected void fireActionPerformed(ActionEvent e) {
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() { support.selectAll(); }
-                });
+                SwingUtilities.invokeLater(support::selectAll);
             }
         };
         selectAllButton.setToolTipText(Bundle.TOOLTIP_SelectAll());
         toolbar.add(selectAllButton);
         
         clearTimestampSelectionButton = new JButton(Icons.getIcon(TracerIcons.MARK_CLEAR)) {
             protected void fireActionPerformed(ActionEvent e) {
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() { support.resetSelectedTimestamps(); }
-                });
+                SwingUtilities.invokeLater(support::resetSelectedTimestamps);
             }
         };
         clearTimestampSelectionButton.setToolTipText(Bundle.TOOLTIP_ClearMarks());
diff --git a/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/TracerModel.java b/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/TracerModel.java
@@ -70,11 +70,7 @@ public final class TracerModel {
 
     public TracerModel(IdeSnapshot snapshot) {
         this.snapshot = snapshot;
-        timelineSupport = new TimelineSupport(new TimelineSupport.DescriptorResolver() {
-            public TracerProbeDescriptor getDescriptor(TracerProbe p) {
-                return TracerModel.this.getDescriptor(p);
-            }
-        }, snapshot);
+        timelineSupport = new TimelineSupport(TracerModel.this::getDescriptor, snapshot);
     }
 
 
@@ -181,11 +177,7 @@ private void addProbe(TracerPackage p, TracerProbeDescriptor d) {
             descriptorsCache.put(r, d);
         }
         synchronized(probesCache) {
-            List<TracerProbe> probes = probesCache.get(p);
-            if (probes == null) {
-                probes = new ArrayList();
-                probesCache.put(p, probes);
-            }
+            List<TracerProbe> probes = probesCache.computeIfAbsent(p, k -> new ArrayList<>());
             probes.add(r);
         }
 
diff --git a/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/swing/ColorIcon.java b/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/swing/ColorIcon.java
@@ -67,12 +67,7 @@ public static void setup(int width, int height, Color foreground, Color backgrou
     }
 
     public static ColorIcon fromColor(Color color) {
-        ColorIcon icon = icons.get(color);
-        if (icon == null) {
-            icon = new ColorIcon(color);
-            icons.put(color, icon);
-        }
-        return icon;
+        return icons.computeIfAbsent(color, ColorIcon::new);
     }
 
 
diff --git a/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/timeline/TimelineAxis.java b/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/timeline/TimelineAxis.java
@@ -455,9 +455,7 @@ private static class Axis extends AxisComponent {
             this.marksComputer = marksComputer;
             this.marksPainter = new TimelineMarksPainter();
 
-            repainter = new Runnable() {
-                public void run() { Axis.this.chart.invalidateRepaint(); }
-            };
+            repainter = Axis.this.chart::invalidateRepaint;
         }
 
 
diff --git a/visualvm/profiler/src/org/graalvm/visualvm/profiler/ApplicationProfilerView.java b/visualvm/profiler/src/org/graalvm/visualvm/profiler/ApplicationProfilerView.java
@@ -497,11 +497,7 @@ private void handleStopProfiling() {
           if (internalChange) return;
 
           disableControlButtons();
-          ProfilerUtils.runInProfilerRequestProcessor(new Runnable() {
-            public void run() {
-                profiler.detachFromApp();
-            }
-          });
+          ProfilerUtils.runInProfilerRequestProcessor(profiler::detachFromApp);
         }
 
 
diff --git a/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/PresetSelector.java b/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/PresetSelector.java
@@ -69,9 +69,7 @@ public final class PresetSelector extends JPanel {
         
         initComponents();
         
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() { notifySynchronizer(); }
-        });
+        SwingUtilities.invokeLater(this::notifySynchronizer);
     }
     
     
@@ -126,9 +124,7 @@ private void actionRequested() {
     }
     
     private void notifySynchronizer() {
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() { presetSynchronizer.run(); }
-        });
+        SwingUtilities.invokeLater(presetSynchronizer::run);
     }
     
     
diff --git a/visualvm/startup/src/org/graalvm/visualvm/modules/startup/ImportSettings.java b/visualvm/startup/src/org/graalvm/visualvm/modules/startup/ImportSettings.java
@@ -158,9 +158,7 @@ boolean isSupportedImport(File dir) {
             
             @Override
             void contentsChanged() {
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() { d.pack(); }
-                });
+                SwingUtilities.invokeLater(d::pack);
             }
 
             @Override

Original file line number	Diff line number	Diff line change
`@@ -635,14 +635,7 @@ protected JPopupMenu createPopupMenu() {`
`635`	`635`	`popup.addSeparator();`
`636`	`636`	`}`
`637`	`637`
`638`		`-`
`639`		`- ActionListener menuListener = new ActionListener() {`
`640`		`- public void actionPerformed(ActionEvent evt) {`
`641`		`- menuActionPerformed(evt);`
`642`		`- }`
`643`		`- };`
`644`		`-`
`645`		`- if (popupShowSource != null) popupShowSource.addActionListener(menuListener);`
	`638`	`+ if (popupShowSource != null) popupShowSource.addActionListener(this::menuActionPerformed);`
`646`	`639`
`647`	`640`	`return popup;`
`648`	`641`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,12 +67,7 @@ public static void setup(int width, int height, Color foreground, Color backgrou`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public static ColorIcon fromColor(Color color) {`
`70`		`- ColorIcon icon = icons.get(color);`
`71`		`- if (icon == null) {`
`72`		`- icon = new ColorIcon(color);`
`73`		`- icons.put(color, icon);`
`74`		`- }`
`75`		`- return icon;`
	`70`	`+ return icons.computeIfAbsent(color, ColorIcon::new);`
`76`	`71`	`}`
`77`	`72`
`78`	`73`