Changeset 10615 in josm for trunk/src/org/openstreetmap/josm/io/session

Timestamp:

2016-07-23T20:04:31+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/io/session

Files:

• GenericSessionExporter.java (modified) (3 diffs)
• SessionReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/session/GenericSessionExporter.java

@@ -9 +9 @@
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.io.File;
 import java.io.IOException;
@@ -153 +151 @@
         }
 
-        link.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                cl.show(cards, "link");
-            }
-        });
-        include.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                cl.show(cards, "include");
-            }
-        });
+        link.addActionListener(e -> cl.show(cards, "link"));
+        include.addActionListener(e -> cl.show(cards, "include"));
 
         topRow.add(export, GBC.std());
@@ -175 +163 @@
         p.add(cards, GBC.eol().insets(15, 0, 3, 3));
 
-        export.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                if (e.getStateChange() == ItemEvent.DESELECTED) {
-                    GuiHelper.setEnabledRec(p, false);
-                    export.setEnabled(true);
-                } else {
-                    GuiHelper.setEnabledRec(p, true);
-                    if (save != null && saveAction != null) {
-                        save.setEnabled(saveAction.isEnabled());
-                    }
-                    link.setEnabled(file != null && file.exists());
+        export.addItemListener(e -> {
+            if (e.getStateChange() == ItemEvent.DESELECTED) {
+                GuiHelper.setEnabledRec(p, false);
+                export.setEnabled(true);
+            } else {
+                GuiHelper.setEnabledRec(p, true);
+                if (save != null && saveAction != null) {
+                    save.setEnabled(saveAction.isEnabled());
                 }
+                link.setEnabled(file != null && file.exists());
             }
         });

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -553 +553 @@
         public void show(final String title, final String message, final int icon, final ProgressMonitor progressMonitor) {
             try {
-                SwingUtilities.invokeAndWait(new Runnable() {
-                    @Override public void run() {
-                        ExtendedDialog dlg = new ExtendedDialog(
-                                Main.parent,
-                                title,
-                                new String[] {tr("Cancel"), tr("Skip layer and continue")}
-                                );
-                        dlg.setButtonIcons(new String[] {"cancel", "dialogs/next"});
-                        dlg.setIcon(icon);
-                        dlg.setContent(message);
-                        dlg.showDialog();
-                        cancel = dlg.getValue() != 2;
-                    }
+                SwingUtilities.invokeAndWait(() -> {
+                    ExtendedDialog dlg = new ExtendedDialog(
+                            Main.parent,
+                            title,
+                            new String[] {tr("Cancel"), tr("Skip layer and continue")}
+                            );
+                    dlg.setButtonIcons(new String[] {"cancel", "dialogs/next"});
+                    dlg.setIcon(icon);
+                    dlg.setContent(message);
+                    dlg.showDialog();
+                    cancel = dlg.getValue() != 2;
                 });
             } catch (InvocationTargetException | InterruptedException ex) {