Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.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/PurgePrimitivesCommand.java (modified) (3 diffs)

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);
             }