Changeset 851 in josm for trunk/src/org/openstreetmap

Timestamp:

2008-08-23T22:17:49+02:00 (16 years ago)

Author:

stoecker

Message:

fixed style acces in case of external mappaint styles

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (2 diffs)

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

@@ -38 +38 @@
 
                 String styleName = Main.pref.get("mappaint.style", "standard");
+                // fallback to standard name for internal case, as we only have one internal style
+                String internalStyleName = "standard";
                 styleDir = Main.pref.get("mappaint.styledir", Main.pref.getPreferencesDir()+"plugins/mappaint/"+styleName+"/");
                 String elemStylesFile = getStyleDir()+"elemstyles.xml";
                 imageDir = styleDir+"icons/";
+                internalImageDir = "/images/styles/"+internalStyleName+"/";
 
 //              System.out.println("mappaint: Using style: " + styleName);
@@ -65 +68 @@
                 } 
                 else {// reading the builtin file from the plugin jar file
-                        URL elemStylesPath = Main.class.getResource("/styles/"+styleName+"/elemstyles.xml");
+                        URL elemStylesPath = Main.class.getResource("/styles/"+internalStyleName+"/elemstyles.xml");
 
 //                      System.out.println("mappaint: Using jar's elemstyles.xml: \"" + elemStylesPath + "\"");
                         if (elemStylesPath != null)
                         {
-                                internalImageDir = "/images/styles/"+styleName+"/";
                                 isInternal = true;
                                 try