Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

Timestamp:

2009-09-06T23:07:33+02:00 (15 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.

File:

• trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified) (1 diff)

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