Changeset 790 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java

Timestamp:

2008-08-16T00:12:09+02:00 (16 years ago)

Author:

stoecker

Message:

some cleanup in mappaint and presets

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) (3 diffs)

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

@@ -87 +87 @@
                                 for (int count=0; count<atts.getLength(); count++) {
                                         if (atts.getQName(count).equals("src")) {
-                                                String imageFile = MapPaintStyles.getStyleDir()+"icons/"+atts.getValue(count); 
+                                                String imageFile = MapPaintStyles.getImageDir()+atts.getValue(count); 
                                                 File f = new File(imageFile);
                                                 if (f.exists()) {
@@ -94 +94 @@
                                                 } else {
                                                         try {
-                                                                URL path = getClass().getResource("/styles/standard/icons/"+atts.getValue(count));
+                                                                URL path = getClass().getResource(MapPaintStyles.getImageDir()+atts.getValue(count));
                                                                 if (path == null) {
                                                                         /* icon not found, using default */
                                                                         System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
-                                                                        path = getClass().getResource("/styles/standard/icons/misc/no_icon.png");
+                                                                        path = getClass().getResource(MapPaintStyles.getImageDir()+"misc/no_icon.png");
                                                                         curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
                                                                 } else {
@@ -105 +105 @@
                                                         }
                                                         catch (Exception e){
-                                                                URL path = getClass().getResource("/styles/standard/icons/amenity.png");
+                                                                URL path = getClass().getResource(MapPaintStyles.getImageDir()+"incomming/amenity.png");
                                                                 curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
                                                         }