diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java index c046d2b..901e7c2 100644 --- a/src/org/openstreetmap/josm/data/osm/DataSet.java +++ b/src/org/openstreetmap/josm/data/osm/DataSet.java @@ -47,6 +47,7 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor; 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; import org.openstreetmap.josm.tools.Utils; @@ -263,7 +264,7 @@ public final class DataSet implements Data, Cloneable, ProjectionChangeListener */ private final QuadBuckets nodes = new QuadBuckets<>(); - private Collection getPrimitives(Predicate predicate) { + private Collection getPrimitives(Predicate predicate) { return new SubclassFilteredCollection<>(allPrimitives, predicate); } @@ -401,7 +402,7 @@ public final class DataSet implements Data, Cloneable, ProjectionChangeListener * @return A collection containing all primitives of the dataset. Data is not ordered */ public Collection allPrimitives() { - return getPrimitives(OsmPrimitive.allPredicate); + return getPrimitives(Predicates.alwaysTrue()); } /** diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java index e21aeeb..dcc5e6b 100644 --- a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java +++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java @@ -27,6 +27,7 @@ import org.openstreetmap.josm.data.osm.visitor.Visitor; import org.openstreetmap.josm.gui.mappaint.StyleCache; import org.openstreetmap.josm.tools.CheckParameterUtil; import org.openstreetmap.josm.tools.Predicate; +import org.openstreetmap.josm.tools.Predicates; import org.openstreetmap.josm.tools.Utils; import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider; @@ -170,7 +171,8 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab } /** - * Some predicates, that describe conditions on primitives. + * A predicate that filters primitives that are usable. + * @see OsmPrimitive#isUsable() */ public static final Predicate isUsablePredicate = new Predicate() { @Override @@ -179,6 +181,9 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab } }; + /** + * A predicate filtering primitives that are selectable. + */ public static final Predicate isSelectablePredicate = new Predicate() { @Override public boolean evaluate(OsmPrimitive primitive) { @@ -186,60 +191,78 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab } }; + /** + * A predicate filtering primitives that are not deleted. + */ public static final Predicate nonDeletedPredicate = new Predicate() { @Override public boolean evaluate(OsmPrimitive primitive) { return !primitive.isDeleted(); } }; + /** + * A predicate filtering primitives that are not deleted and not incomplete. + */ public static final Predicate nonDeletedCompletePredicate = new Predicate() { @Override public boolean evaluate(OsmPrimitive primitive) { return !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 nonDeletedPhysicalPredicate = new Predicate() { @Override public boolean evaluate(OsmPrimitive primitive) { return !primitive.isDeleted() && !primitive.isIncomplete() && !(primitive instanceof Relation); } }; + /** + * A predicate filtering primitives that are modified + */ public static final Predicate modifiedPredicate = new Predicate() { @Override public boolean evaluate(OsmPrimitive primitive) { return primitive.isModified(); } }; - public static final Predicate nodePredicate = new Predicate() { - @Override public boolean evaluate(OsmPrimitive primitive) { - return primitive.getClass() == Node.class; - } - }; + /** + * A predicate filtering nodes. + */ + public static final Predicate nodePredicate = Predicates.isOfClass(Node.class); - public static final Predicate wayPredicate = new Predicate() { - @Override public boolean evaluate(OsmPrimitive primitive) { - return primitive.getClass() == Way.class; - } - }; + /** + * A predicate filtering ways. + */ + public static final Predicate wayPredicate = Predicates.isOfClass(Way.class); - public static final Predicate relationPredicate = new Predicate() { - @Override public boolean evaluate(OsmPrimitive primitive) { - return primitive.getClass() == Relation.class; - } - }; + /** + * A predicate filtering relations. + */ + public static final Predicate relationPredicate = Predicates.isOfClass(Relation.class); + /** + * A predicate filtering multipolygon relations. + */ public static final Predicate multipolygonPredicate = new Predicate() { @Override public boolean evaluate(OsmPrimitive primitive) { return primitive.getClass() == Relation.class && ((Relation) primitive).isMultipolygon(); } }; - public static final Predicate allPredicate = new Predicate() { - @Override public boolean evaluate(OsmPrimitive primitive) { - return true; - } - }; + /** + * A predicate that always returns true. + * @deprecated Replaced by {@link Predicates#alwaysTrue()} + */ + @Deprecated + public static final Predicate allPredicate = Predicates.alwaysTrue(); + /** + * This matches all ways that have a direction + * + * @see #FLAG_HAS_DIRECTIONS + */ public static final Predicate directionalKeyPredicate = new Predicate() { @Override public boolean evaluate(Tag tag) { @@ -676,6 +699,10 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab return false; } + /** + * Updates the highlight flag for this primitive. + * @param highlighted The new highlight flag. + */ public void setHighlighted(boolean highlighted) { if (isHighlighted() != highlighted) { updateFlags(FLAG_HIGHLIGHTED, highlighted); @@ -685,6 +712,10 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab } } + /** + * Checks if the highlight flag for this primitive was set + * @return The highlight flag. + */ public boolean isHighlighted() { return (flags & FLAG_HIGHLIGHTED) != 0; } @@ -819,14 +850,20 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab return result; } + /** + * A tagged way that matches this pattern has a direction. + * @see #FLAG_HAS_DIRECTIONS + */ private static volatile Match directionKeys; - private static volatile Match reversedDirectionKeys; /** - * Contains a list of direction-dependent keys that make an object - * direction dependent. - * Initialized by checkDirectionTagged() + * A tagged way that matches this pattern has a direction that is reversed. + *

+ * This pattern should be a subset of {@link #directionKeys} + * @see #FLAG_DIRECTION_REVERSED */ + private static volatile Match reversedDirectionKeys; + static { String reversedDirectionDefault = "oneway=\"-1\""; @@ -836,27 +873,21 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+ "(highway=motorway_link & -oneway=no & -oneway=reversible)"; - try { - reversedDirectionKeys = SearchCompiler.compile(Main.pref.get("tags.reversed_direction", reversedDirectionDefault)); - } catch (ParseError e) { - Main.error("Unable to compile pattern for tags.reversed_direction, trying default pattern: " + e.getMessage()); + reversedDirectionKeys = compileDirectionKeys("tags.reversed_direction", reversedDirectionDefault); + directionKeys = compileDirectionKeys("tags.direction", directionDefault); + } - try { - reversedDirectionKeys = SearchCompiler.compile(reversedDirectionDefault); - } catch (ParseError e2) { - throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage(), e2); - } - } + private static Match compileDirectionKeys(String prefName, String defaultValue) throws AssertionError { try { - directionKeys = SearchCompiler.compile(Main.pref.get("tags.direction", directionDefault)); + return SearchCompiler.compile(Main.pref.get(prefName, defaultValue)); } catch (ParseError e) { - Main.error("Unable to compile pattern for tags.direction, trying default pattern: " + e.getMessage()); + Main.error("Unable to compile pattern for " + prefName + ", trying default pattern: " + e.getMessage()); + } - try { - directionKeys = SearchCompiler.compile(directionDefault); - } catch (ParseError e2) { - throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage(), e2); - } + try { + return SearchCompiler.compile(defaultValue); + } catch (ParseError e2) { + throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage(), e2); } } diff --git a/src/org/openstreetmap/josm/tools/Predicates.java b/src/org/openstreetmap/josm/tools/Predicates.java index 3dc899b..a70b4f3 100644 --- a/src/org/openstreetmap/josm/tools/Predicates.java +++ b/src/org/openstreetmap/josm/tools/Predicates.java @@ -16,6 +16,34 @@ public final class Predicates { } /** + * Creates a predicate that returns true every time. + * @param The type of the predicate. + * @return A predicate returning true + */ + public static Predicate alwaysTrue() { + return new Predicate() { + @Override + public boolean evaluate(T object) { + return true; + } + }; + } + + /** + * Creates a predicate that returns false every time. + * @param The type of the predicate. + * @return A predicate returning false + */ + public static Predicate alwaysFalse() { + return new Predicate() { + @Override + public boolean evaluate(T object) { + return false; + } + }; + } + + /** * Returns the negation of {@code predicate}. * @param type of items * @param predicate the predicate to negate @@ -46,6 +74,21 @@ public final class Predicates { } /** + * Creates a new predicate that checks if elements are exactly of that class. + * @param The predicate type. + * @param clazz The class the elements must have. + * @return A predicate. + */ + public static Predicate isOfClass(final Class clazz) { + return new Predicate() { + @Override + public boolean evaluate(T obj) { + return obj != null && obj.getClass() == clazz; + } + }; + } + + /** * Returns a {@link Predicate} executing {@link Pattern#matcher(CharSequence)} and {@link java.util.regex.Matcher#matches}. * @param pattern the pattern * @return a {@link Predicate} executing {@link Pattern#matcher(CharSequence)} and {@link java.util.regex.Matcher#matches}