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

Timestamp:

2012-06-28T10:52:00+02:00 (12 years ago)

Author:

simon04

Message:

see #7818 - make plugin list parsing more robust.

In case of an error, resume with next item.

File:

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

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

@@ -32 +32 @@
      * @throws PluginListParseException
      */
-    protected PluginInformation createInfo(String name, String url, String manifest) throws PluginListParseException{
+    protected static PluginInformation createInfo(String name, String url, String manifest) throws PluginListParseException{
         try {
             return new PluginInformation(
@@ -84 +84 @@
                     continue;
                 }
-                if (name != null) {
-                    PluginInformation info = createInfo(name, url, manifest.toString());
-                    if (info != null) {
-                        for (PluginProxy plugin : PluginHandler.pluginList) {
-                            if (plugin.getPluginInformation().name.equals(info.getName())) {
-                                info.localversion = plugin.getPluginInformation().localversion;
-                            }
-                        }
-                        ret.add(info);
-                    }
-                }
+                addPluginInformation(ret, name, url, manifest.toString());
                 String x[] = line.split(";");
                 if(x.length != 2)
@@ -103 +93 @@
 
             }
+            addPluginInformation(ret, name, url, manifest.toString());
+            return ret;
+        } catch (IOException e) {
+            throw new PluginListParseException(e);
+        }
+    }
+
+    private static void addPluginInformation(List<PluginInformation> ret, String name, String url, String manifest) {
+        try {
             if (name != null) {
                 PluginInformation info = createInfo(name, url, manifest.toString());
@@ -114 +113 @@
                 }
             }
-            return ret;
-        } catch (IOException e) {
-            throw new PluginListParseException(e);
+        } catch (PluginListParseException ex) {
+            ex.printStackTrace();
         }
     }
+
 }