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

Timestamp:

2010-03-03T19:20:28+01:00 (15 years ago)

Author:

bastiK

Message:

fixed: plugin version in status report is wrong. It should show the version from plugin manifest, but instead it displays the version that would be loaded in case of a plugin update. Cause: local version of plugin is overridden by the version of plugin that is already present, but instead of 'localversion' it uses 'version'.

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

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

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

@@ -379 +379 @@
             Class<?> klass = plugin.loadClass(pluginClassLoader);
             if (klass != null) {
-                System.out.println(tr("loading plugin ''{0}''", plugin.name));
+                System.out.println(tr("loading plugin ''{0}'' ({1})", plugin.name, plugin.localversion));
                 pluginList.add(plugin.load(klass));
             }

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

@@ -166 +166 @@
                 availablePlugins.put(info.name, info);
             } else {
-                availablePlugins.get(info.name).localversion = info.version;
+                availablePlugins.get(info.name).localversion = info.localversion;
             }
         }