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

Timestamp:

2008-01-03T22:35:25+01:00 (17 years ago)

Author:

gebner

Message:

Fix parsing of Plugins.xml

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/PluginPreference.java (modified) (3 diffs)
• plugins/PluginDownloader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -55 +55 @@
          */
         public static class PluginDescription {
+                // Note: All the following need to be public instance variables of
+                // type String.  (Plugin description XMLs from the server are parsed
+                // with tools.XmlObjectParser, which uses reflection to access them.)
                 public String name;
                 public String description;
-                public URL resource;
+                public String resource;
                 public String version;
-                public PluginDescription(String name, String description, URL resource, String version) {
+                public PluginDescription(String name, String description, String resource, String version) {
                         this.name = name;
                         this.description = description;
@@ -250 +253 @@
                                                                         info.name,
                                                                         info.description,
-                                                                        PluginInformation.fileToURL(f),
+                                                                        PluginInformation.fileToURL(f).toString(),
                                                                         info.version));
                                                 } catch (PluginException x) {
@@ -273 +276 @@
                                                 proxy.info.name, 
                                                 proxy.info.description, 
-                                                proxy.info.file == null ? null : PluginInformation.fileToURL(proxy.info.file),
+                                                proxy.info.file == null ? null :
+                                                        PluginInformation.fileToURL(proxy.info.file).toString(),
                                                 proxy.info.version));
                 return availablePlugins.values();

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

@@ -140 +140 @@
         }
 
-        private static boolean download(URL url, File file) {
+        private static boolean download(String url, File file) {
                 try {
-                        InputStream in = url.openStream();
+                        InputStream in = new URL(url).openStream();
                         OutputStream out = new FileOutputStream(file);
                         byte[] buffer = new byte[8192];