Changeset 5030 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-02-29T09:44:59+01:00 (13 years ago)

Author:

jttt

Message:

Fix #7462 No action definded for buttons (becauase of r5028)

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• LayerListDialog.java (modified) (2 diffs)
• MapPaintDialog.java (modified) (5 diffs)
• ToggleDialog.java (modified) (1 diff)

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

@@ -251 +251 @@
         LayerOpacityAction layerOpacityAction = new LayerOpacityAction();
         adaptTo(layerOpacityAction, selectionModel);
-        opacityButton = new SideButton(layerOpacityAction);
+        opacityButton = new SideButton(layerOpacityAction, false);
 
         // -- merge layer action
@@ -269 +269 @@
 
         createLayout(layerList, true, Arrays.asList(new SideButton[] {
-                new SideButton(moveUpAction),
-                new SideButton(moveDownAction),
-                new SideButton(activateLayerAction),
-                new SideButton(showHideLayerAction),
+                new SideButton(moveUpAction, false),
+                new SideButton(moveDownAction, false),
+                new SideButton(activateLayerAction, false),
+                new SideButton(showHideLayerAction, false),
                 opacityButton,
-                new SideButton(mergeLayerAction),
-                new SideButton(duplicateLayerAction),
+                new SideButton(mergeLayerAction, false),
+                new SideButton(duplicateLayerAction, false),
                 new SideButton(deleteLayerAction, false)
         }));

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

@@ -86 +86 @@
     public MapPaintDialog() {
         super(tr("Map Paint Styles"), "mapstyle", tr("configure the map painting style"),
-            Shortcut.registerShortcut("subwindow:mappaint", tr("Toggle: {0}", tr("MapPaint")),
-            KeyEvent.VK_M, Shortcut.ALT_SHIFT), 150);
+                Shortcut.registerShortcut("subwindow:mappaint", tr("Toggle: {0}", tr("MapPaint")),
+                        KeyEvent.VK_M, Shortcut.ALT_SHIFT), 150);
         build();
     }
@@ -144 +144 @@
 
         createLayout(p, true, Arrays.asList(new SideButton[] {
-                new SideButton(onoffAction),
-                new SideButton(upAction),
-                new SideButton(downAction),
-                new SideButton(new LaunchMapPaintPreferencesAction())
+                new SideButton(onoffAction, false),
+                new SideButton(upAction, false),
+                new SideButton(downAction, false),
+                new SideButton(new LaunchMapPaintPreferencesAction(), false)
         }));
     }
@@ -296 +296 @@
     protected class OnOffAction extends AbstractAction implements ListSelectionListener {
         public OnOffAction() {
+            putValue(NAME, tr("On/Off"));
             putValue(SHORT_DESCRIPTION, tr("Turn selected styles on or off"));
             putValue(SMALL_ICON, ImageProvider.get("apply"));
@@ -330 +331 @@
         public MoveUpDownAction(boolean isDown) {
             increment = isDown ? 1 : -1;
+            putValue(NAME, isDown?tr("Down"):tr("Up"));
             putValue(SMALL_ICON, isDown ? ImageProvider.get("dialogs", "down") : ImageProvider.get("dialogs", "up"));
             putValue(SHORT_DESCRIPTION, isDown ? tr("Move the selected entry one row down.") : tr("Move the selected entry one row up."));
@@ -362 +364 @@
     static class LaunchMapPaintPreferencesAction extends AbstractAction {
         public LaunchMapPaintPreferencesAction() {
+            putValue(NAME, tr("Preferences"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "mappaintpreference"));
         }

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

@@ -766 +766 @@
                 } else {
                     System.err.println("Button " + button + " doesn't have action defined");
+                    new Exception().printStackTrace();
                 }
             }