Changeset 1970 in josm for trunk

Timestamp:

2009-08-12T15:46:05+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3252: selected primitives after deleting a data layer

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• PropertiesDialog.java (modified) (2 diffs)
• SelectionListDialog.java (modified) (2 diffs)

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

@@ -27 +27 @@
 import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -816 +817 @@
             OsmDataLayer dataLayer = (OsmDataLayer)newLayer;
             selectionChanged(dataLayer.data.getSelected());
+        } else {
+            List<OsmPrimitive> selection = Collections.emptyList();
+            selectionChanged(selection);
         }
     }

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

@@ -16 +16 @@
 import java.awt.event.MouseEvent;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.NoSuchElementException;
 
@@ -377 +379 @@
             OsmDataLayer dataLayer = (OsmDataLayer)newLayer;
             selectionChanged(dataLayer.data.getSelected());
-
-        }
-
+        } else {
+            List<OsmPrimitive> selection = Collections.emptyList();
+            selectionChanged(selection);
+        }
     }
 
     public void layerAdded(Layer newLayer) {
         // do nothing
-
     }
 
     public void layerRemoved(Layer oldLayer) {
         // do nothing
-
     }
 }