Changeset 1616 in josm for trunk

Timestamp:

2009-05-24T12:18:25+02:00 (15 years ago)

Author:

stoecker

Message:

fix #2646 - illegal variable acces in relation editor

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (5 diffs)

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

@@ -328 +328 @@
         memberData.setRowCount(0);
         for (int i=0; i<clone.members.size(); i++) {
-            
+
             // this whole section is aimed at finding out whether the
             // relation member is "linked" with the next, i.e. whether
@@ -335 +335 @@
             // symbol somehow places betweeen the two member lines!), and
             // it should cache results, so... FIXME ;-)
-            
+
             RelationMember em = clone.members.get(i);
             boolean linked = false;
@@ -345 +345 @@
                     n1 = ((Way) m.member).lastNode();
                     break;
-                } else if (em.member instanceof Relation) {
+                } else if (m.member instanceof Relation) {
                     m = ((Relation)m.member).lastMember();
                 } else {
@@ -357 +357 @@
                         n2 = ((Way) (m.member)).firstNode();
                         break;
-                    } else if (em.member instanceof Relation) {
+                    } else if (m.member instanceof Relation) {
                         m = ((Relation)(m.member)).firstMember();
                     } else {
@@ -365 +365 @@
             }
             linked = (n1 != null) && n1.equals(n2);
-            
-            // end of section to determine linkedness. 
-           
+
+            // end of section to determine linkedness.
+
             memberData.addRow(new Object[]{em.role, em.member, linked ? tr("yes") : tr("no")});
         }