Changeset 2206 in josm for trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

Timestamp:

2009-09-27T20:23:04+02:00 (17 years ago)

Author:

jttt

Message:

Minor optimalizations

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (19 diffs)

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

@@ -35 +35 @@
 abstract public class OsmPrimitive implements Comparable<OsmPrimitive>, Tagged {
 
+    private static final int FLAG_MODIFIED = 1 << 0;
+    private static final int FLAG_VISIBLE  = 1 << 1;
+    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;
+
     /**
      * Replies the sub-collection of {@see OsmPrimitive}s of type <code>type</code> present in
      * another collection of {@see OsmPrimitive}s. The result collection is a list.
-     * 
+     *
      * If <code>list</code> is null, replies an empty list.
-     * 
+     *
      * @param <T>
      * @param list  the original list
@@ -60 +67 @@
      * Replies the sub-collection of {@see OsmPrimitive}s of type <code>type</code> present in
      * another collection of {@see OsmPrimitive}s. The result collection is a set.
-     * 
+     *
      * If <code>list</code> is null, replies an empty set.
-     * 
+     *
      * @param <T>
      * @param list  the original collection
@@ -117 +124 @@
     private long id = 0;
 
-    /**
-     * <code>true</code> if the object has been modified since it was loaded from
-     * the server. In this case, on next upload, this object will be updated.
-     * Deleted objects are deleted from the server. If the objects are added (id=0),
-     * the modified is ignored and the object is added to the server.
-     *
-     */
-    private boolean modified = false;
-
-    /**
-     * <code>true</code>, if the object has been deleted.
-     *
-     */
-    private boolean deleted = false;
-
-    /**
-     * Visibility status as specified by the server. The visible attribute was
-     * introduced with the 0.4 API to be able to communicate deleted objects
-     * (they will have visible=false).
-     *
-     */
-    private boolean visible = true;
-
-    /**
-     * <code>true</code>, if the object has been set inactive
-     *
-     */
-    private boolean disabled = false;
-
-    /**
-     * <code>true</code>, if the object has been filtered out
-     *
-     */
-    private boolean filtered = false;
+    private volatile byte flags;
+
 
     /**
@@ -157 +132 @@
      */
     public User user = null;
-
-    /**
-     * If set to true, this object is currently selected.
-     *
-     */
-    private volatile boolean selected = false;
 
     /**
@@ -208 +177 @@
      */
     public void setDisabled(boolean disabled) {
-        this.disabled = disabled;
+        if (disabled) {
+            flags |= FLAG_DISABLED;
+        } else {
+            flags &= ~FLAG_DISABLED;
+        }
+
     }
 
@@ -217 +191 @@
      */
     public boolean isDisabled() {
-        return disabled;
+        return (flags & FLAG_DISABLED) != 0;
     }
     /**
@@ -225 +199 @@
      */
     public void setFiltered(boolean filtered) {
-        this.filtered = filtered;
+        if (filtered) {
+            flags |= FLAG_FILTERED;
+        } else {
+            flags &= ~FLAG_FILTERED;
+        }
     }
     /**
@@ -233 +211 @@
      */
     public boolean isFiltered() {
-        return filtered;
+        return (flags & FLAG_FILTERED) != 0;
     }
 
@@ -243 +221 @@
      */
     public void setSelected(boolean selected) {
-        this.selected = selected;
+        if (selected) {
+            flags |= FLAG_SELECTED;
+        } else {
+            flags &= ~FLAG_SELECTED;
+        }
     }
     /**
@@ -252 +234 @@
      */
     public boolean isSelected() {
-        return selected;
+        return (flags & FLAG_SELECTED) != 0;
     }
 
@@ -261 +243 @@
      */
     public void setModified(boolean modified) {
-        this.modified = modified;
+        if (modified) {
+            flags |= FLAG_MODIFIED;
+        } else {
+            flags &= ~FLAG_MODIFIED;
+        }
     }
 
@@ -268 +254 @@
      * the server. In this case, on next upload, this object will be updated.
      *
+     * Deleted objects are deleted from the server. If the objects are added (id=0),
+     * the modified is ignored and the object is added to the server.
+     *
      * @return <code>true</code> if the object has been modified since it was loaded from
      * the server
      */
     public boolean isModified() {
-        return modified;
+        return (flags & FLAG_MODIFIED) != 0;
     }
 
@@ -282 +271 @@
      */
     public boolean isDeleted() {
-        return deleted;
+        return (flags & FLAG_DELETED) != 0;
     }
 
@@ -292 +281 @@
      */
     public boolean isUsable() {
-        return !deleted && !incomplete && !disabled;
+        return !isDeleted() && !incomplete && !isDisabled();
     }
 
@@ -304 +293 @@
      */
     public boolean isVisible() {
-        return visible;
+        return (flags & FLAG_VISIBLE) != 0;
     }
 
@@ -318 +307 @@
         if (id == 0 && visible == false)
             throw new IllegalStateException(tr("A primitive with ID = 0 can't be invisible."));
-        this.visible = visible;
+        if (visible) {
+            flags |= FLAG_VISIBLE;
+        } else {
+            flags &= ~FLAG_VISIBLE;
+        }
     }
 
@@ -456 +449 @@
      */
     public void setDeleted(boolean deleted) {
-        this.modified = deleted;
-        this.deleted = deleted;
-        this.selected = false;
+        if (deleted) {
+            flags |= FLAG_DELETED;
+        } else {
+            flags &= ~FLAG_DELETED;
+        }
+        setModified(deleted);
+        setSelected(false);
     }
 
@@ -623 +620 @@
         keys = osm.keys == null ? null : new HashMap<String, String>(osm.keys);
         id = osm.id;
-        modified = osm.modified;
-        deleted = osm.deleted;
-        setSelected(osm.isSelected());
         timestamp = osm.timestamp;
         version = osm.version;
         incomplete = osm.incomplete;
-        visible = osm.visible;
+        flags = osm.flags;
         clearCached();
         clearErrors();
@@ -674 +668 @@
 
         return
-        deleted == other.deleted
-        && modified == other.modified
+        isDeleted() == other.isDeleted()
+        && isModified() == other.isModified()
         && timestamp == other.timestamp
         && version == other.version
-        && visible == other.visible
+        && isVisible() == other.isVisible()
         && (user == null ? other.user==null : user==other.user);
     }