Changeset 15649 in josm for trunk/src/org

Timestamp:

2020-01-06T22:23:57+01:00 (6 years ago)

Author:

Don-vip

Message:

see #18514 - disable Window menu when empty

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ExpertToggleAction.java (modified) (1 diff)
• actions/mapmode/DrawAction.java (modified) (2 diffs)
• actions/mapmode/ExtrudeAction.java (modified) (2 diffs)
• gui/MainMenu.java (modified) (5 diffs)
• gui/WindowMenu.java (added)
• gui/dialogs/ToggleDialog.java (modified) (2 diffs)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (2 diffs)
• gui/help/HelpBrowser.java (modified) (2 diffs)
• tools/ListenerList.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java

@@ -95 +95 @@
 
     /**
+     * Determines if the given component tracks visibility changes.
+     * @param c The component.
+     * @return {@code true} if the given component tracks visibility changes
+     * @since 15649
+     */
+    public static synchronized boolean hasVisibilitySwitcher(Component c) {
+        if (c == null) return false;
+        return visibilityToggleListeners.containsListener(c);
+    }
+
+    /**
      * Constructs a new {@code ExpertToggleAction}.
      */

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -61 +61 @@
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.WindowMenu;
 import org.openstreetmap.josm.gui.draw.MapPath2D;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -194 +195 @@
             }
         }
-        return MainMenu.addWithCheckbox(MainApplication.getMenu().editMenu, snapChangeAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
+        return MainMenu.addWithCheckbox(MainApplication.getMenu().editMenu, snapChangeAction, WindowMenu.WINDOW_MENU_GROUP.VOLATILE);
     }
 

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -51 +51 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.WindowMenu;
 import org.openstreetmap.josm.gui.draw.MapViewPath;
 import org.openstreetmap.josm.gui.draw.SymbolShape;
@@ -251 +252 @@
             }
         }
-        return MainMenu.addWithCheckbox(MainApplication.getMenu().editMenu, dualAlignChangeAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
+        return MainMenu.addWithCheckbox(MainApplication.getMenu().editMenu, dualAlignChangeAction, WindowMenu.WINDOW_MENU_GROUP.VOLATILE);
     }
 

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -145 +145 @@
 public class MainMenu extends JMenuBar {
 
-    public enum WINDOW_MENU_GROUP { ALWAYS, TOGGLE_DIALOG, VOLATILE }
-
     /* File menu */
     /** File / New Layer **/
@@ -392 +390 @@
      * to use WINDOW_MENU_GROUP to determine the group integer.
      */
-    public final JMenu windowMenu = addMenu("Windows", /* I18N: mnemonic: W */ trc("menu", "Windows"), KeyEvent.VK_W, 11, ht("/ToggleDialogs"));
+    public final WindowMenu windowMenu = addMenu(new WindowMenu(), /* untranslated name */ "Windows", KeyEvent.VK_W, 11, ht("/ToggleDialogs"));
 
     /**
@@ -606 +604 @@
             boolean isEntryExpert, boolean isGroupSeparatorExpert) {
         int i = getInsertionIndexForGroup(menu, group.ordinal(), isGroupSeparatorExpert);
-        final JCheckBoxMenuItem mi = (JCheckBoxMenuItem) menu.add(new JCheckBoxMenuItem(action), i);
+        final JCheckBoxMenuItem mi = new JCheckBoxMenuItem(action);
         final KeyStroke ks = action.getShortcut().getKeyStroke();
         if (ks != null) {
@@ -614 +612 @@
             ExpertToggleAction.addVisibilitySwitcher(mi);
         }
-        return mi;
+        return (JCheckBoxMenuItem) menu.add(mi, i);
     }
 
@@ -857 +855 @@
         // -- changeset manager toggle action
         final JCheckBoxMenuItem mi = MainMenu.addWithCheckbox(windowMenu, changesetManager,
-                MainMenu.WINDOW_MENU_GROUP.ALWAYS, true, false);
+                WindowMenu.WINDOW_MENU_GROUP.ALWAYS, true, false);
         changesetManager.addButtonModel(mi.getModel());
 

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

@@ -54 +54 @@
 import org.openstreetmap.josm.gui.ShowHideButtonListener;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.WindowMenu;
 import org.openstreetmap.josm.gui.dialogs.DialogsPanel.Action;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -266 +267 @@
         windowMenuItem = MainMenu.addWithCheckbox(MainApplication.getMenu().windowMenu,
                 (JosmAction) getToggleAction(),
-                MainMenu.WINDOW_MENU_GROUP.TOGGLE_DIALOG, false, true);
+                WindowMenu.WINDOW_MENU_GROUP.TOGGLE_DIALOG, false, true);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -60 +60 @@
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.ScrollViewport;
+import org.openstreetmap.josm.gui.WindowMenu;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.AbstractRelationEditorAction;
@@ -765 +766 @@
         };
         focusAction.putValue("relationEditor", re);
-        return MainMenu.add(MainApplication.getMenu().windowMenu, focusAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
+        return MainMenu.add(MainApplication.getMenu().windowMenu, focusAction, WindowMenu.WINDOW_MENU_GROUP.VOLATILE);
     }
 

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -37 +37 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
+import org.openstreetmap.josm.gui.WindowMenu;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
@@ -214 +215 @@
             }
             if (windowMenuItem == null && visible) {
-                windowMenuItem = MainMenu.add(menu.windowMenu, FOCUS_ACTION, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
+                windowMenuItem = MainMenu.add(menu.windowMenu, FOCUS_ACTION, WindowMenu.WINDOW_MENU_GROUP.VOLATILE);
             }
         }

trunk/src/org/openstreetmap/josm/tools/ListenerList.java

@@ -113 +113 @@
     }
 
-    private boolean containsListener(T listener) {
+    /**
+     * Determines if this listener list contains the given listener.
+     * @param listener listener to find
+     * @return {@code true} is the listener is known
+     * @since 15649
+     */
+    public synchronized boolean containsListener(T listener) {
         return listeners.contains(listener) || weakListeners.contains(new WeakListener<>(listener));
     }