Changeset 10611 in josm for trunk/src/org/openstreetmap/josm/gui/util

Timestamp:

2016-07-23T18:46:45+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes containing only one method should become lambdas

Location:

trunk/src/org/openstreetmap/josm/gui/util

Files:

• AdjustmentSynchronizer.java (modified) (3 diffs)
• AdvancedKeyPressDetector.java (modified) (2 diffs)
• GuiHelper.java (modified) (3 diffs)
• StayOpenCheckBoxMenuItem.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java

@@ -8 +8 @@
 import java.awt.event.AdjustmentListener;
 import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -15 +14 @@
 
 import javax.swing.JCheckBox;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -125 +122 @@
         // register an item lister with the check box
         //
-        view.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                switch(e.getStateChange()) {
-                case ItemEvent.SELECTED:
-                    if (!isParticipatingInSynchronizedScrolling(adjustable)) {
-                        setParticipatingInSynchronizedScrolling(adjustable, true);
-                    }
-                    break;
-                case ItemEvent.DESELECTED:
-                    if (isParticipatingInSynchronizedScrolling(adjustable)) {
-                        setParticipatingInSynchronizedScrolling(adjustable, false);
-                    }
-                    break;
-                default: // Do nothing
+        view.addItemListener(e -> {
+            switch(e.getStateChange()) {
+            case ItemEvent.SELECTED:
+                if (!isParticipatingInSynchronizedScrolling(adjustable)) {
+                    setParticipatingInSynchronizedScrolling(adjustable, true);
                 }
+                break;
+            case ItemEvent.DESELECTED:
+                if (isParticipatingInSynchronizedScrolling(adjustable)) {
+                    setParticipatingInSynchronizedScrolling(adjustable, false);
+                }
+                break;
+            default: // Do nothing
             }
         });
 
-        observable.addChangeListener(
-                new ChangeListener() {
-                    @Override
-                    public void stateChanged(ChangeEvent e) {
-                        boolean sync = isParticipatingInSynchronizedScrolling(adjustable);
-                        if (view.isSelected() != sync) {
-                            view.setSelected(sync);
-                        }
-                    }
-                }
-        );
+        observable.addChangeListener(e -> {
+            boolean sync = isParticipatingInSynchronizedScrolling(adjustable);
+            if (view.isSelected() != sync) {
+                view.setSelected(sync);
+            }
+        });
         setParticipatingInSynchronizedScrolling(adjustable, true);
         view.setSelected(true);

trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

@@ -9 +9 @@
 import java.awt.Toolkit;
 import java.awt.event.AWTEventListener;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.util.List;
@@ -83 +81 @@
             Main.warn(ex);
         }
-        timer = new Timer(0, new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                timer.stop();
-                if (set.remove(releaseEvent.getKeyCode()) && enabled) {
-                    if (isFocusInMainWindow()) {
-                        for (KeyPressReleaseListener q: keyListeners) {
-                            q.doKeyReleased(releaseEvent);
-                        }
-                    }
+        timer = new Timer(0, e -> {
+            timer.stop();
+            if (set.remove(releaseEvent.getKeyCode()) && enabled && isFocusInMainWindow()) {
+                for (KeyPressReleaseListener q: keyListeners) {
+                    q.doKeyReleased(releaseEvent);
                 }
             }

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -22 +22 @@
 import java.awt.Window;
 import java.awt.event.ActionListener;
-import java.awt.event.HierarchyEvent;
-import java.awt.event.HierarchyListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
@@ -91 +89 @@
 
     public static void executeByMainWorkerInEDT(final Runnable task) {
-        Main.worker.submit(new Runnable() {
-            @Override
-            public void run() {
-                runInEDTAndWait(task);
-            }
-        });
+        Main.worker.submit(() -> runInEDTAndWait(task));
     }
 
@@ -272 +265 @@
     public static Component prepareResizeableOptionPane(final Component pane, final Dimension minDimension) {
         if (pane != null) {
-            pane.addHierarchyListener(new HierarchyListener() {
-                @Override
-                public void hierarchyChanged(HierarchyEvent e) {
-                    Window window = SwingUtilities.getWindowAncestor(pane);
-                    if (window instanceof Dialog) {
-                        Dialog dialog = (Dialog) window;
-                        if (!dialog.isResizable()) {
-                            dialog.setResizable(true);
-                            if (minDimension != null) {
-                                dialog.setMinimumSize(minDimension);
-                            }
+            pane.addHierarchyListener(e -> {
+                Window window = SwingUtilities.getWindowAncestor(pane);
+                if (window instanceof Dialog) {
+                    Dialog dialog = (Dialog) window;
+                    if (!dialog.isResizable()) {
+                        dialog.setResizable(true);
+                        if (minDimension != null) {
+                            dialog.setMinimumSize(minDimension);
                         }
                     }

trunk/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java

@@ -6 +6 @@
 import javax.swing.MenuElement;
 import javax.swing.MenuSelectionManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 
 /**
@@ -19 +17 @@
 
   {
-    getModel().addChangeListener(new ChangeListener() {
-
-      @Override
-      public void stateChanged(ChangeEvent e) {
+    getModel().addChangeListener(e -> {
         if (getModel().isArmed() && isShowing()) {
           path = MenuSelectionManager.defaultManager().getSelectedPath();
         }
-      }
-    });
+      });
   }