Changeset 1439 in josm for trunk/src/org

Timestamp:

2009-02-24T18:23:53+01:00 (15 years ago)

Author:

stoecker

Message:

fixed #2232

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (1 diff)
• osm/Relation.java (modified) (3 diffs)
• osm/visitor/MapPaintVisitor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -479 +479 @@
     synchronized public Collection<String> getCollection(String key, Collection<String> def) {
         String s = get(key);
+        if(def != null)
+        {
+            String d = null;
+            for(String a : def)
+            {
+                if(d != null)
+                    d += ";" + a;
+                else
+                    d = a;
+            }
+            putDefault(key, d);
+        }
         if(s != null && s.length() != 0)
            return Arrays.asList(s.split(";"));

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.Main;
 
 /**
@@ -21 +24 @@
      */
     public final List<RelationMember> members = new ArrayList<RelationMember>();
+
+    final static String[] defnames = {"name", "ref", "restriction", "note"};
+    static Collection<String> names = null;
 
     @Override public void visit(Visitor visitor) {
@@ -82 +88 @@
 
             name += " (";
-            String nameTag = get("name");
-            if (nameTag == null) nameTag = get("ref");
-            if (nameTag == null) nameTag = get("note");
-            if (nameTag != null) name += "\"" + nameTag + "\", ";
+            if(names == null)
+              names = Main.pref.getCollection("relation.nameOrder", Arrays.asList(defnames));
+            String nameTag = null;
+            for (String n : names) {
+                nameTag = get(n);
+                if (nameTag != null) break;
+            }
+            if (nameTag != null)
+                name += "\"" + nameTag + "\", ";
+
             int mbno = members.size();
             name += trn("{0} member", "{0} members", mbno, mbno) + ")";

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -16 +16 @@
 import java.awt.Stroke;
 import java.awt.geom.GeneralPath;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -64 +65 @@
     protected double circum;
     protected double dist;
-    protected String regionalNameOrder[];
+    protected Collection<String> regionalNameOrder;
     protected Boolean selectedCall;
     protected Boolean useStyleCache;
@@ -1094 +1095 @@
         String name = null;
         if (n.keys != null) {
-            for (int i = 0; i < regionalNameOrder.length; i++) {
-                name = n.keys.get(regionalNameOrder[i]);
+            for (String rn : regionalNameOrder) {
+                name = n.keys.get(rn);
                 if (name != null) break;
             }
@@ -1244 +1245 @@
         leftHandTraffic = Main.pref.getBoolean("mappaint.lefthandtraffic",false);
         orderFont = new Font(Main.pref.get("mappaint.font","Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
-        String currentLocale = Locale.getDefault().getLanguage();
-        regionalNameOrder = Main.pref.get("mappaint.nameOrder", "name:"+currentLocale+";name;int_name;ref;operator;brand").split(";");
+        String[] names = {"name:"+Main.getLanguageCode(), "name", "int_name", "ref", "operator", "brand"};
+        regionalNameOrder = Main.pref.getCollection("mappaint.nameOrder", Arrays.asList(names));
         minEN = nc.getEastNorth(0,nc.getHeight()-1);
         maxEN = nc.getEastNorth(nc.getWidth()-1,0);