---

 core-dave/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java |   35 +---------
 1 file changed, 5 insertions(+), 30 deletions(-)

diff -puN src/org/openstreetmap/josm/data/osm/OsmPrimitive.java~remove-primitive-selection-implementation src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
--- core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java~remove-primitive-selection-implementation	2009-10-14 09:15:17.000000000 -0700
+++ core-dave/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	2009-10-14 09:15:17.000000000 -0700
@@ -42,9 +42,8 @@ abstract public class OsmPrimitive imple
     private static final int FLAG_DISABLED = 1 << 2;
     private static final int FLAG_DELETED  = 1 << 3;
     private static final int FLAG_FILTERED = 1 << 4;
-    private static final int FLAG_SELECTED = 1 << 5;
-    private static final int FLAG_HAS_DIRECTIONS = 1 << 6;
-    private static final int FLAG_TAGGED = 1 << 7;
+    private static final int FLAG_HAS_DIRECTIONS = 1 << 5;
+    private static final int FLAG_TAGGED = 1 << 6;
 
     /**
      * Replies the sub-collection of {@see OsmPrimitive}s of type <code>type</code> present in
@@ -184,7 +183,7 @@ abstract public class OsmPrimitive imple
     /**
      * Sets whether this primitive is disabled or not.
      *
-     * @param selected  true, if this primitive is disabled; false, otherwise
+     * @param disabled true, if this primitive is disabled; false, otherwise
      */
     public void setDisabled(boolean disabled) {
         if (disabled) {
@@ -206,7 +205,7 @@ abstract public class OsmPrimitive imple
     /**
      * Sets whether this primitive is filtered out or not.
      *
-     * @param selected  true, if this primitive is filtered out; false, otherwise
+     * @param filtered true, if this primitive is filtered out; false, otherwise
      */
     public void setFiltered(boolean filtered) {
         if (filtered) {
@@ -225,29 +224,6 @@ abstract public class OsmPrimitive imple
     }
 
     /**
-     * Sets whether this primitive is selected or not.
-     *
-     * @param selected  true, if this primitive is selected; false, otherwise
-     * @since 1899
-     */
-    @Deprecated public void setSelected(boolean selected) {
-        if (selected) {
-            flags |= FLAG_SELECTED;
-        } else {
-            flags &= ~FLAG_SELECTED;
-        }
-    }
-    /**
-     * Replies true, if this primitive is selected.
-     *
-     * @return true, if this primitive is selected
-     * @since 1899
-     */
-    @Deprecated public boolean isSelected() {
-        return (flags & FLAG_SELECTED) != 0;
-    }
-
-    /**
      * Marks this primitive as being modified.
      *
      * @param modified true, if this primitive is to be modified
@@ -470,7 +446,7 @@ abstract public class OsmPrimitive imple
     /**
      * Sets whether this primitive is deleted or not.
      *
-     * Also marks this primitive as modified if deleted is true and sets selected to false.
+     * Also marks this primitive as modified if deleted is true.
      *
      * @param deleted  true, if this primitive is deleted; false, otherwise
      */
@@ -481,7 +457,6 @@ abstract public class OsmPrimitive imple
             flags &= ~FLAG_DELETED;
         }
         setModified(deleted);
-        setSelected(false);
     }
 
     /**
_