[Rails-commits] 18xx/rails/ui/swing GameUIManager.java,1.34,1.35

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

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20358/rails/ui/swing

Modified Files:
	GameUIManager.java 
Log Message:
Added config setting to keep stockchart open. 
Fixed bug that on loading in a SR the stockchart didn't open

Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** GameUIManager.java	17 Jan 2010 18:32:46 -0000	1.34
--- GameUIManager.java	19 Jan 2010 19:48:58 -0000	1.35
***************
*** 61,64 ****
--- 61,66 ----
      protected File lastFile, lastDirectory;
  
+     protected boolean configuredStockChartVisibility = false;
+ 
      protected boolean previousStockChartVisibilityHint;
      protected boolean previousStatusWindowVisibilityHint;
***************
*** 101,104 ****
--- 103,108 ----
          }
  
+         configuredStockChartVisibility = "yes".equalsIgnoreCase(Config.get("stockchart.window.open"));
+ 
      }
  
***************
*** 260,269 ****
          	switch (hint.getType()) {
          	case STOCK_MARKET:
!                 boolean stockChartVisibilityHint = hint.getVisibility();
                  if (stockChartVisibilityHint != previousStockChartVisibilityHint) {
                  	stockChart.setVisible(stockChartVisibilityHint);
                  	previousStockChartVisibilityHint = stockChartVisibilityHint;
                  }
!             	if (stockChartVisibilityHint) stockChart.toFront();
                 break;
          	case STATUS:
--- 264,274 ----
          	switch (hint.getType()) {
          	case STOCK_MARKET:
!                 boolean stockChartVisibilityHint = hint.getVisibility()
!                 		|| configuredStockChartVisibility;
                  if (stockChartVisibilityHint != previousStockChartVisibilityHint) {
                  	stockChart.setVisible(stockChartVisibilityHint);
                  	previousStockChartVisibilityHint = stockChartVisibilityHint;
                  }
!             	if (hint.getVisibility()) stockChart.toFront();
                 break;
          	case STATUS:
***************
*** 300,303 ****
--- 305,309 ----
              log.debug("Entering Stock Round UI type");
              activeWindow = statusWindow;
+             stockChart.setVisible(true);
              statusWindow.setVisible(true);
              statusWindow.toFront();
***************
*** 514,517 ****
--- 520,525 ----
  	                int selected = dialog.getSelectedOption();
  	                action.setNumberTaken(action.getMinNumber() + selected);
+ 	    	} else if (currentDialog instanceof MessageDialog) {
+ 	    		// Nothing
  	        } else {
  	            return;
***************
*** 519,523 ****
      	}
  
!         processOnServer(currentDialogAction);
      }
  
--- 527,531 ----
      	}
  
!         if (currentDialogAction != null) processOnServer(currentDialogAction);
      }