Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.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/gui/conflict/pair/nodes/NodeListMergeModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

@@ -76 +76 @@
     @Override
     public boolean isEqualEntry(Node e1, Node e2) {
-        if (e1.id > 0)
-            return e1.id == e2.id;
+        if (e1.getId() > 0)
+            return e1.getId() == e2.getId();
         else
             return e1 == e2;