Changeset 10608 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2016-07-23T15:46:39+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/data/osm

Files:

• ChangesetCache.java (modified) (3 diffs)
• DataSet.java (modified) (2 diffs)
• NoteData.java (modified) (3 diffs)
• OsmPrimitive.java (modified) (5 diffs)
• Relation.java (modified) (3 diffs)
• event/SelectionEventManager.java (modified) (1 diff)
• history/History.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -70 +69 @@
 
     protected void fireChangesetCacheEvent(final ChangesetCacheEvent e) {
-        GuiHelper.runInEDT(new Runnable() {
-            @Override public void run() {
-                for (ChangesetCacheListener l: listeners) {
-                    l.changesetCacheUpdated(e);
-                }
+        GuiHelper.runInEDT(() -> {
+            for (ChangesetCacheListener l: listeners) {
+                l.changesetCacheUpdated(e);
             }
         });
@@ -206 +203 @@
             return getOpenChangesets();
         } else {
-            return new ArrayList<>(Utils.filter(getOpenChangesets(), new Predicate<Changeset>() {
-                @Override
-                public boolean evaluate(Changeset object) {
-                    return JosmUserIdentityManager.getInstance().isCurrentUser(object.getUser());
-                }
-            }));
+            return new ArrayList<>(Utils.filter(getOpenChangesets(),
+                    object -> JosmUserIdentityManager.getInstance().isCurrentUser(object.getUser())));
         }
     }

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -47 +47 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.tools.FilteredCollection;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
@@ -614 +613 @@
      */
     public Collection<OsmPrimitive> getSelectedNodesAndWays() {
-        return new FilteredCollection<>(getSelected(), new Predicate<OsmPrimitive>() {
-            @Override
-            public boolean evaluate(OsmPrimitive primitive) {
-                return primitive instanceof Node || primitive instanceof Way;
-            }
-        });
+        return new FilteredCollection<>(getSelected(), primitive -> primitive instanceof Node || primitive instanceof Way);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.notes.NoteComment;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -37 +36 @@
      * Within each subgroup it sorts by ID
      */
-    public static final Comparator<Note> DEFAULT_COMPARATOR = new Comparator<Note>() {
-        @Override
-        public int compare(Note n1, Note n2) {
-            if (n1.getId() < 0 && n2.getId() > 0) {
-                return 1;
-            }
-            if (n1.getId() > 0 && n2.getId() < 0) {
-                return -1;
-            }
-            if (n1.getState() == State.CLOSED && n2.getState() == State.OPEN) {
-                return 1;
-            }
-            if (n1.getState() == State.OPEN && n2.getState() == State.CLOSED) {
-                return -1;
-            }
-            return Long.compare(Math.abs(n1.getId()), Math.abs(n2.getId()));
-        }
+    public static final Comparator<Note> DEFAULT_COMPARATOR = (n1, n2) -> {
+        if (n1.getId() < 0 && n2.getId() > 0) {
+            return 1;
+        }
+        if (n1.getId() > 0 && n2.getId() < 0) {
+            return -1;
+        }
+        if (n1.getState() == State.CLOSED && n2.getState() == State.OPEN) {
+            return 1;
+        }
+        if (n1.getState() == State.OPEN && n2.getState() == State.CLOSED) {
+            return -1;
+        }
+        return Long.compare(Math.abs(n1.getId()), Math.abs(n2.getId()));
     };
 
     /** Sorts notes strictly by creation date */
-    public static final Comparator<Note> DATE_COMPARATOR = new Comparator<Note>() {
-        @Override
-        public int compare(Note n1, Note n2) {
+    public static final Comparator<Note> DATE_COMPARATOR = (n1, n2) -> n1.getCreatedAt().compareTo(n2.getCreatedAt());
+
+    /** Sorts notes by user, then creation date */
+    public static final Comparator<Note> USER_COMPARATOR = (n1, n2) -> {
+        String n1User = n1.getFirstComment().getUser().getName();
+        String n2User = n2.getFirstComment().getUser().getName();
+        if (n1User.equals(n2User)) {
             return n1.getCreatedAt().compareTo(n2.getCreatedAt());
         }
+        return n1.getFirstComment().getUser().getName().compareTo(n2.getFirstComment().getUser().getName());
     };
 
-    /** Sorts notes by user, then creation date */
-    public static final Comparator<Note> USER_COMPARATOR = new Comparator<Note>() {
-        @Override
-        public int compare(Note n1, Note n2) {
-            String n1User = n1.getFirstComment().getUser().getName();
-            String n2User = n2.getFirstComment().getUser().getName();
-            if (n1User.equals(n2User)) {
-                return n1.getCreatedAt().compareTo(n2.getCreatedAt());
-            }
-            return n1.getFirstComment().getUser().getName().compareTo(n2.getFirstComment().getUser().getName());
-        }
-    };
-
     /** Sorts notes by the last modified date */
-    public static final Comparator<Note> LAST_ACTION_COMPARATOR = new Comparator<Note>() {
-        @Override
-        public int compare(Note n1, Note n2) {
-            Date n1Date = n1.getComments().get(n1.getComments().size()-1).getCommentTimestamp();
-            Date n2Date = n2.getComments().get(n2.getComments().size()-1).getCommentTimestamp();
-            return n1Date.compareTo(n2Date);
-        }
+    public static final Comparator<Note> LAST_ACTION_COMPARATOR = (n1, n2) -> {
+        Date n1Date = n1.getComments().get(n1.getComments().size()-1).getCommentTimestamp();
+        Date n2Date = n2.getComments().get(n2.getComments().size()-1).getCommentTimestamp();
+        return n1Date.compareTo(n2Date);
     };
 
@@ -169 +154 @@
             } else {
                 final Note existingNote = noteList.get(newNote);
-                final boolean isDirty = Utils.exists(existingNote.getComments(), new Predicate<NoteComment>() {
-                    @Override
-                    public boolean evaluate(NoteComment object) {
-                        return object.isNew();
-                    }
-                });
+                final boolean isDirty = Utils.exists(existingNote.getComments(), object -> object.isNew());
                 if (!isDirty) {
                     noteList.put(newNote);

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -110 +110 @@
 
     /**
+     * A tagged way that matches this pattern has a direction.
+     * @see #FLAG_HAS_DIRECTIONS
+     */
+    private static volatile Match directionKeys;
+
+    /**
+     * A tagged way that matches this pattern has a direction that is reversed.
+     * <p>
+     * This pattern should be a subset of {@link #directionKeys}
+     * @see #FLAG_DIRECTION_REVERSED
+     */
+    private static volatile Match reversedDirectionKeys;
+
+    static {
+        String reversedDirectionDefault = "oneway=\"-1\"";
+
+        String directionDefault = "oneway? | (aerialway=* -aerialway=station) | "+
+                "waterway=stream | waterway=river | waterway=ditch | waterway=drain | "+
+                "\"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" | "+
+                "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
+                "(highway=motorway_link & -oneway=no & -oneway=reversible)";
+
+        reversedDirectionKeys = compileDirectionKeys("tags.reversed_direction", reversedDirectionDefault);
+        directionKeys = compileDirectionKeys("tags.direction", directionDefault);
+    }
+
+    /**
      * Replies the sub-collection of {@link OsmPrimitive}s of type <code>type</code> present in
      * another collection of {@link OsmPrimitive}s. The result collection is a list.
@@ -174 +201 @@
      * @see OsmPrimitive#isUsable()
      */
-    public static final Predicate<OsmPrimitive> isUsablePredicate = new Predicate<OsmPrimitive>() {
-        @Override
-        public boolean evaluate(OsmPrimitive primitive) {
-            return primitive.isUsable();
-        }
-    };
+    public static final Predicate<OsmPrimitive> isUsablePredicate = primitive -> primitive.isUsable();
 
     /**
      * A predicate filtering primitives that are selectable.
      */
-    public static final Predicate<OsmPrimitive> isSelectablePredicate = new Predicate<OsmPrimitive>() {
-        @Override
-        public boolean evaluate(OsmPrimitive primitive) {
-            return primitive.isSelectable();
-        }
-    };
+    public static final Predicate<OsmPrimitive> isSelectablePredicate = primitive -> primitive.isSelectable();
 
     /**
      * A predicate filtering primitives that are not deleted.
      */
-    public static final Predicate<OsmPrimitive> nonDeletedPredicate = new Predicate<OsmPrimitive>() {
-        @Override public boolean evaluate(OsmPrimitive primitive) {
-            return !primitive.isDeleted();
-        }
-    };
+    public static final Predicate<OsmPrimitive> nonDeletedPredicate = primitive -> !primitive.isDeleted();
 
     /**
      * A predicate filtering primitives that are not deleted and not incomplete.
      */
-    public static final Predicate<OsmPrimitive> nonDeletedCompletePredicate = new Predicate<OsmPrimitive>() {
-        @Override public boolean evaluate(OsmPrimitive primitive) {
-            return !primitive.isDeleted() && !primitive.isIncomplete();
-        }
-    };
+    public static final Predicate<OsmPrimitive> nonDeletedCompletePredicate =
+            primitive -> !primitive.isDeleted() && !primitive.isIncomplete();
 
     /**
      * A predicate filtering primitives that are not deleted and not incomplete and that are not a relation.
      */
-    public static final Predicate<OsmPrimitive> nonDeletedPhysicalPredicate = new Predicate<OsmPrimitive>() {
-        @Override public boolean evaluate(OsmPrimitive primitive) {
-            return !primitive.isDeleted() && !primitive.isIncomplete() && !(primitive instanceof Relation);
-        }
-    };
+    public static final Predicate<OsmPrimitive> nonDeletedPhysicalPredicate =
+            primitive -> !primitive.isDeleted() && !primitive.isIncomplete() && !(primitive instanceof Relation);
 
     /**
      * A predicate filtering primitives that are modified
      */
-    public static final Predicate<OsmPrimitive> modifiedPredicate = new Predicate<OsmPrimitive>() {
-        @Override public boolean evaluate(OsmPrimitive primitive) {
-            return primitive.isModified();
-        }
-    };
+    public static final Predicate<OsmPrimitive> modifiedPredicate = primitive -> primitive.isModified();
 
     /**
@@ -245 +248 @@
      * A predicate filtering multipolygon relations.
      */
-    public static final Predicate<OsmPrimitive> multipolygonPredicate = new Predicate<OsmPrimitive>() {
-        @Override public boolean evaluate(OsmPrimitive primitive) {
-            return primitive.getClass() == Relation.class && ((Relation) primitive).isMultipolygon();
-        }
-    };
+    public static final Predicate<OsmPrimitive> multipolygonPredicate =
+            primitive -> primitive.getClass() == Relation.class && ((Relation) primitive).isMultipolygon();
 
     /**
@@ -256 +256 @@
      * @see #FLAG_HAS_DIRECTIONS
      */
-    public static final Predicate<Tag> directionalKeyPredicate = new Predicate<Tag>() {
-        @Override
-        public boolean evaluate(Tag tag) {
-            return directionKeys.match(tag);
-        }
-    };
+    public static final Predicate<Tag> directionalKeyPredicate = tag -> directionKeys.match(tag);
 
     /**
@@ -843 +838 @@
     }
 
-    /**
-     * A tagged way that matches this pattern has a direction.
-     * @see #FLAG_HAS_DIRECTIONS
-     */
-    private static volatile Match directionKeys;
-
-    /**
-     * A tagged way that matches this pattern has a direction that is reversed.
-     * <p>
-     * This pattern should be a subset of {@link #directionKeys}
-     * @see #FLAG_DIRECTION_REVERSED
-     */
-    private static volatile Match reversedDirectionKeys;
-
-    static {
-        String reversedDirectionDefault = "oneway=\"-1\"";
-
-        String directionDefault = "oneway? | (aerialway=* -aerialway=station) | "+
-                "waterway=stream | waterway=river | waterway=ditch | waterway=drain | "+
-                "\"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" | "+
-                "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
-                "(highway=motorway_link & -oneway=no & -oneway=reversible)";
-
-        reversedDirectionKeys = compileDirectionKeys("tags.reversed_direction", reversedDirectionDefault);
-        directionKeys = compileDirectionKeys("tags.direction", directionDefault);
-    }
-
     private static Match compileDirectionKeys(String prefName, String defaultValue) throws AssertionError {
         try {

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.tools.CopyList;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.Utils.Function;
 
 /**
@@ -349 +349 @@
      */
     public Collection<RelationMember> getMembersFor(final Collection<? extends OsmPrimitive> primitives) {
-        return Utils.filter(getMembers(), new Predicate<RelationMember>() {
-            @Override
-            public boolean evaluate(RelationMember member) {
-                return primitives.contains(member.getMember());
-            }
-        });
+        return Utils.filter(getMembers(), member -> primitives.contains(member.getMember()));
     }
 
@@ -405 +400 @@
 
     public List<OsmPrimitive> getMemberPrimitivesList() {
-        return Utils.transform(getMembers(), new Utils.Function<RelationMember, OsmPrimitive>() {
-            @Override
-            public OsmPrimitive apply(RelationMember x) {
-                return x.getMember();
-            }
-        });
+        return Utils.transform(getMembers(), (Function<RelationMember, OsmPrimitive>) x -> x.getMember());
     }
 

trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java

@@ -88 +88 @@
     }
 
-    private final Runnable edtRunnable = new Runnable() {
-        @Override
-        public void run() {
-            if (selection != null) {
-                fireEvents(inEDTListeners, selection);
-            }
+    private final Runnable edtRunnable = () -> {
+        if (selection != null) {
+            fireEvents(inEDTListeners, selection);
         }
     };

trunk/src/org/openstreetmap/josm/data/osm/history/History.java

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -70 +69 @@
     public History sortAscending() {
         List<HistoryOsmPrimitive> copy = new ArrayList<>(versions);
-        Collections.sort(
-                copy,
-                new Comparator<HistoryOsmPrimitive>() {
-                    @Override
-                    public int compare(HistoryOsmPrimitive o1, HistoryOsmPrimitive o2) {
-                        return o1.compareTo(o2);
-                    }
-                }
-            );
+        Collections.sort(copy, (o1, o2) -> o1.compareTo(o2));
         return new History(id, type, copy);
     }
@@ -88 +79 @@
     public History sortDescending() {
         List<HistoryOsmPrimitive> copy = new ArrayList<>(versions);
-        Collections.sort(
-                copy,
-                new Comparator<HistoryOsmPrimitive>() {
-                    @Override
-                    public int compare(HistoryOsmPrimitive o1, HistoryOsmPrimitive o2) {
-                        return o2.compareTo(o1);
-                    }
-                }
-            );
+        Collections.sort(copy, (o1, o2) -> o2.compareTo(o1));
         return new History(id, type, copy);
     }
@@ -106 +89 @@
      */
     public History from(final Date fromDate) {
-        return filter(
-                this,
-                new FilterPredicate() {
-                    @Override
-                    public boolean matches(HistoryOsmPrimitive primitive) {
-                        return primitive.getTimestamp().compareTo(fromDate) >= 0;
-                    }
-                }
-            );
+        return filter(this, primitive -> primitive.getTimestamp().compareTo(fromDate) >= 0);
     }
 
@@ -123 +98 @@
      */
     public History until(final Date untilDate) {
-        return filter(
-                this,
-                new FilterPredicate() {
-                    @Override
-                    public boolean matches(HistoryOsmPrimitive primitive) {
-                        return primitive.getTimestamp().compareTo(untilDate) <= 0;
-                    }
-                }
-            );
+        return filter(this, primitive -> primitive.getTimestamp().compareTo(untilDate) <= 0);
     }
 
@@ -150 +117 @@
      */
     public History from(final long fromVersion) {
-        return filter(
-                this,
-                new FilterPredicate() {
-                    @Override
-                    public boolean matches(HistoryOsmPrimitive primitive) {
-                        return primitive.getVersion() >= fromVersion;
-                    }
-                }
-            );
+        return filter(this, primitive -> primitive.getVersion() >= fromVersion);
     }
 
@@ -167 +126 @@
      */
     public History until(final long untilVersion) {
-        return filter(
-                this,
-                new FilterPredicate() {
-                    @Override
-                    public boolean matches(HistoryOsmPrimitive primitive) {
-                        return primitive.getVersion() <= untilVersion;
-                    }
-                }
-            );
+        return filter(this, primitive -> primitive.getVersion() <= untilVersion);
     }
 
@@ -194 +145 @@
      */
     public History forUserId(final long uid) {
-        return filter(
-                this,
-                new FilterPredicate() {
-                    @Override
-                    public boolean matches(HistoryOsmPrimitive primitive) {
-                        return primitive.getUser() != null && primitive.getUser().getId() == uid;
-                    }
-                }
-            );
+        return filter(this, primitive -> primitive.getUser() != null && primitive.getUser().getId() == uid);
     }
 
@@ -283 +226 @@
      * @throws IndexOutOfBoundsException if index out or range
      */
-    public HistoryOsmPrimitive get(int idx) throws IndexOutOfBoundsException {
+    public HistoryOsmPrimitive get(int idx) {
         if (idx < 0 || idx >= versions.size())
             throw new IndexOutOfBoundsException(MessageFormat.format(
@@ -338 +281 @@
     public String toString() {
         StringBuilder result = new StringBuilder("History ["
-                + (type != null ? "type=" + type + ", " : "") + "id=" + id);
+                + (type != null ? ("type=" + type + ", ") : "") + "id=" + id);
         if (versions != null) {
             result.append(", versions=\n");