Changeset 1762 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-07-11T09:32:42+02:00 (17 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.

Location:

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

Files:

• Node.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)
• Relation.java (modified) (1 diff)
• Way.java (modified) (1 diff)

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

@@ -107 +107 @@
     }
 
-    /**
-     * @deprecated
-     * @see #hasEqualSemanticAttributes(OsmPrimitive)
-     * @see #hasEqualTechnicalAttributes(OsmPrimitive)
-     */
-    @Deprecated
-    @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
-        if (osm instanceof Node) {
-            if (super.realEqual(osm, semanticOnly)) {
-                if ((coor == null) && ((Node)osm).coor == null)
-                    return true;
-                if (coor != null)
-                    return coor.equals(((Node)osm).coor);
-            }
-        }
-        return false;
-    }
-
     @Override
     public boolean hasEqualSemanticAttributes(OsmPrimitive other) {

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));
     }
 

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

@@ -68 +68 @@
         // adding members in string increases memory usage a lot and overflows for looped relations
         return "{Relation id="+id+" version="+version+"}";
-    }
-
-    @Deprecated
-    @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
-        return osm instanceof Relation ? super.realEqual(osm, semanticOnly) && members.equals(((Relation)osm).members) : false;
     }
 

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

@@ -99 +99 @@
         if (incomplete) return "{Way id="+id+" version="+version+" (incomplete)}";
         return "{Way id="+id+" version="+version+" nodes="+Arrays.toString(nodes.toArray())+"}";
-    }
-
-    @Deprecated
-    @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
-        return osm instanceof Way ? super.realEqual(osm, semanticOnly) && nodes.equals(((Way)osm).nodes) : false;
     }