Changeset 15633 in josm for trunk/src/org/openstreetmap/josm/gui/MapFrame.java

Timestamp:

2020-01-05T16:36:31+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18514 - make all changeset actions and dialogs only accessible in expert mode

File:

• trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified) (2 diffs)

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

@@ -44 +44 @@
 import javax.swing.plaf.basic.BasicSplitPaneUI;
 
+import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.mapmode.DeleteAction;
 import org.openstreetmap.josm.actions.mapmode.DrawAction;
@@ -671 +672 @@
             JPopupMenu menu = new JPopupMenu();
             for (HideableButton b : buttons) {
-                final HideableButton t = b;
-                menu.add(new JCheckBoxMenuItem(new AbstractAction() {
-                    {
-                        putValue(NAME, t.getActionName());
-                        putValue(SMALL_ICON, t.getIcon());
-                        putValue(SELECTED_KEY, t.isButtonVisible());
-                        putValue(SHORT_DESCRIPTION, tr("Hide or show this toggle button"));
-                    }
-
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        if ((Boolean) getValue(SELECTED_KEY)) {
-                            t.showButton();
-                        } else {
-                            t.hideButton();
+                if (!b.isExpert() || ExpertToggleAction.isExpert()) {
+                    final HideableButton t = b;
+                    menu.add(new JCheckBoxMenuItem(new AbstractAction() {
+                        {
+                            putValue(NAME, t.getActionName());
+                            putValue(SMALL_ICON, t.getIcon());
+                            putValue(SELECTED_KEY, t.isButtonVisible());
+                            putValue(SHORT_DESCRIPTION, tr("Hide or show this toggle button"));
                         }
-                        validateToolBarsVisibility();
-                    }
-                }));
+
+                        @Override
+                        public void actionPerformed(ActionEvent e) {
+                            if ((Boolean) getValue(SELECTED_KEY)) {
+                                t.showButton();
+                            } else {
+                                t.hideButton();
+                            }
+                            validateToolBarsVisibility();
+                        }
+                    }));
+                }
             }
             if (button != null && button.isShowing()) {