Changeset 4737 in josm for trunk

Timestamp:

2011-12-28T22:38:19+01:00 (13 years ago)

Author:

stoecker

Message:

fix #7197 - fix plugin version check on load

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginHandler.java (modified) (1 diff)
• PluginInformation.java (modified) (1 diff)
• ReadLocalPluginInformationTask.java (modified) (1 diff)

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

@@ -405 +405 @@
         //
         int josmVersion = Version.getInstance().getVersion();
-        if (plugin.mainversion > josmVersion && josmVersion != Version.JOSM_UNKNOWN_VERSION) {
-            alertJOSMUpdateRequired(parent, plugin.name, plugin.mainversion);
+        if (plugin.localmainversion > josmVersion && josmVersion != Version.JOSM_UNKNOWN_VERSION) {
+            alertJOSMUpdateRequired(parent, plugin.name, plugin.localmainversion);
             return false;
         }

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

@@ -39 +39 @@
     public String name = null;
     public int mainversion = 0;
+    public int localmainversion = 0;
     public String className = null;
     public boolean oldmode = false;

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

@@ -64 +64 @@
         if (!availablePlugins.containsKey(info.getName())) {
             info.localversion = info.version;
+            info.localmainversion = info.mainversion;
             availablePlugins.put(info.getName(), info);
         } else {
             PluginInformation current = availablePlugins.get(info.getName());
             current.localversion = info.version;
+            current.localmainversion = info.mainversion;
             if (info.icon != null) {
                 current.icon = info.icon;