Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2009-09-06T23:07:33+02:00 (16 years ago)

Author:

Gubaer

Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• ChangeRelationMemberRoleCommand.java (modified) (2 diffs)
• DeleteCommand.java (modified) (1 diff)
• DeletedStateConflictResolveCommand.java (modified) (1 diff)
• PurgePrimitivesCommand.java (modified) (3 diffs)
• RelationMemberConflictResolverCommand.java (modified) (1 diff)
• RemoveRelationMemberCommand.java (modified) (3 diffs)
• RotateCommand.java (modified) (3 diffs)
• TagConflictResolveCommand.java (modified) (1 diff)
• UndeletePrimitivesCommand.java (modified) (1 diff)
• VersionConflictResolveCommand.java (modified) (2 diffs)
• WayNodesConflictResolverCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java

@@ -49 +49 @@
 
         oldRole = relation.getMember(position).getRole();
-        relation.getMember(position).role = newRole;
+        relation.getMember(position).getRole().equals(newRole);
 
         oldModified = relation.isModified();
@@ -57 +57 @@
 
     @Override public void undoCommand() {
-        relation.getMember(position).role = oldRole;
+        relation.getMember(position).getRole().equals(oldRole);
         relation.setModified(oldModified);
     }

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -92 +92 @@
         super.executeCommand();
         for (OsmPrimitive osm : toDelete) {
-            osm.delete(true);
+            osm.setDeleted(true);
         }
         return true;

trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

@@ -71 +71 @@
             if (conflict.getTheir().isDeleted()) {
                 layer.data.unlinkReferencesToPrimitive(conflict.getMy());
-                conflict.getMy().delete(true);
+                conflict.getMy().setDeleted(true);
             } else {
-                conflict.getMy().delete(conflict.getTheir().isDeleted());
+                conflict.getMy().setDeleted(conflict.getTheir().isDeleted());
             }
         } else

trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java

@@ -185 +185 @@
             if (pair.getParent() instanceof Way) {
                 Way w = (Way)pair.getParent();
-                System.out.println(tr("removing reference from way {0}",w.id));
+                System.out.println(tr("removing reference from way {0}",w.getId()));
                 List<Node> wayNodes = w.getNodes();
                 wayNodes.remove(primitive);
@@ -194 +194 @@
                 if (w.getNodesCount() < 2) {
                     System.out.println(tr("Warning: Purging way {0} because number of nodes dropped below 2. Current is {1}",
-                            w.id,w.getNodesCount()));
+                            w.getId(),w.getNodesCount()));
                     if (!hive.contains(w)) {
                         hive.add(w);
@@ -201 +201 @@
             } else if (pair.getParent() instanceof Relation) {
                 Relation r = (Relation)pair.getParent();
-                System.out.println(tr("removing reference from relation {0}",r.id));
+                System.out.println(tr("removing reference from relation {0}",r.getId()));
                 r.removeMembersFor(primitive);
             }

trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java

@@ -56 +56 @@
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr("Resolve conflicts in member list of relation {0}", my.id),
+                        tr("Resolve conflicts in member list of relation {0}", my.getId()),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL

trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java

@@ -51 +51 @@
         } else {
             relation.removeMember(removeIndex);
-            relation.modified = true;
+            relation.setModified(true);
             return true;
         }
@@ -59 +59 @@
         super.undoCommand();
         relation.addMember(member);
-        relation.modified = this.getOrig(relation).modified;
+        relation.setModified(this.getOrig(relation).isModified());
     }
 
@@ -66 +66 @@
     @Override public MutableTreeNode description() {
         String msg = "";
-        switch(OsmPrimitiveType.from(member.member)) {
-        case NODE: msg = marktr("Remove node ''{0}'' at position {1} from relation ''{2}''"); break;
-        case WAY: msg = marktr("Remove way ''{0}'' at position {1} from relation ''{2}''"); break;
-        case RELATION: msg = marktr("Remove relation ''{0}'' at position {1} from relation ''{2}''"); break;
+        switch(OsmPrimitiveType.from(member.getMember())) {
+            case NODE: msg = marktr("Remove node ''{0}'' at position {1} from relation ''{2}''"); break;
+            case WAY: msg = marktr("Remove way ''{0}'' at position {1} from relation ''{2}''"); break;
+            case RELATION: msg = marktr("Remove relation ''{0}'' at position {1} from relation ''{2}''"); break;
         }
         return new DefaultMutableTreeNode(
                 new JLabel(
                         tr(msg,
-                                member.member.getDisplayName(DefaultNameFormatter.getInstance()),
+                                member.getMember().getDisplayName(DefaultNameFormatter.getInstance()),
                                 relation.getMembers().indexOf(member),
                                 relation.getDisplayName(DefaultNameFormatter.getInstance())

trunk/src/org/openstreetmap/josm/command/RotateCommand.java

@@ -76 +76 @@
             os.latlon = new LatLon(n.getCoor());
             os.eastNorth = n.getEastNorth();
-            os.modified = n.modified;
+            os.modified = n.isModified();
             oldState.put(n, os);
             pivot = pivot.add(os.eastNorth.east(), os.eastNorth.north());
@@ -114 +114 @@
             n.setEastNorth(new EastNorth(nx, ny));
             if (setModified) {
-                n.modified = true;
+                n.setModified(true);
             }
         }
@@ -128 +128 @@
             OldState os = oldState.get(n);
             n.setCoor(os.latlon);
-            n.modified = os.modified;
+            n.setModified(os.modified);
         }
     }

trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

@@ -67 +67 @@
         String msg = "";
         switch(OsmPrimitiveType.from(conflict.getMy())) {
-        case NODE: msg = marktr("Resolve {0} tag conflicts in node {1}"); break;
-        case WAY: msg = marktr("Resolve {0} tag conflicts in way {1}"); break;
-        case RELATION: msg = marktr("Resolve {0} tag conflicts in relation {1}"); break;
+            case NODE: msg = marktr("Resolve {0} tag conflicts in node {1}"); break;
+            case WAY: msg = marktr("Resolve {0} tag conflicts in way {1}"); break;
+            case RELATION: msg = marktr("Resolve {0} tag conflicts in relation {1}"); break;
         }
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr(msg,getNumDecidedConflicts(), conflict.getMy().id),
+                        tr(msg,getNumDecidedConflicts(), conflict.getMy().getId()),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL

trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java

@@ -80 +80 @@
                 getLayer().getConflicts().remove(primitive);
             }
-            primitive.id = 0;
+            primitive.clearOsmId();
         }
         return true;

trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java

@@ -39 +39 @@
         String msg = "";
         switch(OsmPrimitiveType.from(conflict.getMy())) {
-        case NODE: msg = marktr("Resolve version conflicts for node {0}"); break;
-        case WAY: msg = marktr("Resolve version conflicts for way {0}"); break;
-        case RELATION: msg = marktr("Resolve version conflicts for relation {0}"); break;
+            case NODE: msg = marktr("Resolve version conflicts for node {0}"); break;
+            case WAY: msg = marktr("Resolve version conflicts for way {0}"); break;
+            case RELATION: msg = marktr("Resolve version conflicts for relation {0}"); break;
         }
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr(msg,conflict.getMy().id),
+                        tr(msg,conflict.getMy().getId()),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL
@@ -55 +55 @@
     public boolean executeCommand() {
         super.executeCommand();
-        conflict.getMy().version = Math.max(conflict.getMy().version, conflict.getTheir().version);
+        conflict.getMy().setOsmId(
+                conflict.getMy().getId(),
+                (int)Math.max(conflict.getMy().getVersion(), conflict.getTheir().getVersion())
+        );
         getLayer().getConflicts().remove(conflict);
         rememberConflict(conflict);

trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java

@@ -52 +52 @@
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr("Resolve conflicts in node list of of way {0}", conflict.getMy().id),
+                        tr("Resolve conflicts in node list of of way {0}", conflict.getMy().getId()),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL