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

Timestamp:

2009-10-31T13:15:29+01:00 (16 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/gui

Files:

• GettingStarted.java (modified) (2 diffs)
• MainApplication.java (modified) (1 diff)
• SplashScreen.java (modified) (2 diffs)
• help/HelpApplication.java (modified) (1 diff)
• io/UploadDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -16 +16 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AboutAction;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.io.CacheCustomContent;
 import org.openstreetmap.josm.tools.LanguageInfo;
@@ -51 +51 @@
         }
 
-        final private int myVersion = AboutAction.getVersionNumber();
+        final private int myVersion = Version.getInstance().getVersion();
         final private String myLang = LanguageInfo.getWikiLanguagePrefix();
 

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -96 +96 @@
             I18n.set(Main.pref.get("language", null));
         }
+        Main.pref.updateSystemProperties();
 
         if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) {

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -26 +26 @@
 
 import org.openstreetmap.josm.actions.AboutAction;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -73 +74 @@
 
         // Add the version number
-        JLabel version = new JLabel(tr("Version {0}", AboutAction.getVersionString()));
+        JLabel version = new JLabel(tr("Version {0}", Version.getInstance().getVersionString()));
         gbc.gridy = 1;
         gbc.insets = new Insets(0, 0, 0, 0);

trunk/src/org/openstreetmap/josm/gui/help/HelpApplication.java

@@ -92 +92 @@
             I18n.set(Main.pref.get("language", null));
         }
-
         MainApplication.preConstructorInit(args);
         Thread.setDefaultUncaughtExceptionHandler(

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -119 +119 @@
         pnlLists = new JPanel();
         pnlLists.setLayout(new GridBagLayout());
-        // we don't add the lists yet, see setUploadPrimivies()
+        // we don't add the lists yet, see setUploadPrimitives()
         //
         return pnlLists;
@@ -278 +278 @@
             y++;
             gcLabel.gridy = y;
-            lblUpdate.setText(trn("{0} object to modifiy:", "{0} objects to modify:", update.size(),update.size()));
+            lblUpdate.setText(trn("{0} object to modify:", "{0} objects to modify:", update.size(),update.size()));
             pnlLists.add(lblUpdate, gcLabel);
             y++;