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

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/widgets

Files:

• DateEditorWithSlider.java (modified) (2 diffs)
• EditableList.java (modified) (2 diffs)
• NativeFileChooser.java (modified) (1 diff)
• TextContextualPopupMenu.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java

@@ -16 +16 @@
 import javax.swing.JSpinner;
 import javax.swing.SpinnerDateModel;
-import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
@@ -52 +51 @@
 
         slider = new JSlider(0, MAX_SLIDER);
-        spinner.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                int i = slider.getValue();
-                Date d = (Date) spinner.getValue();
-                int j = intFromDate(d);
-                if (i != j) {
-                    watchSlider = false;
-                    slider.setValue(j);
-                    watchSlider = true;
-                }
-                for (ChangeListener l : listeners) {
-                    l.stateChanged(e);
-                }
+        spinner.addChangeListener(e -> {
+            int i = slider.getValue();
+            Date d = (Date) spinner.getValue();
+            int j = intFromDate(d);
+            if (i != j) {
+                watchSlider = false;
+                slider.setValue(j);
+                watchSlider = true;
+            }
+            for (ChangeListener l : listeners) {
+                l.stateChanged(e);
             }
         });
-        slider.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                if (!watchSlider) return;
-                Date d = (Date) spinner.getValue();
-                Date d1 = dateFromInt(slider.getValue());
-                if (!d.equals(d1)) {
-                    spinner.setValue(d1);
-                }
+        slider.addChangeListener(e -> {
+            if (!watchSlider) return;
+            Date d = (Date) spinner.getValue();
+            Date d1 = dateFromInt(slider.getValue());
+            if (!d.equals(d1)) {
+                spinner.setValue(d1);
             }
         });

trunk/src/org/openstreetmap/josm/gui/widgets/EditableList.java

@@ -7 +7 @@
 import java.awt.Dimension;
 import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
@@ -46 +44 @@
         setLayout(new BorderLayout());
 
-        addSrcButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                String source = JOptionPane.showInputDialog(
-                        Main.parent,
+        addSrcButton.addActionListener(e -> {
+            String source = JOptionPane.showInputDialog(
+                    Main.parent,
+                    title,
+                    title,
+                    JOptionPane.QUESTION_MESSAGE);
+            if (source != null) {
+                ((DefaultListModel<String>) sourcesList.getModel()).addElement(source);
+            }
+            sourcesList.clearSelection();
+        });
+
+        editSrcButton.addActionListener(e -> {
+            int row = sourcesList.getSelectedIndex();
+            if (row == -1 && sourcesList.getModel().getSize() == 1) {
+                sourcesList.setSelectedIndex(0);
+                row = 0;
+            }
+            if (row == -1) {
+                if (sourcesList.getModel().getSize() == 0) {
+                    String source1 = JOptionPane.showInputDialog(Main.parent, title, title, JOptionPane.QUESTION_MESSAGE);
+                    if (source1 != null) {
+                        ((DefaultListModel<String>) sourcesList.getModel()).addElement(source1);
+                    }
+                } else {
+                    JOptionPane.showMessageDialog(
+                            Main.parent,
+                            tr("Please select the row to edit."),
+                            tr("Information"),
+                            JOptionPane.INFORMATION_MESSAGE
+                    );
+                }
+            } else {
+                String source2 = (String) JOptionPane.showInputDialog(Main.parent,
                         title,
                         title,
-                        JOptionPane.QUESTION_MESSAGE);
-                if (source != null) {
-                    ((DefaultListModel<String>) sourcesList.getModel()).addElement(source);
+                        JOptionPane.QUESTION_MESSAGE, null, null,
+                        sourcesList.getSelectedValue());
+                if (source2 != null) {
+                    ((DefaultListModel<String>) sourcesList.getModel()).setElementAt(source2, row);
                 }
-                sourcesList.clearSelection();
             }
+            sourcesList.clearSelection();
         });
 
-        editSrcButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                int row = sourcesList.getSelectedIndex();
-                if (row == -1 && sourcesList.getModel().getSize() == 1) {
-                    sourcesList.setSelectedIndex(0);
-                    row = 0;
-                }
-                if (row == -1) {
-                    if (sourcesList.getModel().getSize() == 0) {
-                        String source = JOptionPane.showInputDialog(Main.parent, title, title, JOptionPane.QUESTION_MESSAGE);
-                        if (source != null) {
-                            ((DefaultListModel<String>) sourcesList.getModel()).addElement(source);
-                        }
-                    } else {
-                        JOptionPane.showMessageDialog(
-                                Main.parent,
-                                tr("Please select the row to edit."),
-                                tr("Information"),
-                                JOptionPane.INFORMATION_MESSAGE
-                        );
-                    }
-                } else {
-                    String source = (String) JOptionPane.showInputDialog(Main.parent,
-                            title,
-                            title,
-                            JOptionPane.QUESTION_MESSAGE, null, null,
-                            sourcesList.getSelectedValue());
-                    if (source != null) {
-                        ((DefaultListModel<String>) sourcesList.getModel()).setElementAt(source, row);
-                    }
-                }
-                sourcesList.clearSelection();
-            }
-        });
-
-        deleteSrcButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (sourcesList.getSelectedIndex() == -1) {
-                    JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to delete."), tr("Information"),
-                            JOptionPane.QUESTION_MESSAGE);
-                } else {
-                    ((DefaultListModel<String>) sourcesList.getModel()).remove(sourcesList.getSelectedIndex());
-                }
+        deleteSrcButton.addActionListener(e -> {
+            if (sourcesList.getSelectedIndex() == -1) {
+                JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to delete."), tr("Information"),
+                        JOptionPane.QUESTION_MESSAGE);
+            } else {
+                ((DefaultListModel<String>) sourcesList.getModel()).remove(sourcesList.getSelectedIndex());
             }
         });

trunk/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java

@@ -98 +98 @@
     @Override
     public void setFileFilter(final FileFilter cff) {
-        FilenameFilter filter = new FilenameFilter() {
-            @Override
-            public boolean accept(File directory, String fileName) {
-                return cff.accept(new File(directory.getAbsolutePath() + fileName));
-            }
-        };
+        FilenameFilter filter = (directory, fileName) -> cff.accept(new File(directory.getAbsolutePath() + fileName));
         fileDialog.setFilenameFilter(filter);
         fileFilter = cff;

trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
@@ -17 +16 @@
 import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
-import javax.swing.event.UndoableEditEvent;
 import javax.swing.event.UndoableEditListener;
 import javax.swing.text.DefaultEditorKit;
@@ -51 +49 @@
     protected final UndoManager undo = new UndoManager();
 
-    protected final transient UndoableEditListener undoEditListener = new UndoableEditListener() {
-        @Override
-        public void undoableEditHappened(UndoableEditEvent e) {
-            undo.addEdit(e.getEdit());
-            undoAction.updateUndoState();
-            redoAction.updateRedoState();
-        }
+    protected final transient UndoableEditListener undoEditListener = e -> {
+        undo.addEdit(e.getEdit());
+        undoAction.updateUndoState();
+        redoAction.updateRedoState();
     };
 
-    protected final transient PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            if (EDITABLE.equals(evt.getPropertyName())) {
-                removeAll();
-                addMenuEntries();
-            }
+    protected final transient PropertyChangeListener propertyChangeListener = evt -> {
+        if (EDITABLE.equals(evt.getPropertyName())) {
+            removeAll();
+            addMenuEntries();
         }
     };