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

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

Files:

• TagEditorModel.java (modified) (2 diffs)
• TagEditorPanel.java (modified) (2 diffs)
• ac/AutoCompletionManager.java (modified) (2 diffs)
• presets/TaggingPreset.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -563 +562 @@
      */
     protected void sort() {
-        Collections.sort(
-                tags,
-                new Comparator<TagModel>() {
-                    @Override
-                    public int compare(TagModel self, TagModel other) {
-                        return self.getName().compareTo(other.getName());
-                    }
-                }
-        );
+        Collections.sort(tags, (self, other) -> self.getName().compareTo(other.getName()));
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java

@@ -15 +15 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -125 +123 @@
 
         if (presetHandler != null) {
-            model.addTableModelListener(new TableModelListener() {
-                @Override
-                public void tableChanged(TableModelEvent e) {
-                    updatePresets();
-                }
-            });
+            model.addTableModelListener(e -> updatePresets());
         }
 

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -38 +38 @@
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.Utils.Function;
 
 /**
@@ -336 +337 @@
             for (TaggingPreset tp : presets) {
                 if (tp.roles != null) {
-                    list.add(Utils.transform(tp.roles.roles, new Utils.Function<Role, String>() {
-                        public String apply(Role x) {
-                            return x.key;
-                        }
-                    }), AutoCompletionItemPriority.IS_IN_STANDARD);
+                    list.add(Utils.transform(tp.roles.roles, (Function<Role, String>) x -> x.key), AutoCompletionItemPriority.IS_IN_STANDARD);
                 }
             }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -59 +59 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ImageResource;
+import org.openstreetmap.josm.tools.ImageProvider.ImageResourceCallback;
 import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
@@ -204 +204 @@
         imgProv.setArchive(arch);
         imgProv.setOptional(true);
-        imgProv.getInBackground(new ImageProvider.ImageResourceCallback() {
-            @Override
-            public void finished(final ImageResource result) {
-                if (result != null) {
-                    GuiHelper.runInEDT(() -> result.attachImageIcon(TaggingPreset.this));
-                } else {
-                    Main.warn(TaggingPreset.this + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
-                }
+        imgProv.getInBackground((ImageResourceCallback) result -> {
+            if (result != null) {
+                GuiHelper.runInEDT(() -> result.attachImageIcon(TaggingPreset.this));
+            } else {
+                Main.warn(TaggingPreset.this + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
             }
         });