Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

Timestamp:

2009-07-19T19:04:49+02:00 (15 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (16 diffs)

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

@@ -43 +43 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -52 +55 @@
  * @author imi
  */
-public class SelectionListDialog extends ToggleDialog implements SelectionChangedListener {
+public class SelectionListDialog extends ToggleDialog implements SelectionChangedListener, LayerChangeListener {
 
     private static final int SELECTION_HISTORY_SIZE = 10;
@@ -80 +83 @@
     public SelectionListDialog() {
         super(tr("Current Selection"), "selectionlist", tr("Open a selection list window."),
-        Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}", tr("Current Selection")), KeyEvent.VK_T, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
+                Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}", tr("Current Selection")), KeyEvent.VK_T, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
 
         selectionHistory = new LinkedList<Collection<? extends OsmPrimitive>>();
@@ -89 +92 @@
             @Override
             public void mouseClicked(MouseEvent e) {
-                if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1)
+                if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
                     updateMap();
+                }
             }
 
@@ -112 +116 @@
                 tr("Set the selected elements on the map to the selected items in the list above."),
                 new ActionListener() {
-                    public void actionPerformed(ActionEvent e) {
-                        updateMap();
-                    }
-                });
+            public void actionPerformed(ActionEvent e) {
+                updateMap();
+            }
+        });
         buttonPanel.add(selectButton);
         BasicArrowButton selectionHistoryMenuButton = createArrowButton(selectButton);
@@ -134 +138 @@
         buttonPanel.add(new SideButton(marktr("Reload"), "refresh", "SelectionList", tr("Refresh the selection list."),
                 new ActionListener() {
-                    public void actionPerformed(ActionEvent e) {
-                        selectionChanged(Main.ds.getSelected());
-                    }
-                }));
+            public void actionPerformed(ActionEvent e) {
+                selectionChanged(Main.main.getCurrentDataSet().getSelected());
+            }
+        }));
 
         searchButton = new SideButton(marktr("Search"), "search", "SelectionList", tr("Search for objects."),
@@ -159 +163 @@
         popupMenu.add(zoomToSelection);
 
-        selectionChanged(Main.ds.getSelected());
+        if (Main.main.getCurrentDataSet() != null) {
+            selectionChanged(Main.main.getCurrentDataSet().getSelected());
+        }
 
         DataSet.selListeners.add(this);
+        Layer.listeners.add(this);
     }
 
@@ -179 +186 @@
     public void setVisible(boolean b) {
         super.setVisible(b);
-        if (b)
-            selectionChanged(Main.ds.getSelected());
+        if (b && Main.main.getCurrentDataSet() != null) {
+            selectionChanged(Main.main.getCurrentDataSet().getSelected());
+        }
     }
 
@@ -204 +212 @@
         for (int i = 0; i < selected.length; i++) {
             Object o = list.get(selected[i]);
-            if (o instanceof OsmPrimitive)
+            if (o instanceof OsmPrimitive) {
                 ((OsmPrimitive) o).visit(box);
+            }
         }
         if (box.getBounds() == null)
@@ -247 +256 @@
         list.setSize(selArr.length);
         int i = 0;
-        for (OsmPrimitive osm : selArr)
+        for (OsmPrimitive osm : selArr) {
             list.setElementAt(osm, i++);
+        }
         if (selectionHistory != null && newSelection.size() > 0 && !newSelection.equals(historyIgnoreSelection)) {
             historyIgnoreSelection = null;
@@ -259 +269 @@
             }
             selectionHistory.addFirst(newSelection);
-            while (selectionHistory.size() > SELECTION_HISTORY_SIZE)
+            while (selectionHistory.size() > SELECTION_HISTORY_SIZE) {
                 selectionHistory.removeLast();
+            }
         }
 
@@ -267 +278 @@
         int relations = 0;
         for (OsmPrimitive o : newSelection) {
-            if (o instanceof Way)
+            if (o instanceof Way) {
                 ways++;
-            else if (o instanceof Node)
+            } else if (o instanceof Node) {
                 nodes++;
-            else if (o instanceof Relation)
+            } else if (o instanceof Relation) {
                 relations++;
+            }
         }
 
@@ -288 +300 @@
         Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
         for (int i = 0; i < list.getSize(); ++i)
-            if (displaylist.isSelectedIndex(i))
+            if (displaylist.isSelectedIndex(i)) {
                 sel.add((OsmPrimitive) list.get(i));
-        Main.ds.setSelected(sel);
+            }
+        Main.main.getCurrentDataSet().setSelected(sel);
     }
 
@@ -308 +321 @@
             int relations = 0;
             for (OsmPrimitive o : sel) {
-                if (o instanceof Way)
+                if (o instanceof Way) {
                     ways++;
-                else if (o instanceof Node)
+                } else if (o instanceof Node) {
                     nodes++;
-                else if (o instanceof Relation)
+                } else if (o instanceof Relation) {
                     relations++;
+                }
             }
             String text = "";
-            if(ways != 0)
+            if(ways != 0) {
                 text += (text.length() > 0 ? ", " : "")
                 + trn("{0} way", "{0} ways", ways, ways);
-            if(nodes != 0)
+            }
+            if(nodes != 0) {
                 text += (text.length() > 0 ? ", " : "")
                 + trn("{0} node", "{0} nodes", nodes, nodes);
-            if(relations != 0)
+            }
+            if(relations != 0) {
                 text += (text.length() > 0 ? ", " : "")
                 + trn("{0} relation", "{0} relations", relations, relations);
+            }
             setText(tr("Selection: {0}", text));
             addActionListener(this);
@@ -331 +348 @@
         public void actionPerformed(ActionEvent e) {
             historyIgnoreSelection = sel;
-            Main.ds.setSelected(sel);
+            Main.main.getCurrentDataSet().setSelected(sel);
         }
 
@@ -355 +372 @@
 
     }
+
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+        if (newLayer instanceof OsmDataLayer) {
+            OsmDataLayer dataLayer = (OsmDataLayer)newLayer;
+            selectionChanged(dataLayer.data.getSelected());
+
+        }
+
+    }
+
+    public void layerAdded(Layer newLayer) {
+        // do nothing
+
+    }
+
+    public void layerRemoved(Layer oldLayer) {
+        // do nothing
+
+    }
 }