[Rails-commits] 18xx/rails/game/specific/_18EU FinalMinorExchangeRound.java, 1.4, 1.5

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

Update of /cvsroot/rails/18xx/rails/game/specific/_18EU
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20653/rails/game/specific/_18EU

Modified Files:
	FinalMinorExchangeRound.java 
Log Message:
Cleanups only

Index: FinalMinorExchangeRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/FinalMinorExchangeRound.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FinalMinorExchangeRound.java	4 Dec 2008 00:55:48 -0000	1.4
--- FinalMinorExchangeRound.java	7 Dec 2008 19:27:08 -0000	1.5
***************
*** 128,160 ****
      }
  
-     /*
-      * @Override protected void setNextPlayer() { if
-      * (!discardingTrains.booleanValue()) { // Check if any player has a minor
-      * left for (int i=0; i<GameManager.getNumberOfPlayers(); i++) {
-      * GameManager.setNextPlayer(); currentPlayer =
-      * GameManager.getCurrentPlayer(); for (PublicCertificateI cert :
-      * currentPlayer.getPortfolio().getCertificates()) { if
-      * (cert.getCompany().getTypeName().equals("Minor")) { initPlayer(); return; } } } //
-      * No more minors, get rid of any excess trains discardingTrains.set(true);
-      * 
-      * if (compWithExcessTrains.isEmpty()) { gameMgr.nextRound (this); return; } //
-      * Make up a list of train discarding companies in sequence of the last OR //
-      * TODO: this disregards any changes in the operating sequence // during the
-      * last OR. This is probably wrong. PublicCompanyI[] operatingCompanies =
-      * lastOR.getOperatingCompanies(); discardingCompanies = new
-      * PublicCompanyI[compWithExcessTrains.size()]; for (int i=0, j=0; i<operatingCompanies.length;
-      * i++) { if (compWithExcessTrains.contains(operatingCompanies[i])) {
-      * discardingCompanies[j++] = operatingCompanies[i]; } }
-      * 
-      * discardingCompanyIndex = new IntegerState ("DiscardingCompanyIndex", 0); }
-      * else { PublicCompanyI comp =
-      * discardingCompanies[discardingCompanyIndex.intValue()]; if
-      * (comp.getNumberOfTrains() <= comp.getCurrentTrainLimit()) {
-      * discardingCompanyIndex.add(1); } }
-      * 
-      * if (discardingCompanyIndex.intValue() >= discardingCompanies.length) { //
-      * All excess trains have been discarded gameMgr.nextRound (this); return; } }
-      */
- 
      @Override
      protected void initPlayer() {
--- 128,131 ----
***************
*** 171,173 ****
          return "FinalMinorExchangeRound";
      }
! }
--- 142,144 ----
          return "FinalMinorExchangeRound";
      }
! }
\ No newline at end of file