Changes in src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java [17:30] in josm

File:

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

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

@@ -3 +3 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -16 +17 @@
 import javax.swing.ListSelectionModel;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.SelectionComponentVisitor;
 import org.openstreetmap.josm.gui.ImageProvider;
-import org.openstreetmap.josm.gui.Main;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.layer.Layer;
 
 /**
@@ -34 +31 @@
  * @author imi
  */
-public class SelectionListDialog extends ToggleDialog implements SelectionChangedListener, LayerChangeListener {
+public class SelectionListDialog extends ToggleDialog implements SelectionChangedListener {
 
         /**
@@ -44 +41 @@
          */
         private JList displaylist = new JList(list);
-        /**
-         * The dataset, all selections are part of.
-         */
-        private final MapView mapView;
         
         /**
@@ -54 +47 @@
          */
         public SelectionListDialog(MapFrame mapFrame) {
-                super(mapFrame, "Current Selection", "Selection List", "selectionlist", KeyEvent.VK_E, "Open a selection list window.");
-                this.mapView = mapFrame.mapView;
-                setLayout(new BorderLayout());
-                setSize(300,400);
+                super("Current Selection", "Selection List", "selectionlist", KeyEvent.VK_E, "Open a selection list window.");
+                setPreferredSize(new Dimension(320,150));
                 displaylist.setCellRenderer(new DefaultListCellRenderer(){
                         private SelectionComponentVisitor visitor = new SelectionComponentVisitor();
@@ -73 +64 @@
                 displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 
-                getContentPane().add(new JScrollPane(displaylist), BorderLayout.CENTER);
+                add(new JScrollPane(displaylist), BorderLayout.CENTER);
 
                 JButton button = new JButton("Select", ImageProvider.get("mapmode", "selection"));
@@ -82 +73 @@
                         }
                 });
-                getContentPane().add(button, BorderLayout.SOUTH);
+                add(button, BorderLayout.SOUTH);
 
-                selectionChanged(mapView.getActiveDataSet().getSelected());
+                selectionChanged(Main.main.ds.getSelected());
         }
 
@@ -90 +81 @@
         public void setVisible(boolean b) {
                 if (b) {
-                        mapView.addLayerChangeListener(this);
-                        mapView.getActiveDataSet().addSelectionChangedListener(this);
-                        selectionChanged(mapView.getActiveDataSet().getSelected());
+                        Main.main.ds.addSelectionChangedListener(this);
+                        selectionChanged(Main.main.ds.getSelected());
                 } else {
-                        mapView.removeLayerChangeListener(this);
-                        mapView.getActiveDataSet().removeSelectionChangedListener(this);
+                        Main.main.ds.removeSelectionChangedListener(this);
                 }
                 super.setVisible(b);
@@ -118 +107 @@
          */
         public void updateMap() {
-                DataSet ds = mapView.getActiveDataSet();
-                ds.clearSelection();
+                Main.main.ds.clearSelection();
                 for (int i = 0; i < list.getSize(); ++i)
                         if (displaylist.isSelectedIndex(i))
-                                ((OsmPrimitive)list.get(i)).setSelected(true, ds);
+                                ((OsmPrimitive)list.get(i)).setSelected(true);
                 Main.main.getMapFrame().repaint();
         }
-
-        public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                DataSet ds = oldLayer.getDataSet();
-                if (ds != null)
-                        ds.removeSelectionChangedListener(this);
-                ds = newLayer.getDataSet();
-                if (ds != null)
-                        ds.addSelectionChangedListener(this);
-        }
-
-        /**
-         * Does nothing. Only to satisfy LayerChangeListener
-         */
-        public void layerAdded(Layer newLayer) {}
-        /**
-         * Does nothing. Only to satisfy LayerChangeListener
-         */
-        public void layerRemoved(Layer oldLayer) {}
 }