Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.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/dialogs/relation/MemberTableModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -198 +198 @@
     public void updateMemberReferences(DataSet ds) {
         for (RelationMember member : members) {
-            if (member.getMember().id == 0) {
+            if (member.getMember().getId() == 0) {
                 continue;
             }
-            OsmPrimitive primitive = ds.getPrimitiveById(member.getMember().id);
+            OsmPrimitive primitive = ds.getPrimitiveById(member.getMember().getId());
             if (primitive != null) {
                 member.member = primitive;