Changeset 3587 in osm for applications/editors/josm

Timestamp:

2007-07-14T21:03:50+02:00 (18 years ago)

Author:

ulf

Message:

bugfix: getPluginDir() is deprecated and in fact doesn't work with current josm versions (it returns the path of the latest loaded plugin, which is often wrong). So external styles are not found.

I've replaced getPluginDir() with the now recommended: "Main.pref.getPreferencesDir()+"plugins/mappaint/""

In addition, I've also added a warning message, if loading of the style failed. When I first started to experiment with the styles, it drove me mad not to get this information ;-)

File:

• applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintPlugin.java

@@ -27 +27 @@
         public MapPaintPlugin() {
                 String styleName = Main.pref.get("mappaint.style", "standard");
-                styleDir = getPluginDir()+styleName+"/"; //some day we will support diferent icon directories over options
+                styleDir = Main.pref.getPreferencesDir()+"plugins/mappaint/"+styleName+"/"; //some day we will support different icon directories over options
                 String elemStylesFile = getStyleDir()+"elemstyles.xml";
+                
+                // System.out.println("mappaint: Using style: " + styleName);
+                // System.out.println("mappaint: Using style dir: " + styleDir);
+                // System.out.println("mappaint: Using style file: " + elemStylesFile);
+                
                 File f = new File(elemStylesFile);
                 if (f.exists())
                 {
-                        try
+                        try     // reading file from file system
                         {
+                                // System.out.println("mappaint: Using style file: \"" + f + "\"");
                                 XMLReader xmlReader = XMLReaderFactory.createXMLReader();
                                 ElemStyleHandler handler = new ElemStyleHandler();
@@ -47 +53 @@
                         }
                 } 
-                else{ //use the standart elemstyle of this style 
+                else{   // reading the builtin file from the plugin jar file
                         URL elemStylesPath = getClass().getResource("/"+styleName+"/elemstyles.xml");
+                        
+                        // System.out.println("mappaint: Using jar's elemstyles.xml: \"" + elemStylesPath + "\"");
                         if (elemStylesPath != null)
                         {
@@ -65 +73 @@
                                         throw new RuntimeException(e);
                                 }
-                        } 
+                        } else {
+                                System.out.println("mappaint: Couldn't find style: \"" + styleDir + "\"elemstyles.xml");
+                        }
                 }
         }