Ticket #5515: LayerShortcuts.diff

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

@@ -190 +190 @@
         );
 
         add(createButtonPanel(), BorderLayout.SOUTH);
+
+        // create direct actions
+        for (int i = 0; i<10; i++) {
+            ShowHideLayerNAction showHideLayerNAction = new ShowHideLayerNAction(i);
+        }
+        for (int i = 0; i<10; i++) {
+            ActivateLayerNAction activateLayerNAction = new ActivateLayerNAction(i);
+        }
     }
 
     @Override
@@ -341 +349 @@
         }
     }
 
+    /**
+     * The action to toggle visible state of the currently selected layer(s)
+     */
     public final class ShowHideLayerAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
         private  Layer layer;
 
@@ -411 +422 @@
     }
 
     /**
+     * The action to toggle visible state of the index-specified layer
+     */
+    public final class ShowHideLayerNAction extends AbstractAction {
+        private int n;
+
+        /**
+         * Creates a {@see ShowHideLayerNAction} which will toggle the visibility of
+         * a index-specified layer
+         *
+         * @param n index of a layer
+         */
+        public ShowHideLayerNAction(int n) {
+            this.n = n;
+            Main.registerActionShortcut(this, Shortcut.registerShortcut("layer:showhide." + n,
+                    tr("{0}: {1} {2}", tr("Layers"), tr("Show/Hide layer"), Integer.toString(n+1)),
+                    KeyEvent.VK_0 + ((n+1)%10), Shortcut.GROUP_NONE));
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            Layer layer = model.getLayer(n);
+            if (layer == null) {
+                return;
+            }
+            layer.toggleVisible();
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof ShowHideLayerNAction)) return false;
+            ShowHideLayerNAction other = (ShowHideLayerNAction) obj;
+            return (other.n == this.n);
+        }
+
+        @Override
+        public int hashCode() {
+            return getClass().hashCode();
+        }
+
+    }
+
+    /**
      * The action to activate the currently selected layer
      */
 
@@ -476 +528 @@
     }
 
     /**
+     * The action to activate the index-specified layer
+     */
+    public final class ActivateLayerNAction extends AbstractAction {
+        private int n;
+
+        /**
+         * Creates a {@see ActivateLayerNAction} which will activate
+         * a index-specified layer
+         *
+         * @param n index of a layer
+         */
+        public ActivateLayerNAction(int n) {
+            this.n = n;
+            Main.registerActionShortcut(this, Shortcut.registerShortcut("layer:activate." + n,
+                    tr("{0}: {1} {2}", tr("Layers"), tr("Activate layer"), Integer.toString(n+1)),
+                    KeyEvent.VK_0 + ((n+1)%10), Shortcut.GROUP_NONE));
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            Layer layer = model.getLayer(n);
+            if (layer == null) {
+                return;
+            }
+            // model is  going to be updated via LayerChangeListener
+            // and PropertyChangeEvents
+            Main.map.mapView.setActiveLayer(layer);
+            layer.setVisible(true);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof ActivateLayerNAction)) return false;
+            ActivateLayerNAction other = (ActivateLayerNAction) obj;
+            return (other.n == this.n);
+        }
+
+        @Override
+        public int hashCode() {
+            return getClass().hashCode();
+        }
+
+    }
+
+    /**
      * The action to merge the currently selected layer into another layer.
      */
     public final class MergeAction extends AbstractAction implements IEnabledStateUpdating {