synchronize selected layers between tool and add hotkeys

src/main/java/net/rptools/maptool/client/tool/DefaultTool.java

@@ -39,6 +39,14 @@ public abstract class DefaultTool extends Tool
     implements MouseListener, MouseMotionListener, MouseWheelListener {
   private static final long serialVersionUID = 3258411729238372921L;
 
+  private final LayerSelectionDialog layerSelectionDialog =
+      new LayerSelectionDialog(
+          new Zone.Layer[] {
+            Zone.Layer.TOKEN, Zone.Layer.GM, Zone.Layer.OBJECT, Zone.Layer.BACKGROUND
+          },
+          this::selectedLayerChanged);
+
+  private Zone.Layer selectedLayer;
   private boolean isDraggingMap;
   private int dragStartX;
   private int dragStartY;
@@ -57,10 +65,26 @@ public abstract class DefaultTool extends Tool
 
   protected ZoneRenderer renderer;
 
+  protected Zone.Layer getSelectedLayer() {
+    return selectedLayer;
+  }
+
+  protected LayerSelectionDialog getLayerSelectionDialog() {
+    return layerSelectionDialog;
+  }
+
+  protected void selectedLayerChanged(Zone.Layer layer) {
+    selectedLayer = layer;
+    if (renderer != null) {
+      renderer.setActiveLayer(layer);
+    }
+  }
+
   @Override
   protected void attachTo(ZoneRenderer renderer) {
     super.attachTo(renderer);
     this.renderer = renderer;
+    layerSelectionDialog.updateViewList();
   }
 
   @Override
@@ -116,6 +140,51 @@ protected void installKeystrokes(Map<KeyStroke, Action> actionMap) {
     actionMap.put(
         KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.SHIFT_DOWN_MASK),
         new FlipTokenVerticalActionListener());
+
+    // Disable until the conrete hotkeys are decided.
+    /*
+    actionMap.put(
+         KeyStroke.getKeyStroke(KeyEvent.VK_1, InputEvent.CTRL_DOWN_MASK),
+         new AbstractAction() {
+           @Override
+           public void actionPerformed(ActionEvent e) {
+             if (layerSelectionDialog.isVisible()) {
+               layerSelectionDialog.setSelectedLayer(Zone.Layer.TOKEN);
+             }
+           }
+         });
+     actionMap.put(
+         KeyStroke.getKeyStroke(KeyEvent.VK_2, InputEvent.CTRL_DOWN_MASK),
+         new AbstractAction() {
+           @Override
+           public void actionPerformed(ActionEvent e) {
+             if (layerSelectionDialog.isVisible()) {
+               layerSelectionDialog.setSelectedLayer(Zone.Layer.GM);
+             }
+           }
+         });
+     actionMap.put(
+         KeyStroke.getKeyStroke(KeyEvent.VK_3, InputEvent.CTRL_DOWN_MASK),
+         new AbstractAction() {
+           @Override
+           public void actionPerformed(ActionEvent e) {
+             if (layerSelectionDialog.isVisible()) {
+
+               layerSelectionDialog.setSelectedLayer(Zone.Layer.OBJECT);
+             }
+           }
+         });
+     actionMap.put(
+         KeyStroke.getKeyStroke(KeyEvent.VK_4, InputEvent.CTRL_DOWN_MASK),
+         new AbstractAction() {
+           @Override
+           public void actionPerformed(ActionEvent e) {
+             if (layerSelectionDialog.isVisible()) {
+               layerSelectionDialog.setSelectedLayer(Zone.Layer.BACKGROUND);
+             }
+           }
+         });
+         */
   }
 
   ////

src/main/java/net/rptools/maptool/client/tool/PointerTool.java

@@ -95,7 +95,6 @@ public class PointerTool extends DefaultTool {
   private final TokenStackPanel tokenStackPanel = new TokenStackPanel();
   private final HTMLPanelRenderer htmlRenderer = new HTMLPanelRenderer();
   private final Font boldFont = AppStyle.labelFont.deriveFont(Font.BOLD);
-  private final LayerSelectionDialog layerSelectionDialog;
 
   private BufferedImage statSheet;
   private Token tokenOnStatSheet;
@@ -119,35 +118,26 @@ public PointerTool() {
     htmlRenderer.setOpaque(false);
     htmlRenderer.addStyleSheetRule("body{color:black}");
     htmlRenderer.addStyleSheetRule(".title{font-size: 14pt}");
+  }
 
-    layerSelectionDialog =
-        new LayerSelectionDialog(
-            new Zone.Layer[] {
-              Zone.Layer.TOKEN, Zone.Layer.GM, Zone.Layer.OBJECT, Zone.Layer.BACKGROUND
-            },
-            layer -> {
-              if (renderer != null) {
-                renderer.setActiveLayer(layer);
-                MapTool.getFrame().setLastSelectedLayer(layer);
-
-                if (layer != Layer.TOKEN) {
-                  MapTool.getFrame().getToolbox().setSelectedTool(StampTool.class);
-                }
-              }
-            });
+  @Override
+  protected void selectedLayerChanged(Zone.Layer layer) {
+    super.selectedLayerChanged(layer);
+    if (layer != Layer.TOKEN) {
+      MapTool.getFrame().getToolbox().setSelectedTool(StampTool.class);
+    }
   }
 
   @Override
   protected void attachTo(ZoneRenderer renderer) {
     super.attachTo(renderer);
 
     if (MapTool.getPlayer().isGM()) {
-      MapTool.getFrame().showControlPanel(layerSelectionDialog);
+      MapTool.getFrame().showControlPanel(getLayerSelectionDialog());
     }
     htmlRenderer.attach(renderer);
-    layerSelectionDialog.updateViewList();
 
-    if (MapTool.getFrame().getLastSelectedLayer() != Zone.Layer.TOKEN) {
+    if (renderer.getActiveLayer() != Zone.Layer.TOKEN) {
       MapTool.getFrame().getToolbox().setSelectedTool(StampTool.class);
     }
   }

src/main/java/net/rptools/maptool/client/tool/StampTool.java

@@ -97,8 +97,6 @@ public class StampTool extends DefaultTool implements ZoneOverlay {
   // private Map<Shape, Token> rotateBoundsMap = new HashMap<Shape, Token>();
   private final Map<Shape, Token> resizeBoundsMap = new HashMap<Shape, Token>();
 
-  private final LayerSelectionDialog layerSelectionDialog;
-
   // Offset from token's X,Y when dragging. Values are in cell coordinates.
   private int dragOffsetX;
   private int dragOffsetY;
@@ -107,26 +105,14 @@ public class StampTool extends DefaultTool implements ZoneOverlay {
 
   private BufferedImage resizeImg = RessourceManager.getImage(Images.RESIZE);
 
-  public StampTool() {
-    layerSelectionDialog =
-        new LayerSelectionDialog(
-            new Zone.Layer[] {
-              Zone.Layer.TOKEN, Zone.Layer.GM, Zone.Layer.OBJECT, Zone.Layer.BACKGROUND
-            },
-            layer -> {
-              if (renderer != null) {
-                renderer.setActiveLayer(layer);
-                MapTool.getFrame().setLastSelectedLayer(layer);
-
-                if (layer == Layer.TOKEN) {
-                  MapTool.getFrame().getToolbox().setSelectedTool(PointerTool.class);
-                }
-              }
-            });
-  }
+  public StampTool() {}
 
-  public void updateLayerSelectionView() {
-    layerSelectionDialog.updateViewList();
+  @Override
+  protected void selectedLayerChanged(Zone.Layer layer) {
+    super.selectedLayerChanged(layer);
+    if (layer == Layer.TOKEN && MapTool.getFrame() != null) {
+      MapTool.getFrame().getToolbox().setSelectedTool(PointerTool.class);
+    }
   }
 
   @Override
@@ -142,16 +128,14 @@ protected void detachFrom(ZoneRenderer renderer) {
 
   @Override
   protected void attachTo(ZoneRenderer renderer) {
-    MapTool.getFrame().showControlPanel(layerSelectionDialog);
+    MapTool.getFrame().showControlPanel(getLayerSelectionDialog());
     super.attachTo(renderer);
 
     // Jamz: Lets remember token selections during Tool class switches which causes
     // setActiveLayer(layer) to be called which normally calls selectedTokenSet.clear()
     if (renderer.getSelectedTokenSet().size() > 0) {
       renderer.setKeepSelectedTokenSet(true);
     }
-
-    layerSelectionDialog.updateViewList();
   }
 
   @Override

src/main/java/net/rptools/maptool/client/tool/drawing/AbstractDrawingTool.java

@@ -32,7 +32,6 @@
 import net.rptools.maptool.client.swing.ColorPicker;
 import net.rptools.maptool.client.swing.SwingUtil;
 import net.rptools.maptool.client.tool.DefaultTool;
-import net.rptools.maptool.client.tool.LayerSelectionDialog;
 import net.rptools.maptool.client.ui.zone.ZoneOverlay;
 import net.rptools.maptool.client.ui.zone.ZoneRenderer;
 import net.rptools.maptool.model.GUID;
@@ -53,18 +52,6 @@ public abstract class AbstractDrawingTool extends DefaultTool implements ZoneOve
   private boolean isEraser;
   private boolean isSnapToGridSelected;
   private boolean isEraseSelected;
-  private static final LayerSelectionDialog layerSelectionDialog;
-
-  private static Zone.Layer selectedLayer = Zone.Layer.TOKEN;
-
-  static {
-    layerSelectionDialog =
-        new LayerSelectionDialog(
-            new Zone.Layer[] {
-              Zone.Layer.TOKEN, Zone.Layer.GM, Zone.Layer.OBJECT, Zone.Layer.BACKGROUND
-            },
-            layer -> selectedLayer = layer);
-  }
 
   protected Rectangle createRect(ZonePoint originPoint, ZonePoint newPoint) {
     int x = Math.min(originPoint.x, newPoint.x);
@@ -136,17 +123,17 @@ protected void paintTransformed(Graphics2D g, ZoneRenderer renderer, Drawable dr
 
   @Override
   protected void attachTo(ZoneRenderer renderer) {
+    super.attachTo(renderer);
     if (MapTool.getPlayer().isGM()) {
       MapTool.getFrame()
-          .showControlPanel(MapTool.getFrame().getColorPicker(), layerSelectionDialog);
+          .showControlPanel(MapTool.getFrame().getColorPicker(), getLayerSelectionDialog());
     } else {
       MapTool.getFrame().showControlPanel(MapTool.getFrame().getColorPicker());
     }
     renderer.setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
 
     MapTool.getFrame().getColorPicker().setSnapSelected(isSnapToGridSelected);
     MapTool.getFrame().getColorPicker().setEraseSelected(isEraseSelected);
-    super.attachTo(renderer);
   }
 
   @Override
@@ -345,9 +332,8 @@ protected void completeDrawable(GUID zoneId, Pen pen, Drawable drawable) {
     if (drawable.getBounds() == null) {
       return;
     }
-    drawable.setLayer(selectedLayer);
     if (MapTool.getPlayer().isGM()) {
-      drawable.setLayer(selectedLayer);
+      drawable.setLayer(renderer.getActiveLayer());
     } else {
       drawable.setLayer(Layer.TOKEN);
     }

src/main/java/net/rptools/maptool/client/tool/drawing/DeleteDrawingTool.java

@@ -28,7 +28,6 @@
 import net.rptools.maptool.client.*;
 import net.rptools.maptool.client.events.ZoneActivated;
 import net.rptools.maptool.client.tool.DefaultTool;
-import net.rptools.maptool.client.tool.LayerSelectionDialog;
 import net.rptools.maptool.client.ui.drawpanel.DrawPanelPopupMenu;
 import net.rptools.maptool.client.ui.zone.ZoneOverlay;
 import net.rptools.maptool.client.ui.zone.ZoneRenderer;
@@ -43,11 +42,6 @@ public class DeleteDrawingTool extends DefaultTool implements ZoneOverlay, Mouse
 
   @Serial private static final long serialVersionUID = -8846217296437736953L;
 
-  private static final LayerSelectionDialog layerSelectionDialog =
-      new LayerSelectionDialog(
-          new Layer[] {Layer.TOKEN, Layer.GM, Layer.OBJECT, Layer.BACKGROUND},
-          layer -> selectedLayer = layer);
-
   private static final Set<GUID> selectedDrawings = new HashSet<>();
   private static final DrawPanelPopupMenu.DeleteDrawingAction deleteAction =
       new DrawPanelPopupMenu.DeleteDrawingAction(selectedDrawings);
@@ -76,11 +70,10 @@ public String getInstructions() {
 
   @Override
   protected void attachTo(ZoneRenderer renderer) {
+    super.attachTo(renderer);
     if (MapTool.getPlayer().isGM()) {
-      MapTool.getFrame().showControlPanel(layerSelectionDialog);
+      MapTool.getFrame().showControlPanel(getLayerSelectionDialog());
     }
-
-    super.attachTo(renderer);
   }
 
   @Override

src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java

@@ -946,14 +946,6 @@ public CoordinateStatusBar getCoordinateStatusBar() {
     return coordinateStatusBar;
   }
 
-  public Layer getLastSelectedLayer() {
-    return lastSelectedLayer;
-  }
-
-  public void setLastSelectedLayer(Layer lastSelectedLayer) {
-    this.lastSelectedLayer = lastSelectedLayer;
-  }
-
   public void hideControlPanel() {
     if (visibleControlPanel != null) {
       if (zoneRendererPanel != null) {

src/main/java/net/rptools/maptool/client/ui/zone/ZoneRenderer.java

@@ -261,16 +261,10 @@ public void centerOn(Token token) {
     }
 
     centerOn(new ZonePoint(token.getX(), token.getY()));
+    setActiveLayer(token.getLayer());
     MapTool.getFrame()
         .getToolbox()
         .setSelectedTool(token.isToken() ? PointerTool.class : StampTool.class);
-    setActiveLayer(token.getLayer());
-
-    // Jamz: even though the layer was being activated the dialog list was not updating...
-    Tool currentTool = MapTool.getFrame().getToolbox().getSelectedTool();
-    if (currentTool instanceof StampTool) {
-      ((StampTool) currentTool).updateLayerSelectionView();
-    }
 
     selectToken(token.getId());
     requestFocusInWindow();