Changeset 2819 in josm

Timestamp:

Jan 12, 2010 6:49:00 AM (3 years ago)

Author:

Gubaer

Message:

fixed #4349: Upgrading to 2818 hangs on processing plugins

File:

• trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java (modified) (2 diffs)

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

@@ -76 +76 @@
                 }
         );
-        if (siteCacheFiles != null || siteCacheFiles.length > 0) {
-            monitor.subTask(tr("Processing plugin site cache files..."));
-            monitor.setTicksCount(siteCacheFiles.length);
-            for (File f: siteCacheFiles) {
-                String fname = f.getName();
-                monitor.setCustomText(tr("Processing file ''{0}''", fname));
-                try {
-                    processLocalPluginInformationFile(f);
-                } catch(PluginListParseException e) {
-                    System.err.println(tr("Warning: Failed to scan file ''{0}'' for plugin information. Skipping.", fname));
-                    e.printStackTrace();
-                }
-                monitor.worked(1);
-            }
+        if (siteCacheFiles == null || siteCacheFiles.length == 0)
+            return;
+        monitor.subTask(tr("Processing plugin site cache files..."));
+        monitor.setTicksCount(siteCacheFiles.length);
+        for (File f: siteCacheFiles) {
+            String fname = f.getName();
+            monitor.setCustomText(tr("Processing file ''{0}''", fname));
+            try {
+                processLocalPluginInformationFile(f);
+            } catch(PluginListParseException e) {
+                System.err.println(tr("Warning: Failed to scan file ''{0}'' for plugin information. Skipping.", fname));
+                e.printStackTrace();
+            }
+            monitor.worked(1);
         }
     }
@@ -101 +101 @@
                 }
         );
-        if (pluginFiles != null || pluginFiles.length > 0) {
-            monitor.subTask(tr("Processing plugin files..."));
-            monitor.setTicksCount(pluginFiles.length);
-            for (File f: pluginFiles) {
-                String fname = f.getName();
-                monitor.setCustomText(tr("Processing file ''{0}''", fname));
-                try {
-                    if (fname.endsWith(".jar")) {
-                        String pluginName = fname.substring(0, fname.length() - 4);
-                        processJarFile(f, pluginName);
-                    } else if (fname.endsWith(".jar.new")) {
-                        String pluginName = fname.substring(0, fname.length() - 8);
-                        processJarFile(f, pluginName);
-                    }
-                } catch(PluginException e){
-                    System.err.println(tr("Warning: Failed to scan file ''{0}'' for plugin information. Skipping.", fname));
-                    e.printStackTrace();
+        if (pluginFiles == null || pluginFiles.length == 0)
+            return;
+        monitor.subTask(tr("Processing plugin files..."));
+        monitor.setTicksCount(pluginFiles.length);
+        for (File f: pluginFiles) {
+            String fname = f.getName();
+            monitor.setCustomText(tr("Processing file ''{0}''", fname));
+            try {
+                if (fname.endsWith(".jar")) {
+                    String pluginName = fname.substring(0, fname.length() - 4);
+                    processJarFile(f, pluginName);
+                } else if (fname.endsWith(".jar.new")) {
+                    String pluginName = fname.substring(0, fname.length() - 8);
+                    processJarFile(f, pluginName);
                 }
-                monitor.worked(1);
-            }
+            } catch(PluginException e){
+                System.err.println(tr("Warning: Failed to scan file ''{0}'' for plugin information. Skipping.", fname));
+                e.printStackTrace();
+            }
+            monitor.worked(1);
         }
     }