Changeset 12542 in josm for trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

Timestamp:

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

Author:

Don-vip

Message:

partial revert of r12537

File:

• trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified) (7 diffs)

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

@@ -53 +53 @@
     private static DefaultNameFormatter instance;
 
-    private static final List<NameFormatterHook> FORMAT_HOOKS = new LinkedList<>();
+    private static final List<NameFormatterHook> formatHooks = new LinkedList<>();
 
     /**
@@ -75 +75 @@
     public static void registerFormatHook(NameFormatterHook hook) {
         if (hook == null) return;
-        if (!FORMAT_HOOKS.contains(hook)) {
-            FORMAT_HOOKS.add(0, hook);
+        if (!formatHooks.contains(hook)) {
+            formatHooks.add(0, hook);
         }
     }
@@ -87 +87 @@
     public static void unregisterFormatHook(NameFormatterHook hook) {
         if (hook == null) return;
-        if (FORMAT_HOOKS.contains(hook)) {
-            FORMAT_HOOKS.remove(hook);
+        if (formatHooks.contains(hook)) {
+            formatHooks.remove(hook);
         }
     }
@@ -203 +203 @@
 
         String result = name.toString();
-        for (NameFormatterHook hook: FORMAT_HOOKS) {
+        for (NameFormatterHook hook: formatHooks) {
             String hookResult = hook.checkFormat(node, result);
             if (hookResult != null)
@@ -295 +295 @@
 
         String result = name.toString();
-        for (NameFormatterHook hook: FORMAT_HOOKS) {
+        for (NameFormatterHook hook: formatHooks) {
             String hookResult = hook.checkFormat(way, result);
             if (hookResult != null)
@@ -333 +333 @@
 
         String result = name.toString();
-        for (NameFormatterHook hook: FORMAT_HOOKS) {
+        for (NameFormatterHook hook: formatHooks) {
             String hookResult = hook.checkFormat(relation, result);
             if (hookResult != null)
@@ -430 +430 @@
         }
 
-        for (NameFormatterHook hook: FORMAT_HOOKS) {
+        for (NameFormatterHook hook: formatHooks) {
             String hookResult = hook.checkRelationTypeName(relation, name);
             if (hookResult != null)