Changeset 1690 in josm for trunk/src/org/openstreetmap/josm/data/osm/Way.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/Way.java (modified) (7 diffs)

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

@@ -39 +39 @@
     public void visitNodes(Visitor v) {
         if (incomplete) return;
-        for (Node n : this.nodes)
+        for (Node n : this.nodes) {
             v.visit(n);
+        }
     }
 
@@ -100 +101 @@
     }
 
+    @Deprecated
     @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
         return osm instanceof Way ? super.realEqual(osm, semanticOnly) && nodes.equals(((Way)osm).nodes) : false;
+    }
+
+    @Override
+    public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
+        if (other == null || ! (other instanceof Way) )
+            return false;
+        if (! super.hasEqualSemanticAttributes(other))
+            return false;
+        Way w = (Way)other;
+        return nodes.equals(w.nodes);
     }
 
@@ -110 +122 @@
     }
 
+    @Override
     public String getName() {
         String name;
@@ -116 +129 @@
         } else {
             name = get("name");
-            if (name == null) name = get("ref");
+            if (name == null) {
+                name = get("ref");
+            }
             if (name == null) {
                 name =
                     (get("highway") != null) ? tr("highway") :
-                    (get("railway") != null) ? tr("railway") :
-                    (get("waterway") != null) ? tr("waterway") :
-                    (get("landuse") != null) ? tr("landuse") : "";
+                        (get("railway") != null) ? tr("railway") :
+                            (get("waterway") != null) ? tr("waterway") :
+                                (get("landuse") != null) ? tr("landuse") : "";
             }
 
@@ -128 +143 @@
             String nodes = trn("{0} node", "{0} nodes", nodesNo, nodesNo);
             name += (name.length() > 0) ? " ("+nodes+")" : nodes;
-            if(errors != null)
+            if(errors != null) {
                 name = "*"+name;
+            }
         }
         return name;
@@ -138 +154 @@
         boolean closed = (lastNode() == n && firstNode() == n);
         int i;
-        while ((i = nodes.indexOf(n)) >= 0)
+        while ((i = nodes.indexOf(n)) >= 0) {
             nodes.remove(i);
+        }
         i = nodes.size();
-        if (closed && i > 2) // close again
+        if (closed && i > 2) {
             addNode(firstNode());
-        // prevent closed ways with less than 3 different nodes
-        else if (i >= 2 && i <= 3 && nodes.get(0) == nodes.get(i-1))
+        } else if (i >= 2 && i <= 3 && nodes.get(0) == nodes.get(i-1)) {
             nodes.remove(i-1);
+        }
     }
 
@@ -151 +168 @@
         if (incomplete) return;
         for(OsmPrimitive p : selection) {
-           if (p instanceof Node) {
-               removeNode((Node)p);
-           }
-       }
+            if (p instanceof Node) {
+                removeNode((Node)p);
+            }
+        }
     }