Changeset 4209 in josm

Timestamp:

Jul 7, 2011 11:10:48 AM (23 months ago)

Author:

bastiK

Message:

#6535 - Allow plugins to modify default name formatter (patch by Don-vip)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• DefaultNameFormatter.java (modified) (7 diffs)
• NameFormatterHook.java (added)
• OsmPrimitivRenderer.java (modified) (1 diff)

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

@@ -12 +12 @@
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -43 +44 @@
     static private DefaultNameFormatter instance;
 
+    private static final LinkedList<NameFormatterHook> formatHooks = new LinkedList<NameFormatterHook>();
+
     /**
      * Replies the unique instance of this formatter
@@ -53 +56 @@
         }
         return instance;
+    }
+    
+    /**
+     * Registers a format hook. Adds the hook at the first position of the format hooks.
+     * (for plugins)
+     *
+     * @param hook the format hook. Ignored if null.
+     */
+    public static void registerFormatHook(NameFormatterHook hook) {
+        if (hook == null) return;
+        if (!formatHooks.contains(hook)) {
+            formatHooks.add(0,hook);
+        }
+    }
+
+    /**
+     * Unregisters a format hook. Removes the hook from the list of format hooks.
+     *
+     * @param hook the format hook. Ignored if null.
+     */
+    public static void unregisterFormatHook(NameFormatterHook hook) {
+        if (hook == null) return;
+        if (formatHooks.contains(hook)) {
+            formatHooks.remove(hook);
+        }
     }
 
@@ -141 +169 @@
         }
         name = decorateNameWithId(name, node);
+
+        for (NameFormatterHook hook: formatHooks) {
+            String hookResult = hook.checkFormat(node, name);
+            if (hookResult != null) {
+                return hookResult;
+            }
+        }
+
         return name;
     }
@@ -217 +253 @@
         }
         name = decorateNameWithId(name, way);
+        
+        for (NameFormatterHook hook: formatHooks) {
+            String hookResult = hook.checkFormat(way, name);
+            if (hookResult != null) {
+                return hookResult;
+            }
+        }
+
         return name;
     }
@@ -264 +308 @@
         }
         name = decorateNameWithId(name, relation);
+
+        for (NameFormatterHook hook: formatHooks) {
+            String hookResult = hook.checkFormat(relation, name);
+            if (hookResult != null) {
+                return hookResult;
+            }
+        }
+
         return name;
     }
@@ -355 +407 @@
         if (admin_level != null) {
             name += "["+admin_level+"]";
+        }
+        
+        for (NameFormatterHook hook: formatHooks) {
+            String hookResult = hook.checkRelationTypeName(relation, name);
+            if (hookResult != null) {
+                return hookResult;
+            }
         }
 

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

@@ -25 +25 @@
  */
 public class OsmPrimitivRenderer implements ListCellRenderer, TableCellRenderer {
-    private DefaultNameFormatter formatter = new DefaultNameFormatter();
+    private DefaultNameFormatter formatter = DefaultNameFormatter.getInstance();
 
     /**