Changeset 1439 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor

Timestamp:

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

Author:

stoecker

Message:

fixed #2232

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (4 diffs)

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);