[Rails-commits] 18xx/rails/ui/swing/gamespecific/_18EU GameStatus_18EU.java, 1.5, 1.6

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

Update of /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_18EU
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2811/rails/ui/swing/gamespecific/_18EU

Modified Files:
	GameStatus_18EU.java 
Log Message:
On merging, only ask the "replace token" question if a token can actually legitimately be laid.
(The exceptional case of tile #583 (18EU brown Paris) is not yet covered: two bases of one company in one station is not yet excluded).

Index: GameStatus_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_18EU/GameStatus_18EU.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GameStatus_18EU.java	4 Jun 2008 19:00:38 -0000	1.5
--- GameStatus_18EU.java	24 Dec 2008 14:55:11 -0000	1.6
***************
*** 81,85 ****
              action.setSelectedTargetCompany(major);
  
!             if (major != null) {
                  boolean replaceToken =
                          JOptionPane.showConfirmDialog(this, LocalText.getText(
--- 81,86 ----
              action.setSelectedTargetCompany(major);
  
!             if (major != null
!                     && action.canReplaceToken(choice)) {
                  boolean replaceToken =
                          JOptionPane.showConfirmDialog(this, LocalText.getText(