Changeset 2025 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java

Timestamp:

2009-09-02T21:17:52+02:00 (15 years ago)

Author:

Gubaer

Message:

new: improved dialog for uploading/saving modified layers on exit
new: improved dialog for uploading/saving modified layers if layers are deleted
new: new progress monitor which can delegate rendering to any Swing component
more setters/getters for properties in OSM data classes (fields are @deprecated); started to update references in the code base

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java

@@ -94 +94 @@
         for (RelationMember member: r.getMembers()) {
             newMembers.add(
-                new RelationMember(member.getRole(), mappedPrimitives.get(member.getMember())));
+                    new RelationMember(member.getRole(), mappedPrimitives.get(member.getMember())));
 
         }
@@ -117 +117 @@
         OsmPrimitive clone = null;
         if (primitive instanceof Node) {
-            clone = new Node(primitive.id);
+            clone = new Node(primitive.getId());
         } else if (primitive instanceof Way) {
-            clone = new Way(primitive.id);
+            clone = new Way(primitive.getId());
         } else if (primitive instanceof Relation) {
-            clone = new Relation(primitive.id);
+            clone = new Relation(primitive.getId());
         }
         clone.incomplete = true;
@@ -176 +176 @@
 
     protected boolean isNew(OsmPrimitive primitive) {
-        return primitive.id == 0;
+        return primitive.getId() == 0;
     }