[Rails-commits] 18xx/rails/ui/swing GridPanel.java, 1.5, 1.6 GameStatus.java, 1.45, 1.46

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

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

Modified Files:
	GridPanel.java GameStatus.java 
Log Message:
1835 Nationalisation

Index: GameStatus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameStatus.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** GameStatus.java	21 Mar 2010 17:43:50 -0000	1.45
--- GameStatus.java	2 Apr 2010 20:03:54 -0000	1.46
***************
*** 25,32 ****
      private static final long serialVersionUID = 1L;
  
!     private static final String BUY_FROM_IPO_CMD = "BuyFromIPO";
!     private static final String BUY_FROM_POOL_CMD = "BuyFromPool";
!     private static final String SELL_CMD = "Sell";
!     private static final String CASH_CORRECT_CMD = "CorrectCash";
  
      protected StatusWindow parent;
--- 25,32 ----
      private static final long serialVersionUID = 1L;
  
!     protected static final String BUY_FROM_IPO_CMD = "BuyFromIPO";
!     protected static final String BUY_FROM_POOL_CMD = "BuyFromPool";
!     protected static final String SELL_CMD = "Sell";
!     protected static final String CASH_CORRECT_CMD = "CorrectCash";
  
      protected StatusWindow parent;
***************
*** 82,88 ****
      protected int rightCompCaptionXOffset;
  
!     private Caption[] upperPlayerCaption;
!     private Caption[] lowerPlayerCaption;
!     private Caption treasurySharesCaption;
  
      protected Portfolio ipo, pool;
--- 82,88 ----
      protected int rightCompCaptionXOffset;
  
!     protected Caption[] upperPlayerCaption;
!     protected Caption[] lowerPlayerCaption;
!     protected Caption treasurySharesCaption;
  
      protected Portfolio ipo, pool;
***************
*** 516,522 ****
  
          dummyButton = new ClickField("", "", "", this, buySellGroup);
- 
      }
! 
      public void actionPerformed(ActionEvent actor) {
          JComponent source = (JComponent) actor.getSource();
--- 516,521 ----
  
          dummyButton = new ClickField("", "", "", this, buySellGroup);
      }
!     
      public void actionPerformed(ActionEvent actor) {
          JComponent source = (JComponent) actor.getSource();
***************
*** 772,775 ****
--- 771,775 ----
              Portfolio holder;
              int index;
+             CashHolder owner;
  
              List<BuyCertificate> buyableCerts =
***************
*** 780,788 ****
                      index = cert.getCompany().getPublicNumber();
                      holder = bCert.getFromPortfolio();
                      if (holder == ipo) {
                          setIPOCertButton(index, true, bCert);
                      } else if (holder == pool) {
                          setPoolCertButton(index, true, bCert);
!                     } else if (compCanHoldOwnShares) {
                          setTreasuryCertButton(index, true, bCert);
                      }
--- 780,791 ----
                      index = cert.getCompany().getPublicNumber();
                      holder = bCert.getFromPortfolio();
+                     owner = holder.getOwner();
                      if (holder == ipo) {
                          setIPOCertButton(index, true, bCert);
                      } else if (holder == pool) {
                          setPoolCertButton(index, true, bCert);
!                     } else if (owner instanceof Player) {
!                         setPlayerCertButton(index, ((Player)owner).getIndex(), true, bCert);
!                     } else if (owner instanceof PublicCompanyI && compCanHoldOwnShares) {
                          setTreasuryCertButton(index, true, bCert);
                      }
***************
*** 881,886 ****
          setPlayerCertButton(i, j, clickable);
          if (clickable && o != null) {
!             if (o instanceof PossibleAction)
                  certPerPlayerButton[i][j].addPossibleAction((PossibleAction) o);
          }
      }
--- 884,895 ----
          setPlayerCertButton(i, j, clickable);
          if (clickable && o != null) {
!             if (o instanceof PossibleAction) {
                  certPerPlayerButton[i][j].addPossibleAction((PossibleAction) o);
+                 if (o instanceof SellShares) {
+                     certPerPlayerButton[i][j].setToolTipText(LocalText.getText("ClickForSell"));
+                 } else if (o instanceof BuyCertificate) {
+                     certPerPlayerButton[i][j].setToolTipText(LocalText.getText("ClickToSelectForBuying"));
+                 }
+             }
          }
      }
***************
*** 899,903 ****
      }
  
!     private void setIPOCertButton(int i, boolean clickable, Object o) {
  
          setIPOCertButton(i, clickable);
--- 908,912 ----
      }
  
!     protected void setIPOCertButton(int i, boolean clickable, Object o) {
  
          setIPOCertButton(i, clickable);
***************
*** 908,912 ****
      }
  
!     private void setIPOCertButton(int i, boolean clickable) {
          boolean visible = rowVisibilityObservers[i].lastValue();
          if (clickable) {
--- 917,921 ----
      }
  
!     protected void setIPOCertButton(int i, boolean clickable) {
          boolean visible = rowVisibilityObservers[i].lastValue();
          if (clickable) {
***************
*** 919,923 ****
      }
  
!     private void setPoolCertButton(int i, boolean clickable, Object o) {
  
          setPoolCertButton(i, clickable);
--- 928,932 ----
      }
  
!     protected void setPoolCertButton(int i, boolean clickable, Object o) {
  
          setPoolCertButton(i, clickable);
***************
*** 928,932 ****
      }
  
!     private void setPoolCertButton(int i, boolean clickable) {
          boolean visible = rowVisibilityObservers[i].lastValue();
          if (clickable) {
--- 937,941 ----
      }
  
!     protected void setPoolCertButton(int i, boolean clickable) {
          boolean visible = rowVisibilityObservers[i].lastValue();
          if (clickable) {
***************
*** 939,943 ****
      }
  
!     private void setTreasuryCertButton(int i, boolean clickable, Object o) {
  
          setTreasuryCertButton(i, clickable);
--- 948,952 ----
      }
  
!     protected void setTreasuryCertButton(int i, boolean clickable, Object o) {
  
          setTreasuryCertButton(i, clickable);
***************
*** 948,952 ****
      }
  
!     private void setTreasuryCertButton(int i, boolean clickable) {
          boolean visible = rowVisibilityObservers[i].lastValue();
          if (clickable) {
--- 957,961 ----
      }
  
!     protected void setTreasuryCertButton(int i, boolean clickable) {
          boolean visible = rowVisibilityObservers[i].lastValue();
          if (clickable) {
***************
*** 959,963 ****
      }
  
!     private void setCompanyCashButton(int i, boolean clickable, PossibleAction action){
          boolean visible = rowVisibilityObservers[i].lastValue();
  
--- 968,972 ----
      }
  
!     protected void setCompanyCashButton(int i, boolean clickable, PossibleAction action){
          boolean visible = rowVisibilityObservers[i].lastValue();
  
***************
*** 973,977 ****
      }
  
!     private void setPlayerCashButton(int i, boolean clickable, PossibleAction action){
  
          if (clickable) {
--- 982,986 ----
      }
  
!     protected void setPlayerCashButton(int i, boolean clickable, PossibleAction action){
  
          if (clickable) {

Index: GridPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GridPanel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GridPanel.java	14 Mar 2010 12:26:59 -0000	1.5
--- GridPanel.java	2 Apr 2010 20:03:54 -0000	1.6
***************
*** 128,132 ****
      }
  
!     class RowVisibility implements ViewObject {
  
          private GridPanel parent;
--- 128,132 ----
      }
  
!     public class RowVisibility implements ViewObject {
  
          private GridPanel parent;