Changeset 1241 in josm for trunk

Timestamp:

2009-01-11T12:00:48+01:00 (16 years ago)

Author:

stoecker

Message:

moved style name into style file

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/preferences/ColorPreference.java (modified) (3 diffs)
• styles/standard/elemstyles.xml (modified) (1 diff)

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

@@ -73 +73 @@
             if (qName.equals("rule"))
                 inRule=true;
+            else if (qName.equals("rules"))
+            {
+                if(styleName == null)
+                {
+                    String n = atts.getValue("name");
+                    if(n == null) n = "standard";
+                    styleName = n;
+                }
+            }
             else if (qName.equals("scale_max"))
                 inScaleMax = true;

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

@@ -50 +50 @@
     public static void readFromPreferences() {
         String[] a = null;
-        
+
         /* don't prefix icon path, as it should be generic */
         String internalicon = "resource://images/styles/standard/;resource://images/styles/";
-        String internalfile = "standard=resource://styles/standard/elemstyles.xml";
+        String internalfile = "resource://styles/standard/elemstyles.xml";
 
         iconDirs = Main.pref.get("mappaint.icon.sources");
@@ -70 +70 @@
                     a = fileset.split("=", 2);
                 else
-                    a = new String[] {"standard", fileset};
+                    a = new String[] {null, fileset};
                 XMLReader xmlReader = XMLReaderFactory.createXMLReader();
                 ElemStyleHandler handler = new ElemStyleHandler(a[0]);

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

@@ -11 +11 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -67 +69 @@
         // fill model with colors:
         List<String> colorKeyList = new ArrayList<String>();
+        List<String> colorKeyList_mappaint = new ArrayList<String>();
         for(String key : colorMap.keySet()) {
-            colorKeyList.add(key);
+            if(key.startsWith("mappaint."))
+                colorKeyList_mappaint.add(key);
+            else
+                colorKeyList.add(key);
         }
         Collections.sort(colorKeyList);
+        Collections.sort(colorKeyList_mappaint);
+        colorKeyList.addAll(colorKeyList_mappaint);
         for (String key : colorKeyList) {
             Vector<Object> row = new Vector<Object>(2);
@@ -117 +125 @@
                     return l;
                 }
-                return oldColorsRenderer.getTableCellRendererComponent(t,tr(o.toString()),selected,focus,row,column);
+                return oldColorsRenderer.getTableCellRendererComponent(t,getName(o.toString()),selected,focus,row,column);
+            }
+            private String getName(String o)
+            {
+                try
+                {
+                    Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o);
+                    m.matches();
+                    return tr("Paint style {0}: {1}", m.group(1), m.group(2));
+                }
+                catch (Exception e) {}
+                return tr(o);
             }
         });

trunk/styles/standard/elemstyles.xml

@@ -45 +45 @@
 -->
 
-<rules>
+<rules name="standard">
 
         <!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->