Changeset 15122 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-05-27T16:15:33+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17763 - use interfaces where possible

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java (modified) (6 diffs)

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

@@ -15 +15 @@
 import java.util.regex.PatternSyntaxException;
 
+import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.IRelation;
+import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -21 +24 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.InDataSourceArea;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
@@ -638 +640 @@
          */
         static boolean closed(Environment e) { // NO_UCD (unused code)
-            if (e.osm instanceof Way && ((Way) e.osm).isClosed())
+            if (e.osm instanceof IWay<?> && ((IWay<?>) e.osm).isClosed())
                 return true;
-            return e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon();
+            return e.osm instanceof IRelation<?> && ((IRelation<?>) e.osm).isMultipolygon();
         }
 
@@ -670 +672 @@
          */
         static boolean connection(Environment e) { // NO_UCD (unused code)
-            return e.osm instanceof Node && e.osm.getDataSet() != null && ((Node) e.osm).isConnectionNode();
+            return e.osm instanceof INode && e.osm.getDataSet() != null && ((INode) e.osm).isConnectionNode();
         }
 
@@ -769 +771 @@
 
         static boolean completely_downloaded(Environment e) { // NO_UCD (unused code)
-            if (e.osm instanceof Relation) {
-                return !((Relation) e.osm).hasIncompleteMembers();
+            if (e.osm instanceof IRelation<?>) {
+                return !((IRelation<?>) e.osm).hasIncompleteMembers();
             } else {
                 return true;
@@ -777 +779 @@
 
         static boolean closed2(Environment e) { // NO_UCD (unused code)
-            if (e.osm instanceof Way && ((Way) e.osm).isClosed())
+            if (e.osm instanceof IWay<?> && ((IWay<?>) e.osm).isClosed())
                 return true;
             if (e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon()) {