[Rails-commits] 18xx/rails/game/model TrainsModel.java,1.6,1.7

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

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

Modified Files:
	TrainsModel.java 
Log Message:
More rationalising of static method usage

Index: TrainsModel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/model/TrainsModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TrainsModel.java	4 Jun 2008 19:00:37 -0000	1.6
--- TrainsModel.java	4 Nov 2009 20:33:22 -0000	1.7
***************
*** 3,7 ****
  
  import rails.game.Portfolio;
- import rails.game.TrainManager;
  
  public class TrainsModel extends ModelObject {
--- 3,6 ----
***************
*** 16,24 ****
      }
  
!     public String getText() {
          if (option == FULL_LIST) {
!             return TrainManager.makeFullList(portfolio);
          } else if (option == ABBR_LIST) {
!             return TrainManager.makeAbbreviatedList(portfolio);
          } else {
              return "";
--- 15,24 ----
      }
  
!     @Override
! 	public String getText() {
          if (option == FULL_LIST) {
!             return portfolio.makeFullListOfTrains();
          } else if (option == ABBR_LIST) {
!             return portfolio.makeAbbreviatedListOfTrains();
          } else {
              return "";