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

Timestamp:

2008-11-09T22:10:39+01:00 (16 years ago)

Author:

stoecker

Message:

added some plugin checks

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginDownloader.java (modified) (3 diffs)
• PluginInformation.java (modified) (3 diffs)

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

@@ -20 +20 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.regex.Matcher;
@@ -71 +72 @@
         private static final Pattern wiki = Pattern.compile("^</td></tr><tr><td><a class=\"ext-link\" href=\"([^\"]*)\"><span class=\"icon\">([^<]*)</span></a></td><td>([^<]*)</td><td>([^<].*)</td><td>(.*)");
 
+        private final static String[] pluginSites = {"http://josm.openstreetmap.de/wiki/Plugins"};
+
+        public static Collection<String> getSites() {
+                return Main.pref.getCollection("pluginmanager.sites", Arrays.asList(pluginSites));
+        }
+
         public static int downloadDescription() {
                 int count = 0;
@@ -94 +101 @@
                 return count;
         }
-
-        public static String[] getSites() {
-            return Main.pref.get("pluginmanager.sites", "http://josm.openstreetmap.de/wiki/Plugins").split(" ");
-    }
 
         private static CharSequence readXml(BufferedReader r) throws IOException {

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

@@ -32 +32 @@
         public final File file;
         public final String name;
+        public final String mainversion;
         public final String className;
         public final String description;
@@ -81 +82 @@
                                 stage = stageStr == null ? 50 : Integer.parseInt(stageStr);
                                 version = attr.getValue("Plugin-Version");
+                                mainversion = attr.getValue("Plugin-Mainversion");
                                 author = attr.getValue("Author");
 
@@ -101 +103 @@
                                 // resource-only plugin
                                 className = null;
+                                mainversion = null;
                                 description = tr("unknown");
                                 early = false;