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

Timestamp:

2014-01-03T19:32:18+01:00 (11 years ago)

Author:

Don-vip

Message:

fix compilation warnings + minor code refactorization

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• Plugin.java (modified) (1 diff)
• PluginHandler.java (modified) (1 diff)
• PluginInformation.java (modified) (6 diffs)

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

@@ -144 +144 @@
         File pluginDir = Main.pref.getPluginsDirectory();
         File pluginJar = new File(pluginDir, info.name + ".jar");
-        final URL pluginJarUrl = PluginInformation.fileToURL(pluginJar);
+        final URL pluginJarUrl = Utils.fileToURL(pluginJar);
         return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
               public ClassLoader run() {

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

@@ -527 +527 @@
             File pluginJar = new File(pluginDir, info.name + ".jar");
             I18n.addTexts(pluginJar);
-            URL pluginJarUrl = PluginInformation.fileToURL(pluginJar);
+            URL pluginJarUrl = Utils.fileToURL(pluginJar);
             allPluginLibraries.add(pluginJarUrl);
         }

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

@@ -99 +99 @@
                 throw new PluginException(name, tr("The plugin file ''{0}'' does not include a Manifest.", file.toString()));
             scanManifest(manifest, false);
-            libraries.add(0, fileToURL(file));
+            libraries.add(0, Utils.fileToURL(file));
         } catch (IOException e) {
             throw new PluginException(name, e);
@@ -206 +206 @@
             }
         } else {
-            //noinspection NullArgumentToVariableArgMethod
-            s = MessageFormat.format(s, null);
+            s = MessageFormat.format(s, (Object[]) null);
         }
         description = s;
@@ -263 +262 @@
                 }
 
-                libraries.add(fileToURL(entryFile));
+                libraries.add(Utils.fileToURL(entryFile));
             }
         }
@@ -333 +332 @@
     }
 
-    public static URL fileToURL(File f) {
-        try {
-            return f.toURI().toURL();
-        } catch (MalformedURLException ex) {
-            return null;
-        }
-    }
+
 
     /**
@@ -395 +388 @@
     }
 
+    /**
+     * Returns all possible plugin locations.
+     * @return all possible plugin locations.
+     */
     public static Collection<String> getPluginLocations() {
         Collection<String> locations = Main.pref.getAllPossiblePreferenceDirs();
@@ -462 +459 @@
 
     /**
-     * Replies the name of the plugin
+     * Replies the name of the plugin.
+     * @return The plugin name
      */
     public String getName() {