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

Timestamp:

2009-10-31T13:15:29+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3305: Version is UNKNOWN
fixed #3429: created_by=* includes the wrong language when uploading from a new layer

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginDownloader.java (modified) (2 diffs)
• PluginHandler.java (modified) (2 diffs)
• PluginInformation.java (modified) (2 diffs)

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

@@ -27 +27 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AboutAction;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -120 +121 @@
 
     private static boolean download(PluginInformation pd, File file) {
-        if(pd.mainversion > AboutAction.getVersionNumber())
+        if(pd.mainversion > Version.getInstance().getVersion())
         {
             ExtendedDialog dialog = new ExtendedDialog(

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

@@ -34 +34 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AboutAction;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -101 +102 @@
                     continue;
                 }
-                if (info.mainversion > AboutAction.getVersionNumber()) {
+                int josmVersion = Version.getInstance().getVersion();
+                if (info.mainversion > josmVersion && josmVersion != Version.JOSM_UNKNOWN_VERSION) {
                     JOptionPane.showMessageDialog(
                             Main.parent,

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

@@ -22 +22 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AboutAction;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.tools.LanguageInfo;
 
@@ -121 +122 @@
         catch(NumberFormatException e) {}
         author = attr.getValue("Author");
-        if(oldcheck && mainversion > AboutAction.getVersionNumber())
+        if(oldcheck && mainversion > Version.getInstance().getVersion())
         {
-            int myv = AboutAction.getVersionNumber();
+            int myv = Version.getInstance().getVersion();
             for(Map.Entry entry : attr.entrySet())
             {