[Rails-commits] SF.net SVN: rails:[1514] trunk/18xx/rails/ui/swing

[<ev...@us...>]

Revision: 1514
          http://rails.svn.sourceforge.net/rails/?rev=1514&view=rev
Author:   evos
Date:     2011-04-06 22:13:54 +0000 (Wed, 06 Apr 2011)

Log Message:
-----------
AutoSave/Load improvements for the OR Window

Modified Paths:
--------------
    trunk/18xx/rails/ui/swing/GameUIManager.java
    trunk/18xx/rails/ui/swing/ORPanel.java
    trunk/18xx/rails/ui/swing/ORUIManager.java

Modified: trunk/18xx/rails/ui/swing/GameUIManager.java
===================================================================
--- trunk/18xx/rails/ui/swing/GameUIManager.java	2011-04-06 22:12:31 UTC (rev 1513)
+++ trunk/18xx/rails/ui/swing/GameUIManager.java	2011-04-06 22:13:54 UTC (rev 1514)
@@ -711,6 +711,11 @@
         log.debug("Autosaving to "+lastSavedFilename);
         processOnServer (saveAction);
         
+        saveAutoSavedFilename (lastSavedFilename);
+    }
+    
+    protected void saveAutoSavedFilename (String lastSavedFilename) {
+        
         try {
             File f = new File (lastSavedFilenameFilepath);
             PrintWriter out = new PrintWriter (new FileWriter (f));
@@ -909,6 +914,7 @@
         if (gameWasLoaded) {
             autoSaveLoadInitialized = true;
             lastSavedFilenameFilepath = saveDirectory + "/" + savePrefix + ".last_rails";
+            saveAutoSavedFilename (lastSavedFilename);
         }
         
         if (autoLoadPoller != null && autoSaveLoadStatus != AutoLoadPoller.OFF

Modified: trunk/18xx/rails/ui/swing/ORPanel.java
===================================================================
--- trunk/18xx/rails/ui/swing/ORPanel.java	2011-04-06 22:12:31 UTC (rev 1513)
+++ trunk/18xx/rails/ui/swing/ORPanel.java	2011-04-06 22:13:54 UTC (rev 1514)
@@ -746,6 +746,8 @@
                 ((ActionMenuItem)item).clearPossibleActions();
             }
         }
+        undoButton.setEnabled(false);
+        
     }
 
     public void resetORCompanyTurn(int orCompIndex) {

Modified: trunk/18xx/rails/ui/swing/ORUIManager.java
===================================================================
--- trunk/18xx/rails/ui/swing/ORUIManager.java	2011-04-06 22:12:31 UTC (rev 1513)
+++ trunk/18xx/rails/ui/swing/ORUIManager.java	2011-04-06 22:13:54 UTC (rev 1514)
@@ -1457,8 +1457,6 @@
 
         messagePanel.setMessage(null);
 
-        if (!myTurn) return;
-        
         if (actionToComplete != null) {
             log.debug("ExecutedAction: " + actionToComplete);
         }
@@ -1480,6 +1478,8 @@
 
         orPanel.initORCompanyTurn(orComp, orCompIndex);
 
+        if (!myTurn) return;
+        
         privatesCanBeBoughtNow = possibleActions.contains(BuyPrivate.class);
         orPanel.initPrivateBuying(privatesCanBeBoughtNow);
 


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