Changeset 5725 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-02-17T20:09:56+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8433 - NPEs when opening relation editor or selecting in list from selection toggle dialog's context menu with active filter of relation list

File:

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

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

@@ -92 +92 @@
 public class RelationListDialog extends ToggleDialog implements DataSetListener {
     /** The display list. */
-    private JList displaylist;
+    private final JList displaylist;
     /** the list model used */
-    private RelationListModel model;
+    private final RelationListModel model;
 
     /** the edit action */
-    private EditAction editAction;
+    private final EditAction editAction;
     /** the delete action */
-    private DeleteAction deleteAction;
-    private NewAction newAction;
-    private AddToRelation addToRelation;
+    private final DeleteAction deleteAction;
+    private final NewAction newAction;
+    private final AddToRelation addToRelation;
     /** the popup menu */
-    private RelationDialogPopupMenu popupMenu;
-
+    private final RelationDialogPopupMenu popupMenu;
+
+    private final JTextField filter;
+    
     /**
      * constructor
@@ -155 +157 @@
         displaylist.addListSelectionListener(selectAction);
 
-        final JTextField filter = new DisableShortcutsOnFocusGainedTextField();
+        filter = new DisableShortcutsOnFocusGainedTextField();
         filter.setToolTipText(tr("Relation list filter"));
         filter.getDocument().addDocumentListener(new DocumentListener() {
@@ -228 +230 @@
         DataSet.removeSelectionListener(addToRelation);
     }
+    
+    private void resetFilter() {
+        filter.setText(null);
+    }
 
     /**
@@ -293 +299 @@
         } else {
             model.setSelectedRelations(relations);
-            Integer i = model.getRelationIndex(relations.iterator().next());
+            Integer i = model.getVisibleRelationIndex(relations.iterator().next());
             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));
@@ -907 +913 @@
             if (sel == null || sel.isEmpty())
                 return;
+            if (!getVisibleRelations().containsAll(sel)) {
+                resetFilter();
+            }
             for (Relation r: sel) {
-                int i = relations.indexOf(r);
+                int i = getVisibleRelationIndex(r);
                 if (i<0) {
                     continue;
@@ -928 +937 @@
             return i;
         }
+        
+        private Integer getVisibleRelationIndex(Relation rel) {
+            int i = getVisibleRelations().indexOf(rel);
+            if (i<0)
+                return null;
+            return i;
+        }
 
         public void updateTitle() {