Changeset 12542 in josm for trunk/src/org/openstreetmap/josm/gui/tagging

Timestamp:

2017-07-30T17:07:42+02:00 (7 years ago)

Author:

Don-vip

Message:

partial revert of r12537

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java (modified) (8 diffs)

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

@@ -31 +31 @@
 
     /** The collection of tagging presets */
-    private static final Collection<TaggingPreset> TAGGING_PRESETS = new ArrayList<>();
+    private static final Collection<TaggingPreset> taggingPresets = new ArrayList<>();
 
     /** cache for key/value pairs found in the preset */
@@ -39 +39 @@
 
     /** The collection of listeners */
-    private static final Collection<TaggingPresetListener> LISTENERS = new ArrayList<>();
+    private static final Collection<TaggingPresetListener> listeners = new ArrayList<>();
 
     private TaggingPresets() {
@@ -49 +49 @@
      */
     public static void readFromPreferences() {
-        TAGGING_PRESETS.clear();
-        TAGGING_PRESETS.addAll(TaggingPresetReader.readFromPreferences(false, false));
-        cachePresets(TAGGING_PRESETS);
+        taggingPresets.clear();
+        taggingPresets.addAll(TaggingPresetReader.readFromPreferences(false, false));
+        cachePresets(taggingPresets);
     }
 
@@ -59 +59 @@
     public static void initialize() {
         readFromPreferences();
-        for (TaggingPreset tp: TAGGING_PRESETS) {
+        for (TaggingPreset tp: taggingPresets) {
             if (!(tp instanceof TaggingPresetSeparator)) {
                 Main.toolbar.register(tp);
             }
         }
-        if (TAGGING_PRESETS.isEmpty()) {
+        if (taggingPresets.isEmpty()) {
             Main.main.menu.presetsMenu.setVisible(false);
         } else {
             Map<TaggingPresetMenu, JMenu> submenus = new HashMap<>();
-            for (final TaggingPreset p : TAGGING_PRESETS) {
+            for (final TaggingPreset p : taggingPresets) {
                 JMenu m = p.group != null ? submenus.get(p.group) : Main.main.menu.presetsMenu;
                 if (m == null && p.group != null) {
@@ -136 +136 @@
      */
     public static Collection<TaggingPreset> getTaggingPresets() {
-        return Collections.unmodifiableCollection(TAGGING_PRESETS);
+        return Collections.unmodifiableCollection(taggingPresets);
     }
 
@@ -199 +199 @@
      */
     public static void addTaggingPresets(Collection<TaggingPreset> presets) {
-        if (presets != null && TAGGING_PRESETS.addAll(presets)) {
-            for (TaggingPresetListener listener : LISTENERS) {
+        if (presets != null && taggingPresets.addAll(presets)) {
+            for (TaggingPresetListener listener : listeners) {
                 listener.taggingPresetsModified();
             }
@@ -212 +212 @@
     public static void addListener(TaggingPresetListener listener) {
         if (listener != null) {
-            LISTENERS.add(listener);
+            listeners.add(listener);
         }
     }
@@ -222 +222 @@
     public static void removeListener(TaggingPresetListener listener) {
         if (listener != null) {
-            LISTENERS.remove(listener);
+            listeners.remove(listener);
         }
     }