Changeset 15582 in josm

Timestamp:

2019-12-11T01:40:30+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18381 - Don't require a restart when a Tagging Preset is added/removed (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/map/TaggingPresetPreference.java (modified) (2 diffs)
• tagging/presets/TaggingPresets.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
@@ -247 +248 @@
     @Override
     public boolean ok() {
-        boolean restart = Config.getPref().putBoolean("taggingpreset.sortmenu", sortMenu.getSelectedObjects() != null);
-        restart |= sources.finish();
-
-        return restart;
+        if (sources.finish()
+                || Config.getPref().putBoolean("taggingpreset.sortmenu", sortMenu.getSelectedObjects() != null)) {
+            TaggingPresets.destroy();
+            TaggingPresets.initialize();
+        }
+
+        return false;
     }
 

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

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MenuScroller;
+import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.gui.tagging.presets.items.CheckGroup;
 import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
@@ -99 +100 @@
             TaggingPresetMenu.sortMenu(MainApplication.getMenu().presetsMenu);
         }
+        listeners.forEach(TaggingPresetListener::taggingPresetsModified);
+    }
+
+    // Cannot implement Destroyable since this is static
+    /**
+     * Call to deconstruct the TaggingPresets menus and other information so that it
+     * can be rebuilt later.
+     *
+     * @since 15582
+     */
+    public static void destroy() {
+        ToolbarPreferences toolBar = MainApplication.getToolbar();
+        taggingPresets.forEach(toolBar::unregister);
+        taggingPresets.clear();
+        PRESET_TAG_CACHE.clear();
+        PRESET_ROLE_CACHE.clear();
+        MainApplication.getMenu().presetsMenu.removeAll();
+        listeners.forEach(TaggingPresetListener::taggingPresetsModified);
     }
 
@@ -202 +221 @@
     public static void addTaggingPresets(Collection<TaggingPreset> presets) {
         if (presets != null && taggingPresets.addAll(presets)) {
-            for (TaggingPresetListener listener : listeners) {
-                listener.taggingPresetsModified();
-            }
+            listeners.forEach(TaggingPresetListener::taggingPresetsModified);
         }
     }