Changeset 1767 in josm

Timestamp:

Jul 11, 2009 2:52:02 PM (4 years ago)

Author:

stoecker

Message:

fix #2859 - better plugin support for older versions

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginInformation.java (modified) (8 diffs)
• PluginSelection.java (modified) (3 diffs)

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

@@ -15 +15 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.jar.Attributes;
@@ -21 +22 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AboutAction;
 import org.openstreetmap.josm.tools.LanguageInfo;
 
@@ -34 +36 @@
     public int mainversion = 0;
     public String className = null;
+    public boolean oldmode = false;
     public String requires = null;
     public String link = null;
@@ -70 +73 @@
             if (manifest == null)
                 throw new IOException(file+" contains no manifest.");
-            scanManifest(manifest);
+            scanManifest(manifest, false);
             libraries.add(0, fileToURL(file));
             jar.close();
@@ -78 +81 @@
     }
 
-    public PluginInformation(InputStream manifestStream, String name) {
+    public PluginInformation(InputStream manifestStream, String name, String url) {
         this.name = name;
         try {
             Manifest manifest = new Manifest();
             manifest.read(manifestStream);
-            scanManifest(manifest);
+            if(url != null)
+                downloadlink = url;
+            scanManifest(manifest, url != null);
         } catch (IOException e) {
             throw new PluginException(null, name, e);
@@ -89 +94 @@
     }
 
-    private void scanManifest(Manifest manifest)
+    private void scanManifest(Manifest manifest, boolean oldcheck)
     {
         String lang = LanguageInfo.getLanguageCodeManifest();
@@ -114 +119 @@
         catch(NumberFormatException e) {}
         author = attr.getValue("Author");
+        if(oldcheck && mainversion > AboutAction.getVersionNumber())
+        {
+            int myv = AboutAction.getVersionNumber();
+            for(Map.Entry entry : attr.entrySet())
+            {
+                try {
+                    String key = ((Attributes.Name)entry.getKey()).toString();
+                    if(key.endsWith("_Plugin-Url"))
+                    {
+                        int mv = Integer.parseInt(key.substring(0,key.length()-11));
+                        if(mv <= myv && (mv > mainversion || mainversion > myv))
+                        {
+                            String v = (String)entry.getValue();
+                            int i = v.indexOf(";");
+                            if(i > 0)
+                            {
+                                downloadlink = v.substring(i+1);
+                                mainversion = mv;
+                                version = v.substring(0,i);
+                                oldmode = true;
+                            }
+                        }
+                    }
+                }
+                catch(Exception e) { e.printStackTrace(); }
+            }
+        }
 
         String classPath = attr.getValue(Attributes.Name.CLASS_PATH);
@@ -213 +245 @@
         InputStream manifestStream = PluginInformation.class.getResourceAsStream("/org/openstreetmap/josm/plugins/"+name+"/MANIFEST.MF");
         if (manifestStream != null)
-            return new PluginInformation(manifestStream, pluginName);
+            return new PluginInformation(manifestStream, pluginName, null);
 
         Collection<String> locations = getPluginLocations();

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

@@ -168 +168 @@
             if ((remoteversion == null) || remoteversion.equals(""))
                 remoteversion = tr("unknown");
+            else if(plugin.oldmode)
+                remoteversion += "*";
 
             String localversion = "";
@@ -284 +286 @@
                                             PluginInformation info = new PluginInformation(
                                             new ByteArrayInputStream(manifest.getBytes("utf-8")),
-                                            name.substring(0,name.length()-4));
-                                            info.downloadlink = url;
+                                            name.substring(0,name.length()-4), url);
                                             if(!availablePlugins.containsKey(info.name))
                                                 availablePlugins.put(info.name, info);
@@ -305 +306 @@
                                 PluginInformation info = new PluginInformation(
                                 new ByteArrayInputStream(manifest.getBytes("utf-8")),
-                                name.substring(0,name.length()-4));
-                                info.downloadlink = url;
+                                name.substring(0,name.length()-4), url);
                                 if(!availablePlugins.containsKey(info.name))
                                     availablePlugins.put(info.name, info);