[vassalengine-svn] SF.net SVN: vassalengine:[4580] VASSAL-src/branches/uckelman-work/src/ VASSAL

[<uck...@us...>]

Revision: 4580
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4580&view=rev
Author:   uckelman
Date:     2008-11-29 16:11:26 +0000 (Sat, 29 Nov 2008)

Log Message:
-----------
* Added missing call to BrowserSupport to UpdateCheckAction.
* Simplified version check messages.

Modified Paths:
--------------
    VASSAL-src/branches/uckelman-work/src/VASSAL/i18n/VASSAL.properties
    VASSAL-src/branches/uckelman-work/src/VASSAL/launch/UpdateCheckRequest.java
    VASSAL-src/branches/uckelman-work/src/VASSAL/tools/version/UpdateCheckAction.java

Modified: VASSAL-src/branches/uckelman-work/src/VASSAL/i18n/VASSAL.properties
===================================================================
--- VASSAL-src/branches/uckelman-work/src/VASSAL/i18n/VASSAL.properties	2008-11-29 14:36:37 UTC (rev 4579)
+++ VASSAL-src/branches/uckelman-work/src/VASSAL/i18n/VASSAL.properties	2008-11-29 16:11:26 UTC (rev 4580)
@@ -597,7 +597,7 @@
 UpdateCheckAction.version_current_title=No Updates Available
 UpdateCheckAction.version_current_message=Your version of VASSAL is current. No updates are available at this time.
 UpdateCheckAction.update_available_title=Update Available
-UpdateCheckAction.update_available_message=Your version of VASSAL is no longer current. Version {1}, which is newer than your version {0}, is available. Would you like to download it?
+UpdateCheckAction.update_available_message=Your version of VASSAL is no longer current. A newer version of VASSAL is available. Would you like to download it?
 UpdateCheckAction.check_failed_title=Update Check Failed
 UpdateCheckAction.check_failed_message=Sorry, it is not possible to check for updates at this time.
 

Modified: VASSAL-src/branches/uckelman-work/src/VASSAL/launch/UpdateCheckRequest.java
===================================================================
--- VASSAL-src/branches/uckelman-work/src/VASSAL/launch/UpdateCheckRequest.java	2008-11-29 14:36:37 UTC (rev 4579)
+++ VASSAL-src/branches/uckelman-work/src/VASSAL/launch/UpdateCheckRequest.java	2008-11-29 16:11:26 UTC (rev 4580)
@@ -40,14 +40,13 @@
       if (update != null) {
         // running version is obsolete
         if (JOptionPane.showConfirmDialog(
-          ModuleManagerWindow.getInstance(),
-          Resources.getString(
-           "UpdateCheckAction.update_available_message",
-            Info.getVersion(), update.toString()),
-          Resources.getString("UpdateCheckAction.update_available_title"),
-          JOptionPane.YES_NO_OPTION,
-          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-            BrowserSupport.openURL("https://sourceforge.net/project/showfiles.php?group_id=90612");
+            ModuleManagerWindow.getInstance(),
+            Resources.getString("UpdateCheckAction.update_available_message"),
+            Resources.getString("UpdateCheckAction.update_available_title"),
+            JOptionPane.YES_NO_OPTION,
+            JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+          BrowserSupport.openURL(
+              "https://sourceforge.net/project/showfiles.php?group_id=90612");
         }
       }
     }

Modified: VASSAL-src/branches/uckelman-work/src/VASSAL/tools/version/UpdateCheckAction.java
===================================================================
--- VASSAL-src/branches/uckelman-work/src/VASSAL/tools/version/UpdateCheckAction.java	2008-11-29 14:36:37 UTC (rev 4579)
+++ VASSAL-src/branches/uckelman-work/src/VASSAL/tools/version/UpdateCheckAction.java	2008-11-29 16:11:26 UTC (rev 4580)
@@ -26,7 +26,9 @@
 
 import VASSAL.Info;
 import VASSAL.i18n.Resources;
+import VASSAL.tools.BrowserSupport;
 import VASSAL.tools.ErrorDialog;
+import VASSAL.tools.WarningDialog;
 import VASSAL.tools.logging.Logger;
 
 /**
@@ -64,13 +66,13 @@
         else {
           // running version is obsolete
           if (JOptionPane.showConfirmDialog(
-            frame,
-            Resources.getString(
-              "UpdateCheckAction.update_available_message",
-              Info.getVersion(), update.toString()),
+              frame,
+              Resources.getString("UpdateCheckAction.update_available_message"),
               Resources.getString("UpdateCheckAction.update_available_title"),
               JOptionPane.YES_NO_OPTION,
-            JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+              JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+            BrowserSupport.openURL(
+              "https://sourceforge.net/project/showfiles.php?group_id=90612");
           }
         }
         return;
@@ -82,12 +84,7 @@
         Logger.log(e);
       }
 
-      JOptionPane.showMessageDialog(
-        frame,
-        Resources.getString("UpdateCheckAction.check_failed_message"),
-        Resources.getString("UpdateCheckAction.check_failed_title"),
-        JOptionPane.ERROR_MESSAGE
-      ); 
+      WarningDialog.show(frame, "UpdateCheckAction.check_failed");
     }
   }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.