Changeset 10715 in josm for trunk/src

Timestamp:

2016-08-03T15:01:43+02:00 (8 years ago)

Author:

simon04

Message:

see #11390, see #12890 - Deprecate Predicates class

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/conflict/ConflictCollection.java (modified) (5 diffs)
• data/osm/DataSet.java (modified) (2 diffs)
• data/osm/OsmPrimitive.java (modified) (2 diffs)
• data/validation/tests/ConditionalKeys.java (modified) (2 diffs)
• data/validation/tests/OverlappingWays.java (modified) (2 diffs)
• data/validation/tests/WayConnectedToArea.java (modified) (2 diffs)
• gui/SplashScreen.java (modified) (2 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)
• gui/dialogs/validator/ValidatorTreePanel.java (modified) (2 diffs)
• gui/layer/LayerPositionStrategy.java (modified) (2 diffs)
• gui/mappaint/mapcss/Condition.java (modified) (2 diffs)
• gui/mappaint/mapcss/ExpressionFactory.java (modified) (3 diffs)
• gui/mappaint/mapcss/Selector.java (modified) (2 diffs)
• gui/tagging/presets/TaggingPresetReader.java (modified) (2 diffs)
• tools/Predicates.java (modified) (3 diffs)
• tools/Utils.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -12 +12 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.Predicate;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -43 +42 @@
     private final CopyOnWriteArrayList<IConflictListener> listeners;
 
-    private static class FilterPredicate implements Predicate<Conflict<? extends OsmPrimitive>> {
-
-        private final Class<? extends OsmPrimitive> c;
-
-        FilterPredicate(Class<? extends OsmPrimitive> c) {
-            this.c = c;
-        }
-
-        @Override
-        public boolean test(Conflict<? extends OsmPrimitive> conflict) {
-            return conflict != null && c.isInstance(conflict.getMy());
-        }
-    }
-
-    private static final FilterPredicate NODE_FILTER_PREDICATE = new FilterPredicate(Node.class);
-    private static final FilterPredicate WAY_FILTER_PREDICATE = new FilterPredicate(Way.class);
-    private static final FilterPredicate RELATION_FILTER_PREDICATE = new FilterPredicate(Relation.class);
-
     /**
      * Constructs a new {@code ConflictCollection}.
@@ -364 +345 @@
      */
     public final Collection<Conflict<? extends OsmPrimitive>> getNodeConflicts() {
-        return SubclassFilteredCollection.filter(conflicts, NODE_FILTER_PREDICATE);
+        return SubclassFilteredCollection.filter(conflicts, c -> c != null && c.getMy() instanceof Node);
     }
 
@@ -373 +354 @@
      */
     public final Collection<Conflict<? extends OsmPrimitive>> getWayConflicts() {
-        return SubclassFilteredCollection.filter(conflicts, WAY_FILTER_PREDICATE);
+        return SubclassFilteredCollection.filter(conflicts, c -> c != null && c.getMy() instanceof Way);
     }
 
@@ -382 +363 @@
      */
     public final Collection<Conflict<? extends OsmPrimitive>> getRelationConflicts() {
-        return SubclassFilteredCollection.filter(conflicts, RELATION_FILTER_PREDICATE);
+        return SubclassFilteredCollection.filter(conflicts, c -> c != null && c.getMy() instanceof Relation);
     }
 

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

@@ -48 +48 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.tools.FilteredCollection;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
@@ -458 +457 @@
      */
     public Collection<OsmPrimitive> allPrimitives() {
-        return getPrimitives(Predicates.alwaysTrue());
+        return getPrimitives(o -> true);
     }
 

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

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.mappaint.StyleCache;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
@@ -234 +233 @@
      * A predicate filtering nodes.
      */
-    public static final Predicate<OsmPrimitive> nodePredicate = Predicates.<OsmPrimitive>isOfClass(Node.class);
+    public static final Predicate<OsmPrimitive> nodePredicate = Node.class::isInstance;
 
     /**
      * A predicate filtering ways.
      */
-    public static final Predicate<OsmPrimitive> wayPredicate = Predicates.<OsmPrimitive>isOfClass(Way.class);
+    public static final Predicate<OsmPrimitive> wayPredicate = Way.class::isInstance;
 
     /**
      * A predicate filtering relations.
      */
-    public static final Predicate<OsmPrimitive> relationPredicate = Predicates.<OsmPrimitive>isOfClass(Relation.class);
+    public static final Predicate<OsmPrimitive> relationPredicate = Relation.class::isInstance;
 
     /**

trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.tools.LanguageInfo;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
@@ -166 +165 @@
         final List<TestError> errors = new ArrayList<>();
         for (final String key : SubclassFilteredCollection.filter(p.keySet(),
-                Predicates.stringMatchesPattern(Pattern.compile(".*:conditional(:.*)?$")))) {
+                Pattern.compile(":conditional(:.*)?$").asPredicate())) {
             if (!isKeyValid(key)) {
                 errors.add(new TestError(this, Severity.WARNING, tr("Wrong syntax in {0} key", key), 3201, p));

trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java

@@ -28 +28 @@
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Predicates;
 
 /**
@@ -156 +155 @@
                 boolean ignore = false;
                 for (String ignoredKey : IGNORED_KEYS.get()) {
-                    if (error.getPrimitives().stream().anyMatch(Predicates.hasKey(ignoredKey))) {
+                    if (error.getPrimitives().stream().anyMatch(p -> p.hasKey(ignoredKey))) {
                         ignore = true;
                         break;

trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.tools.Predicates;
 
 /**
@@ -67 +66 @@
         if (wayNode.isOutsideDownloadArea()) {
             return;
-        } else if (wayNode.getReferrers().stream().anyMatch(Predicates.hasTag("route", "ferry"))) {
+        } else if (wayNode.getReferrers().stream().anyMatch(p1 -> p1.hasTag("route", "ferry"))) {
             return;
         } else if (isArea(p)) {

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -38 +38 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
@@ -276 +275 @@
          */
         public void finishTask(String title) {
-            final Task task = Utils.find(tasks, Predicates.<Task>equalTo(new MeasurableTask(title)));
+            final Task task = Utils.find(tasks, new MeasurableTask(title)::equals);
             if (task instanceof MeasurableTask) {
                 ((MeasurableTask) task).finish();

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -105 +105 @@
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.OpenBrowser;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
@@ -896 +895 @@
                 positionString = Utils.getPositionListString(position);
                 // if not all objects from the selection are member of this relation
-                if (selection.stream().anyMatch(Predicates.inCollection(members).negate())) {
+                if (selection.stream().anyMatch(p -> !members.contains(p))) {
                     positionString += ",\u2717";
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -37 +37 @@
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.MultiMap;
-import org.openstreetmap.josm.tools.Predicates;
 
 /**
@@ -347 +346 @@
     public void selectRelatedErrors(final Collection<OsmPrimitive> primitives) {
         final Collection<TreePath> paths = new ArrayList<>();
-        walkAndSelectRelatedErrors(new TreePath(getRoot()), Predicates.inCollection(new HashSet<>(primitives)), paths);
+        walkAndSelectRelatedErrors(new TreePath(getRoot()), new HashSet<>(primitives)::contains, paths);
         getSelectionModel().clearSelection();
         for (TreePath path : paths) {

trunk/src/org/openstreetmap/josm/gui/layer/LayerPositionStrategy.java

@@ -3 +3 @@
 
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Predicate;
-
-import org.openstreetmap.josm.tools.Predicates;
 
 /**
@@ -46 +45 @@
      */
     static LayerPositionStrategy inFrontOf(Layer other) {
-        return inFrontOfFirst(Predicates.equalTo(other));
+        return inFrontOfFirst(obj -> Objects.equals(obj, other));
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -513 +512 @@
             this.matchType = matchType == null ? KeyMatchType.EQ : matchType;
             this.containsPattern = KeyMatchType.REGEX.equals(matchType)
-                    ? Predicates.stringContainsPattern(Pattern.compile(label))
+                    ? Pattern.compile(label).asPredicate()
                     : null;
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -16 +16 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.TreeSet;
 import java.util.function.Function;
@@ -37 +38 @@
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.Geometry;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
@@ -1135 +1135 @@
         public Float aggregateList(List<?> lst) {
             final List<Float> floats = Utils.transform(lst, (Function<Object, Float>) x -> Cascade.convertTo(x, float.class));
-            final Collection<Float> nonNullList = SubclassFilteredCollection.filter(floats, Predicates.<Float>isNull().negate());
+            final Collection<Float> nonNullList = SubclassFilteredCollection.filter(floats, Objects::nonNull);
             return nonNullList.isEmpty() ? (Float) Float.NaN : computeMax ? Collections.max(nonNullList) : Collections.min(nonNullList);
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -24 +24 @@
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
@@ -322 +321 @@
                     }
                     final Collection<Relation> multipolygons = Utils.filteredCollection(SubclassFilteredCollection.filter(
-                            e.osm.getReferrers(), Predicates.hasTag("type", "multipolygon")), Relation.class);
+                            e.osm.getReferrers(), p -> p.hasTag("type", "multipolygon")), Relation.class);
                     final Relation multipolygon = multipolygons.iterator().next();
                     if (multipolygon == null) throw new NoSuchElementException();

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

@@ -43 +43 @@
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.XmlObjectParser;
 import org.xml.sax.SAXException;
@@ -226 +225 @@
                     if (all.contains(tp)) {
                         lastmenuOriginal = tp;
-                        tp = (TaggingPresetMenu) all.stream().filter(Predicates.equalTo(tp)).findFirst().get();
+                        tp = (TaggingPresetMenu) all.stream().filter(tp::equals).findFirst().get();
                         lastmenuOriginal.group = null;
                     } else {

trunk/src/org/openstreetmap/josm/tools/Predicates.java

@@ -11 +11 @@
 /**
  * Utility class for creating {@link Predicate}s.
+ * @deprecated Use corresponding lambda expressions instead
  */
+@Deprecated
 public final class Predicates {
 
@@ -87 +89 @@
      */
     public static Predicate<String> stringContainsPattern(final Pattern pattern) {
-        return string -> pattern.matcher(string).find();
+        return pattern.asPredicate();
     }
 
@@ -134 +136 @@
      */
     public static <T> Predicate<T> isNull() {
-        return object -> object == null;
+        return Objects::isNull;
     }
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -142 +142 @@
      */
     public static <T> boolean exists(Iterable<T> collection, Class<? extends T> clazz) {
-        return exists(collection, Predicates.<T>isInstanceOf(clazz));
+        CheckParameterUtil.ensureParameterNotNull(clazz, "clazz");
+        return exists(collection, clazz::isInstance);
     }
 
@@ -170 +171 @@
     @SuppressWarnings("unchecked")
     public static <T> T find(Iterable<? extends Object> collection, Class<? extends T> clazz) {
-        return (T) find(collection, Predicates.<Object>isInstanceOf(clazz));
+        CheckParameterUtil.ensureParameterNotNull(clazz, "clazz");
+        return (T) find(collection, clazz::isInstance);
     }
 
@@ -199 +201 @@
      */
     public static <S, T extends S> SubclassFilteredCollection<S, T> filteredCollection(Collection<S> collection, final Class<T> clazz) {
-        return new SubclassFilteredCollection<>(collection, Predicates.<S>isInstanceOf(clazz));
+        CheckParameterUtil.ensureParameterNotNull(clazz, "clazz");
+        return new SubclassFilteredCollection<>(collection, clazz::isInstance);
     }