Changeset 3886 in josm for trunk

Timestamp:

2011-02-10T12:15:36+01:00 (14 years ago)

Author:

bastiK

Message:

mappaint: find images relative to the source file

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/MapPaintStyles.java (modified) (1 diff)
• preferences/SourceEntry.java (modified) (2 diffs)

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

@@ -77 +77 @@
                 dirs.add(a[1]);
             }
+        }
+        String sourceDir = ref.source.getLocalSourceDir();
+        if (sourceDir != null) {
+            dirs.add(sourceDir);
         }
         ImageIcon i = ImageProvider.getIfAvailable(dirs, "mappaint."+styleName, null, ref.iconName, ref.source.zipIcons, sanitize);

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences;
 
+import java.io.File;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -122 +123 @@
         return true;
     }
+
+    public String getLocalSourceDir() {
+        if (!isLocal())
+            return null;
+        File f = new File(url);
+        File dir = f.getParentFile();
+        if (dir == null)
+            return null;
+        return dir.getPath();
+    }
 }