Changeset 4737 in josm for trunk/src


Ignore:
Timestamp:
2011-12-28T22:38:19+01:00 (8 years ago)
Author:
stoecker
Message:

fix #7197 - fix plugin version check on load

Location:
trunk/src/org/openstreetmap/josm/plugins
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

    r4470 r4737  
    405405        //
    406406        int josmVersion = Version.getInstance().getVersion();
    407         if (plugin.mainversion > josmVersion && josmVersion != Version.JOSM_UNKNOWN_VERSION) {
    408             alertJOSMUpdateRequired(parent, plugin.name, plugin.mainversion);
     407        if (plugin.localmainversion > josmVersion && josmVersion != Version.JOSM_UNKNOWN_VERSION) {
     408            alertJOSMUpdateRequired(parent, plugin.name, plugin.localmainversion);
    409409            return false;
    410410        }
  • trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

    r4721 r4737  
    3939    public String name = null;
    4040    public int mainversion = 0;
     41    public int localmainversion = 0;
    4142    public String className = null;
    4243    public boolean oldmode = false;
  • trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java

    r4721 r4737  
    6464        if (!availablePlugins.containsKey(info.getName())) {
    6565            info.localversion = info.version;
     66            info.localmainversion = info.mainversion;
    6667            availablePlugins.put(info.getName(), info);
    6768        } else {
    6869            PluginInformation current = availablePlugins.get(info.getName());
    6970            current.localversion = info.version;
     71            current.localmainversion = info.mainversion;
    7072            if (info.icon != null) {
    7173                current.icon = info.icon;
Note: See TracChangeset for help on using the changeset viewer.