Changeset 18516 in josm for trunk/src

Timestamp:

2022-07-13T22:00:49+02:00 (2 years ago)

Author:

taylor.smock

Message:

Move OsmPrimitive isDrawable to AbstractPrimitive

This should have no effect on binary compatibility (according to
japi-compliance-checker), and allows filters to work properly on
non-OsmPrimitive objects (like vector primitives).

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• AbstractPrimitive.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)

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

@@ -457 +457 @@
     public void setHiddenType(boolean isExplicit) {
         updateFlags(FLAG_HIDDEN_TYPE, isExplicit);
+    }
+
+    @Override
+    public boolean isDrawable() {
+        return (flags & (FLAG_DELETED + FLAG_INCOMPLETE + FLAG_HIDE_IF_DISABLED)) == 0;
     }
 

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

@@ -386 +386 @@
 
     @Override
-    public boolean isDrawable() {
-        return (flags & (FLAG_DELETED + FLAG_INCOMPLETE + FLAG_HIDE_IF_DISABLED)) == 0;
-    }
-
-    @Override
     public void setModified(boolean modified) {
         checkDatasetNotReadOnly();