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

Timestamp:

2008-08-26T22:35:52+02:00 (16 years ago)

Author:

stoecker

Message:

cleanups in plugin handling

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• Plugin.java (modified) (1 diff)
• PluginDownloader.java (modified) (5 diffs)
• PluginInformation.java (modified) (1 diff)

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

@@ -53 +53 @@
          */
         public final String getPluginDir() {
-                return Main.pref.getPreferencesDir()+"plugins/"+info.name+"/";
+                return new File(Main.pref.getPluginsDirFile(), info.name).getPath();
         }
 

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

@@ -13 +13 @@
 import java.io.FileOutputStream;
 import java.io.FileWriter;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -54 +55 @@
 
                 @Override protected void realRun() throws SAXException, IOException {
+                        File pluginDir = Main.pref.getPluginsDirFile();
+                        if (!pluginDir.exists())
+                                pluginDir.mkdirs();
                         for (PluginDescription d : toUpdate) {
-                                File tempFile = new File(Main.pref.getPreferencesDir()+"temp.jar");
-                                if (download(d.resource, tempFile)) {
-                                        tempFile.renameTo(new File(Main.pref.getPreferencesDir()+"plugins/"+d.name+".jar"));
+                                File pluginFile = new File(pluginDir, d.name + ".jar.new");
+                                if (download(d.resource, pluginFile))
                                         count++;
-                                } else
+                                else
                                         errors += d.name + "\n";
                         }
+                        PluginDownloader.moveUpdatedPlugins();
                 }
         }
@@ -79 +83 @@
                                 r.close();
                                 new File(Main.pref.getPreferencesDir()+"plugins").mkdir();
-                                FileWriter out = new FileWriter(Main.pref.getPreferencesDir()+"plugins/"+count+"-site-"+site.replaceAll("[/:\\\\ <>|]", "_")+".xml");
+                                FileWriter out = new FileWriter(new File(Main.pref
+                                        .getPluginsDirFile(), count + "-site-"
+                                        + site.replaceAll("[/:\\\\ <>|]", "_") + ".xml"));
                                 out.append(txt);
                                 out.close();
@@ -123 +129 @@
 
         public static boolean downloadPlugin(PluginDescription pd) {
-                File file = new File(Main.pref.getPreferencesDir()+"plugins/"+pd.name+".jar");
+                File file = new File(Main.pref.getPluginsDirFile(), pd.name + ".jar");
                 if (!download(pd.resource, file)) {
                         JOptionPane.showMessageDialog(Main.parent, tr("Could not download plugin: {0} from {1}", pd.name, pd.resource));
@@ -163 +169 @@
                 Main.worker.execute(new UpdateTask(update));
         }
+        
+        public static boolean moveUpdatedPlugins() {
+                File pluginDir = Main.pref.getPluginsDirFile();
+                boolean ok = true;              
+                if (pluginDir.exists() && pluginDir.isDirectory()) {
+                        final File[] files = pluginDir.listFiles(new FilenameFilter() {
+                                public boolean accept(File dir, String name) {
+                        return name.endsWith(".new");
+                }});
+                        for (File updatedPlugin : files) {
+                                final String filePath = updatedPlugin.getPath();
+                                File plugin = new File(filePath.substring(0, filePath.length() - 4));
+                                ok = plugin.delete() && updatedPlugin.renameTo(plugin) && ok;
+                        }
+                }
+                return ok;
+        }
 }

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

@@ -196 +196 @@
 
         for (String s : locations) {
-                File pluginFile = new File(s+"/"+pluginName+".jar");
+                File pluginFile = new File(s, pluginName + ".jar");
                 if (pluginFile.exists()) {
                                 PluginInformation info = new PluginInformation(pluginFile);