Changeset 11079 in josm for trunk

Timestamp:

2016-10-05T01:26:43+02:00 (8 years ago)

Author:

michael2402

Message:

Fix #13665: A way is only selectable if it is drawable.

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)

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

@@ -497 +497 @@
     /**
      * Determines if this object is selectable.
+     * <p>
+     * A primitive can be selected if all conditions are met:
+     * <ul>
+     * <li>it is drawable
+     * <li>it is not disabled (greyed out) by a filter.
+     * </ul>
      * @return {@code true} if this object is selectable
      */
     public boolean isSelectable() {
-        return (flags & (FLAG_DELETED + FLAG_INCOMPLETE + FLAG_DISABLED + FLAG_HIDE_IF_DISABLED)) == 0;
+        // not synchronized -> check disabled twice just to be sure we did not have a race condition.
+        return !isDisabled() && isDrawable() && !isDisabled();
     }
 
     /**
      * Determines if this object is drawable.
+     * <p>
+     * A primitive is complete if all conditions are met:
+     * <ul>
+     * <li>type and id is known
+     * <li>tags are known
+     * <li>it is not deleted
+     * <li>it is not hidden by a filter
+     * <li>for nodes: lat/lon are known
+     * <li>for ways: all nodes are known and complete
+     * <li>for relations: all members are known and complete
+     * </ul>
      * @return {@code true} if this object is drawable
      */