Changeset 15650 in josm for trunk

Timestamp:

2020-01-06T22:35:31+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18514 - display changeset toggle dialog entry in the window menu only in expert mode

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityActionTest.java (modified) (1 diff)

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

@@ -252 +252 @@
                 null, /* no keyboard shortcut */
                 200, /* the preferred height */
-                false /* don't show if there is no preference */
+                false, /* don't show if there is no preference */
+                null /* no preferences settings */,
+                true /* expert only */
         );
         build();

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

@@ -231 +231 @@
     public ToggleDialog(String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight, boolean defShow,
             Class<? extends PreferenceSetting> prefClass) {
+        this(name, iconName, tooltip, shortcut, preferredHeight, defShow, prefClass, false);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param name  the name of the dialog
+     * @param iconName the name of the icon to be displayed
+     * @param tooltip  the tool tip
+     * @param shortcut  the shortcut
+     * @param preferredHeight the preferred height for the dialog
+     * @param defShow if the dialog should be shown by default, if there is no preference
+     * @param prefClass the preferences settings class, or null if not applicable
+     * @param isExpert {@code true} if this dialog should only be displayed in expert mode
+     * @since 15650
+     */
+    public ToggleDialog(String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight, boolean defShow,
+            Class<? extends PreferenceSetting> prefClass, boolean isExpert) {
         super(new BorderLayout());
         this.preferencePrefix = iconName;
@@ -257 +275 @@
         Config.getPref().addPreferenceChangeListener(this);
 
-        registerInWindowMenu();
+        registerInWindowMenu(isExpert);
     }
 
     /**
      * Registers this dialog in the window menu. Called in the constructor.
-     * @since 10467
-     */
-    protected void registerInWindowMenu() {
+     * @param isExpert {@code true} if this dialog should only be displayed in expert mode
+     * @since 15650
+     */
+    protected void registerInWindowMenu(boolean isExpert) {
         windowMenuItem = MainMenu.addWithCheckbox(MainApplication.getMenu().windowMenu,
                 (JosmAction) getToggleAction(),
-                WindowMenu.WINDOW_MENU_GROUP.TOGGLE_DIALOG, false, true);
+                WindowMenu.WINDOW_MENU_GROUP.TOGGLE_DIALOG, isExpert, true);
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityActionTest.java

@@ -36 +36 @@
         LayerListModel model = new LayerListDialog(MainApplication.getLayerManager()) {
             @Override
-            protected void registerInWindowMenu() {
+            protected void registerInWindowMenu(boolean isExpert) {
                 // ignore
             }