Changeset 2914 in josm for trunk/src/org

Timestamp:

2010-01-31T18:07:03+01:00 (15 years ago)

Author:

jttt

Message:

Fixed #4451 Error message trying to edit a restriction element

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -222 +222 @@
             model.setSelectedRelations(Collections.singletonList(relation));
             Integer i = model.getRelationIndex(relation);
-            if (i == null)
-                throw new AssertionError(); /* the relation list should contain *all* relations */
-            displaylist.scrollRectToVisible(displaylist.getCellBounds(i, i));
+            if (i != null) { // Not all relations have to be in the list (for example when the relation list is hidden, it's not updated with new relations)
+                displaylist.scrollRectToVisible(displaylist.getCellBounds(i, i));
+            }
         }
     }
@@ -693 +693 @@
          * Returns the index of the relation
          *
-         * @return index of relation (null if it cannot be found) 
+         * @return index of relation (null if it cannot be found)
          */
         public Integer getRelationIndex(Relation rel) {
             int i = relations.indexOf(rel);
-            if (i<0) {
+            if (i<0)
                 return null;
-            }
             return i;
         }
-            
+
     }