Changeset 3054 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-02-27T15:55:13+01:00 (15 years ago)

Author:

stoecker

Message:

don't keep .jar.new for linux, this is only necessary for windows system

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MainApplication.java (modified) (1 diff)
• gui/preferences/plugin/PluginPreferencesModel.java (modified) (1 diff)
• plugins/PluginDownloadTask.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -175 +175 @@
 
         monitor.subTask(tr("Installing updated plugins"));
-        PluginHandler.installDownloadedPlugins();
+        PluginHandler.installDownloadedPlugins(true);
         monitor.worked(1);
 

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

@@ -289 +289 @@
         for (PluginInformation pi : plugins) {
             File downloadedPluginFile = new File(pluginDir, pi.name + ".jar.new");
-            if (! downloadedPluginFile.exists() && downloadedPluginFile.canRead()) {
+            if (!(downloadedPluginFile.exists() && downloadedPluginFile.canRead())) {
                 continue;
             }

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

@@ -173 +173 @@
             downloaded.add(d);
         }
+        PluginHandler.installDownloadedPlugins(false);
     }
 

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

@@ -714 +714 @@
      * 
      */
-    public static void installDownloadedPlugins() {
+    public static void installDownloadedPlugins(boolean dowarn) {
         File pluginDir = Main.pref.getPluginsDirectory();
         if (! pluginDir.exists() || ! pluginDir.isDirectory() || ! pluginDir.canWrite())
@@ -729 +729 @@
             String pluginName = updatedPlugin.getName().substring(0, updatedPlugin.getName().length() - 8);
             if (plugin.exists()) {
-                if (!plugin.delete()) {
+                if (!plugin.delete() && !dowarn) {
                     System.err.println(tr("Warning: failed to delete outdated plugin ''{0}''.", plugin.toString()));
                     System.err.println(tr("Warning: failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));
@@ -735 +735 @@
                 }
             }
-            if (!updatedPlugin.renameTo(plugin)) {
+            if (!updatedPlugin.renameTo(plugin) && !dowarn) {
                 System.err.println(tr("Warning: failed to install plugin ''{0}'' from temporary download file ''{1}''. Renaming failed.", plugin.toString(), updatedPlugin.toString()));
                 System.err.println(tr("Warning: failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));