Changeset 504 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2007-12-31T17:49:15+01:00 (17 years ago)

Author:

gebner

Message:

Don't do hacky string mangling to get a URL from a File.

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -9 +9 @@
 import java.io.InputStream;
 import java.net.URL;
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -84 +85 @@
                                 String classPath = attr.getValue(Attributes.Name.CLASS_PATH);
                                 if (classPath != null) {
-                                        String[] cp = classPath.split(" ");
-                                        StringBuilder entry = new StringBuilder();
-                                        for (String s : cp) {
-                                                entry.append(s);
-                                                if (s.endsWith("\\")) {
-                                                        entry.setLength(entry.length()-1);
-                                                        entry.append("%20"); // append the split character " " as html-encode
-                                                        continue;
+                                        for (String entry : classPath.split(" ")) {
+                                                File entryFile;
+                                                if (new File(entry).isAbsolute()) {
+                                                        entryFile = new File(entry);
+                                                } else {
+                                                        entryFile = new File(file.getParent(), entry);
                                                 }
-                                                s = entry.toString();
-                                                entry = new StringBuilder();
-                                                if (!s.startsWith("/") && !s.startsWith("\\") && !s.matches("^.\\:") && file != null)
-                                                        s = file.getParent() + File.separator + s;
-                                                libraries.add(new URL(getURLString(s)));
+
+                                                libraries.add(fileToURL(entryFile));
                                         }
                                 }
@@ -112 +108 @@
                         }
                         if (file != null)
-                                libraries.add(0, new URL(getURLString(file.getAbsolutePath())));
+                                libraries.add(0, fileToURL(file));
 
                         if (jar != null)
@@ -147 +143 @@
         }
 
-        public static String getURLString(String fileName) {
-                if (System.getProperty("os.name").startsWith("Windows"))
-                        return "file:/"+fileName;
-                return "file://"+fileName;
+        public static URL fileToURL(File f) {
+                try {
+                        return f.toURI().toURL();
+                } catch (MalformedURLException ex) {
+                        return null;
+                }
         }