Changeset 2299 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-10-18T18:37:48+02:00 (15 years ago)

Author:

jttt

Message:

Fixed #3728 - "undo" does stupid things destroying data

Location:

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

Files:

• NodeData.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)
• PrimitiveData.java (modified) (2 diffs)
• QuadBuckets.java (modified) (1 diff)
• RelationData.java (modified) (1 diff)
• RelationMemberData.java (modified) (1 diff)
• WayData.java (modified) (1 diff)

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

@@ -16 +16 @@
     }
 
+    @Override
+    public String toString() {
+        return super.toString() + " NODE " + coor;
+    }
+
 }

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

@@ -841 +841 @@
 
     protected void saveCommonAttributes(PrimitiveData data) {
+        data.setId(data.getId());
         data.getKeys().clear();
         data.getKeys().putAll(getKeys());

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

@@ -12 +12 @@
  *
  */
-public class PrimitiveData {
+public abstract class PrimitiveData {
 
     // Useful?
@@ -76 +76 @@
 
 
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+
+        builder.append(id).append(keys);
+        if (modified) {
+            builder.append("M");
+        }
+        if (visible) {
+            builder.append("V");
+        }
+        if (deleted) {
+            builder.append("D");
+        }
+
+        return builder.toString();
+    }
+
+
 }

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

@@ -573 +573 @@
         QBLevel find_exact_branch(T n)
         {
+            if (content != null && content.contains(n)) {
+                return this;
+            }
+            
             QBLevel ret = null;
             for (QBLevel l : children) {

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

@@ -13 +13 @@
     }
 
+    @Override
+    public String toString() {
+        return super.toString() + " REL " + members;
+    }
+
 }

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

@@ -37 +37 @@
     }
 
+    @Override
+    public String toString() {
+        return memberType.getAPIName() + " " + memberId;
+    }
+
 }

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

@@ -13 +13 @@
     }
 
+    @Override
+    public String toString() {
+        return super.toString() + " WAY" + nodes.toString();
+    }
+
 }