Changeset 1971 in josm

Timestamp:

Aug 12, 2009 6:01:22 PM (4 years ago)

Author:

stoecker

Message:

improved custom style selection box

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/ElemStyles.java (modified) (1 diff)
• preferences/MapPaintPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -294 +294 @@
         return getStyleSet(null, false);
     }
+
+    public Collection<String> getStyleNames()
+    {
+        return styleSet.keySet();
+    }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java

@@ -5 +5 @@
 
 import java.awt.GridBagLayout;
+import java.util.Collection;
+import java.util.TreeSet;
 
 import javax.swing.BorderFactory;
@@ -35 +37 @@
                 Main.pref.getBoolean("mappaint.icon.enable-defaults", true));
 
-        styleCombo.addItem("standard");
-
         sources = new StyleSources("mappaint.style.sources", "mappaint.icon.sources",
         "http://josm.openstreetmap.de/styles", false, tr("Map Paint Styles"));
 
-        String style = Main.pref.get("mappaint.style", "standard");
-        if(!style.equals("standard"))
+        Collection<String> styles = new TreeSet<String>(MapPaintStyles.getStyles().getStyleNames());
+        String defstyle = Main.pref.get("mappaint.style", "standard");
+        styles.add(defstyle);
+        for(String style : styles)
             styleCombo.addItem(style);
 
         styleCombo.setEditable(true);
         for (int i = 0; i < styleCombo.getItemCount(); ++i) {
-            if (((String)styleCombo.getItemAt(i)).equals(style)) {
+            if (((String)styleCombo.getItemAt(i)).equals(defstyle)) {
                 styleCombo.setSelectedIndex(i);
                 break;