[Rails-commits] 18xx/rails/game Portfolio.java, 1.29, 1.30 PublicCertificate.java, 1.12, 1.13

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

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

Modified Files:
	Portfolio.java PublicCertificate.java 
Log Message:
Small cleanups

Index: Portfolio.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Portfolio.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Portfolio.java	20 Nov 2008 21:49:38 -0000	1.29
--- Portfolio.java	14 Dec 2008 21:55:05 -0000	1.30
***************
*** 121,125 ****
  
          // Move the private certificate
-         // new CertificateMove (from, this, privateCompany);
          privateCompany.moveTo(this);
  
--- 121,124 ----
***************
*** 402,406 ****
              for (int i = 0; i < shares; i++) {
                  swapCert = other.findCertificate(company, 1, false);
-                 // new CertificateMove (other, this, swapCert);
                  swapCert.moveTo(this);
                  swapped.add(swapCert);
--- 401,404 ----
***************
*** 409,413 ****
          } else if (other.ownsCertificates(company, shares, false) >= 1) {
              swapCert = other.findCertificate(company, 2, false);
-             // new CertificateMove(other, this, swapCert);
              swapCert.moveTo(this);
              swapped.add(swapCert);
--- 407,410 ----
***************
*** 415,419 ****
              return null;
          }
-         // new CertificateMove (this, other, cert);
          cert.moveTo(other);
  
--- 412,415 ----
***************
*** 444,448 ****
      public void buyTrain(TrainI train, int price) {
          CashHolder oldOwner = train.getOwner();
-         // new TrainMove (train, train.getHolder(), this);
          train.moveTo(this);
          if (price > 0) new CashMove(owner, oldOwner, price);
--- 440,443 ----
***************
*** 450,454 ****
  
      public void discardTrain(TrainI train) {
-         // new TrainMove (train, this, Bank.getPool());
          train.moveTo(Bank.getPool());
          ReportBuffer.add(LocalText.getText("CompanyDiscardsTrain",
--- 445,448 ----

Index: PublicCertificate.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCertificate.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PublicCertificate.java	11 Dec 2008 20:12:07 -0000	1.12
--- PublicCertificate.java	14 Dec 2008 21:55:05 -0000	1.13
***************
*** 108,126 ****
  
      /**
-      * Get the current price of this certificate.
-      *
-      * @return The current certificate price.
-      */
-     /*
-     public int getCertificatePrice() {
-         if (company.getCurrentPrice() != null) {
-             return company.getCurrentPrice().getPrice() * shares;
-         } else {
-             return 0;
-         }
-     }
-     */
- 
-     /**
       * Get the name of a certificate. The name is derived from the company name
       * and the share percentage of this certificate. If it is a 100% share (as
--- 108,111 ----