Changeset 1690 in josm for trunk/src/org/openstreetmap/josm/data/osm/Node.java

Timestamp:

23.06.2009 22:03:37 (3 years ago)

Author:

Gubaer

Message:

new: MultiFetchServerObjectReader using APIs Multi Fetch method
update: now uses Multi Fetch to check for deleted primitives on the server
update: now uses Multi Fetch to update the selected primitives with the state from the server
fixed: cleaned up merging in MergeVisitor
new: conflict resolution dialog; now resolves conflicts due to different visibilities
new: replacement for realEqual() on OsmPrimitive and derived classes; realEqual now @deprecated
fixed: cleaning up OsmReader
fixed: progress indication in OsmApi

File:

• trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) (4 diffs)

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

@@ -31 +31 @@
 
     public final void setEastNorth(EastNorth eastNorth) {
-       this.eastNorth = eastNorth;
-       this.coor = Main.proj.eastNorth2latlon(eastNorth);
+        this.eastNorth = eastNorth;
+        this.coor = Main.proj.eastNorth2latlon(eastNorth);
     }
 
@@ -87 +87 @@
     }
 
+    /**
+     * @deprecated
+     * @see #hasEqualSemanticAttributes(OsmPrimitive)
+     * @see #hasEqualTechnicalAttributes(OsmPrimitive)
+     */
+    @Deprecated
     @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
         if (osm instanceof Node) {
@@ -99 +105 @@
     }
 
+    @Override
+    public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
+        if (other == null || ! (other instanceof Node) )
+            return false;
+        if (! super.hasEqualSemanticAttributes(other))
+            return false;
+        Node n = (Node)other;
+        if (coor == null && n.coor == null)
+            return true;
+        else if (coor != null && n.coor != null)
+            return coor.equals(n.coor);
+        else
+            return false;
+    }
+
     public int compareTo(OsmPrimitive o) {
         return o instanceof Node ? Long.valueOf(id).compareTo(o.id) : 1;
     }
 
+    @Override
     public String getName() {
         String name;
@@ -109 +131 @@
         } else {
             name = get("name");
-            if (name == null)
+            if (name == null) {
                 name = id == 0 ? tr("node") : ""+id;
+            }
             name += " (" + coor.latToString(mCord) + ", " + coor.lonToString(mCord) + ")";
         }