Changeset 3408 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

Timestamp:

2010-08-03T07:52:26+02:00 (16 years ago)

Author:

jttt

Message:

Show only actions that can work on all selected layers in LayerListDialog popup menu

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (10 diffs)

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

@@ -26 +26 @@
 import javax.swing.JLabel;
 import javax.swing.JList;
+import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -47 +48 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -265 +267 @@
      * The action to delete the currently selected layer
      */
-    public final  class DeleteLayerAction extends AbstractAction implements IEnabledStateUpdating {
+    public final class DeleteLayerAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
         /**
          * Creates a {@see DeleteLayerAction} which will delete the currently
@@ -318 +320 @@
             setEnabled(! getModel().getSelectedLayers().isEmpty());
         }
-    }
-
-    public final class ShowHideLayerAction extends AbstractAction implements IEnabledStateUpdating {
+
+        @Override
+        public Component createMenuComponent() {
+            return new JMenuItem(this);
+        }
+
+        @Override
+        public boolean supportLayers(List<Layer> layers) {
+            return true;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof DeleteLayerAction;
+        }
+
+        @Override
+        public int hashCode() {
+            return getClass().hashCode();
+        }
+    }
+
+    public final class ShowHideLayerAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
         private  Layer layer;
 
@@ -334 +356 @@
             CheckParameterUtil.ensureParameterNotNull(layer, "layer");
             this.layer = layer;
-            putValue(NAME, tr("Show/Hide"));
             updateEnabledState();
         }
@@ -347 +368 @@
             putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the selected layer."));
             putValue("help", HelpUtil.ht("/Dialog/LayerDialog#ShowHideLayer"));
+            putValue(NAME, tr("Show/Hide"));
             updateEnabledState();
         }
@@ -366 +388 @@
                 setEnabled(true);
             }
+        }
+
+        @Override
+        public Component createMenuComponent() {
+            return new JMenuItem(this);
+        }
+
+        @Override
+        public boolean supportLayers(List<Layer> layers) {
+            return true;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof ShowHideLayerAction;
+        }
+
+        @Override
+        public int hashCode() {
+            return getClass().hashCode();
         }
     }
@@ -576 +618 @@
             }
             Layer layer = model.getLayer(index);
-            LayerListPopup menu = new LayerListPopup(layerList, layer);
+            LayerListPopup menu = new LayerListPopup(getModel().getSelectedLayers(), layer);
             menu.show(LayerListDialog.this, p.x, p.y-3);
         }
@@ -1064 +1106 @@
      * @return the action
      */
-    public ShowHideLayerAction createShowHideLayerAction(Layer layer) {
-        return new ShowHideLayerAction(layer);
+    public ShowHideLayerAction createShowHideLayerAction() {
+        return new ShowHideLayerAction();
     }
 
@@ -1075 +1117 @@
      * @return the action
      */
-    public DeleteLayerAction createDeleteLayerAction(Layer layer) {
+    public DeleteLayerAction createDeleteLayerAction() {
         // the delete layer action doesn't depend on the current layer
         return new DeleteLayerAction();