Changeset 15958 in josm

Timestamp:

2020-02-29T00:28:12+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18806 - see #18381 - fix tagging presets menu initialization (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainMenu.java (modified) (2 diffs)
• tagging/presets/TaggingPresets.java (modified) (5 diffs)

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

@@ -129 +129 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintMenu;
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSearchPrimitiveDialog;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -839 +838 @@
         ExpertToggleAction.getInstance().addButtonModel(expertItem.getModel());
 
-        add(presetsMenu, presetSearchAction);
-        add(presetsMenu, presetSearchPrimitiveAction);
-        add(presetsMenu, PreferencesAction.forPreferenceSubTab(tr("Preset preferences"),
-                tr("Click to open the tagging presets tab in the preferences"), TaggingPresetPreference.class));
-        presetsMenu.addSeparator();
-
         add(imageryMenu, reorderImageryLayersAction);
         add(imageryMenu, PreferencesAction.forPreferenceTab(tr("Imagery preferences..."),

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.tagging.presets;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
@@ -14 +16 @@
 import javax.swing.JSeparator;
 
+import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MenuScroller;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
+import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.presets.items.CheckGroup;
 import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
@@ -61 +66 @@
      */
     public static void initialize() {
+        MainMenu mainMenu = MainApplication.getMenu();
+        JMenu presetsMenu = mainMenu.presetsMenu;
+        if (presetsMenu.getComponentCount() == 0) {
+            MainMenu.add(presetsMenu, mainMenu.presetSearchAction);
+            MainMenu.add(presetsMenu, mainMenu.presetSearchPrimitiveAction);
+            MainMenu.add(presetsMenu, PreferencesAction.forPreferenceSubTab(tr("Preset preferences"),
+                    tr("Click to open the tagging presets tab in the preferences"), TaggingPresetPreference.class));
+            presetsMenu.addSeparator();
+        }
+
         readFromPreferences();
         for (TaggingPreset tp: taggingPresets) {
@@ -68 +83 @@
         }
         if (taggingPresets.isEmpty()) {
-            MainApplication.getMenu().presetsMenu.setVisible(false);
+            presetsMenu.setVisible(false);
         } else {
             Map<TaggingPresetMenu, JMenu> submenus = new HashMap<>();
             for (final TaggingPreset p : taggingPresets) {
-                JMenu m = p.group != null ? submenus.get(p.group) : MainApplication.getMenu().presetsMenu;
+                JMenu m = p.group != null ? submenus.get(p.group) : presetsMenu;
                 if (m == null && p.group != null) {
                     Logging.error("No tagging preset submenu for " + p.group);
@@ -98 +113 @@
         }
         if (Config.getPref().getBoolean("taggingpreset.sortmenu")) {
-            TaggingPresetMenu.sortMenu(MainApplication.getMenu().presetsMenu);
+            TaggingPresetMenu.sortMenu(presetsMenu);
         }
         listeners.forEach(TaggingPresetListener::taggingPresetsModified);