Changeset 1917 in josm

Timestamp:

Aug 6, 2009 10:51:28 AM (4 years ago)

Author:

Gubaer

Message:

fixed #3195: No layer is highlighted by default
new: delete layer with DEL

File:

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

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

@@ -25 +25 @@
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.Icon;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -30 +31 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.KeyStroke;
 import javax.swing.ListModel;
 import javax.swing.ListSelectionModel;
@@ -129 +131 @@
         //-- delete layer action
         DeleteLayerAction deleteLayerAction = new DeleteLayerAction();
+        layerList.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
+                KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),"deleteLayer"
+        );
+        layerList.getActionMap().put("deleteLayer", deleteLayerAction);
         adaptTo(deleteLayerAction, selectionModel);
         buttonPanel.add(new SideButton(deleteLayerAction, "delete"));
@@ -136 +142 @@
 
     /**
-     * Create an layerlist and attach it to the given mapView.
+     * Create an layer list and attach it to the given mapView.
      */
     protected LayerListDialog(MapFrame mapFrame) {
@@ -186 +192 @@
     }
 
+    /**
+     * Wires <code>listener</code> to <code>listSelectionModel</code> in such a way, that
+     * <code>listener</code> receives a {@see IEnabledStateUpdating#updateEnabledState()}
+     * on every {@see ListSelectionEvent}.
+     * 
+     * @param listener  the listener
+     * @param listSelectionModel  the source emitting {@see ListSelectionEvent}s
+     */
     protected void adaptTo(final IEnabledStateUpdating listener, ListSelectionModel listSelectionModel) {
         listSelectionModel.addListSelectionListener(
@@ -196 +210 @@
     }
 
+    /**
+     * Wires <code>listener</code> to <code>listModel</code> in such a way, that
+     * <code>listener</code> receives a {@see IEnabledStateUpdating#updateEnabledState()}
+     * on every {@see ListDataEvent}.
+     * 
+     * @param listener  the listener
+     * @param listSelectionModel  the source emitting {@see ListDataEvent}s
+     */
     protected void adaptTo(final IEnabledStateUpdating listener, ListModel listModel) {
         listModel.addListDataListener(
@@ -213 +235 @@
         );
     }
-
+    /**
+     * Wires <code>listener</code> to {@see MapView} in such a way, that
+     * <code>listener</code> receives a {@see IEnabledStateUpdating#updateEnabledState()}
+     * on every {@see LayerChangeListener}-event emitted by {@see MapView}.
+     * 
+     * @param listener  the listener
+     */
     protected void adaptToLayerChanges(final IEnabledStateUpdating listener) {
         Layer.listeners.add(
@@ -374 +402 @@
             if (this.layer == null) {
                 List<Layer> selectedLayers = getModel().getSelectedLayers();
+                if (selectedLayers.isEmpty())
+                    return;
                 if (selectedLayers.size() == 1) {
                     deleteSingleLayer(selectedLayers.get(0));
@@ -473 +503 @@
                 toActivate = model.getSelectedLayers().get(0);
             }
-            getModel().activateLayer(toActivate);
+            // model is  going to be updated via LayerChangeListener
+            // and PropertyChangeEvents
+            Main.map.mapView.setActiveLayer(toActivate);
+            toActivate.setVisible(true);
         }
 
@@ -662 +695 @@
     /**
      * The layer list model. The model manages a list of layers and provides methods for
-     * moving layers up and down, for toggling their visibiliy, for activating a layer.
+     * moving layers up and down, for toggling their visibility, and for activating a layer.
      * 
      * The model is a {@see ListModel} and it provides a {@see ListSelectionModel}. It expectes
@@ -670 +703 @@
      * The model manages a list of {@see LayerListModelListener} which are mainly notified if
      * the model requires views to make a specific list entry visible.
+     * 
+     * It also listens to {@see PropertyChangeEvent}s of every {@see Layer} it manages, in particular to
+     * the properties {@see Layer#VISIBLE_PROP} and {@see Layer#NAME_PROP}.
      */
     public class LayerListModel extends DefaultListModel implements LayerChangeListener, PropertyChangeListener{
@@ -811 +847 @@
             if (layer == null)
                 return;
+            layer.removePropertyChangeListener(this);
             int size = getSize();
             List<Integer> rows = getSelectedRows();
@@ -829 +866 @@
             layer.addPropertyChangeListener(this);
             fireContentsChanged(this, 0, getSize());
+            int idx = getLayers().indexOf(layer);
+            selectionModel.setSelectionInterval(idx, idx);
+            ensureSelectedIsVisible();
         }
 
@@ -958 +998 @@
 
         /**
-         * Activates the layer <code>layer</code>
-         * 
-         * @param layer the layer
-         */
-        public void activateLayer(Layer layer) {
-            if (layer == null)
-                return;
-            Main.map.mapView.setActiveLayer(layer);
-            layer.setVisible(true);
-            int idx = getLayers().indexOf(layer);
-            selectionModel.setSelectionInterval(idx,idx);
-            ensureSelectedIsVisible();
-        }
-
-        /**
          * Replies the list of layers currently managed by {@see MapView}.
          * Never null, but can be empty.
@@ -983 +1008 @@
                 return Collections.<Layer>emptyList();
             return Main.map.mapView.getAllLayersAsList();
+        }
+
+        /**
+         * Ensures that at least one layer is selected in the layer dialog
+         * 
+         */
+        protected void ensureActiveSelected() {
+            if (getLayers().size() == 0) return;
+            if (getActiveLayer() != null) {
+                // there's an active layer - select it and make it
+                // visible
+                int idx = getLayers().indexOf(getActiveLayer());
+                selectionModel.setSelectionInterval(idx, idx);
+                ensureSelectedIsVisible();
+            } else {
+                // no active layer - select the first one and make
+                // it visible
+                selectionModel.setSelectionInterval(0, 0);
+                ensureSelectedIsVisible();
+            }
+        }
+
+        /**
+         * Replies the active layer. null, if no active layer is available
+         * 
+         * @return the active layer. null, if no active layer is available
+         */
+        protected Layer getActiveLayer() {
+            if (Main.map == null || Main.map.mapView == null) return null;
+            return Main.map.mapView.getActiveLayer();
         }
 
@@ -1017 +1072 @@
                 }
             }
+            ensureActiveSelected();
         }
 
@@ -1058 +1114 @@
     }
 
+    /**
+     * Creates a {@see ShowHideLayerAction} for <code>layer</code> in the
+     * context of this {@see LayerListDialog}.
+     * 
+     * @param layer the layer
+     * @return the action
+     */
     public ShowHideLayerAction createShowHideLayerAction(Layer layer) {
         return new ShowHideLayerAction(layer);
     }
 
+    /**
+     * Creates a {@see DeleteLayerAction} for <code>layer</code> in the
+     * context of this {@see LayerListDialog}.
+     * 
+     * @param layer the layer
+     * @return the action
+     */
     public DeleteLayerAction createDeleteLayerAction(Layer layer) {
         return new DeleteLayerAction(layer);
     }
 
+    /**
+     * Creates a {@see ActivateLayerAction} for <code>layer</code> in the
+     * context of this {@see LayerListDialog}.
+     * 
+     * @param layer the layer
+     * @return the action
+     */
     public ActivateLayerAction createActivateLayerAction(Layer layer) {
         return new ActivateLayerAction(layer);
     }
 
+    /**
+     * Creates a {@see MergeLayerAction} for <code>layer</code> in the
+     * context of this {@see LayerListDialog}.
+     * 
+     * @param layer the layer
+     * @return the action
+     */
     public MergeAction createMergeLayerAction(Layer layer) {
         return new MergeAction(layer);