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

Timestamp:

11.07.2009 09:32:42 (3 years ago)

Author:

Gubaer

Message:

added: improved tag editor grid in relation editor (borrowed code from tag editor plugin)
removed: realEqual() on OsmPrimitive, Node, etc.

File:

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

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

@@ -284 +284 @@
         clearCached();
         clearErrors();
-    }
-
-    /**
-     * Perform an equality compare for all non-volatile fields not only for the id
-     * but for the whole object (for conflict resolving)
-     * @param semanticOnly if <code>true</code>, modified flag and timestamp are not compared
-     * 
-     * @deprecated
-     * @see #hasEqualSemanticAttributes(OsmPrimitive)
-     * @see #hasEqualTechnicalAttributes(OsmPrimitive)
-     */
-    @Deprecated
-    public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
-        return id == osm.id
-        && incomplete == osm.incomplete
-        && deleted == osm.deleted
-        && (semanticOnly || (
-                modified == osm.modified
-                && timestamp == osm.timestamp
-                && version == osm.version
-                && visible == osm.visible
-                && (user == null ? osm.user==null : user==osm.user))
-        )
-        && (keys == null ? osm.keys==null : keys.equals(osm.keys));
     }