rails-commits

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

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

Modified Files:
	GridPanel.java GameStatus.java ORPanel.java 
Log Message:
18EU bankruptcy rules (Phase 3)

Index: GameStatus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameStatus.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** GameStatus.java	9 Apr 2010 21:26:12 -0000	1.47
--- GameStatus.java	24 May 2010 11:20:42 -0000	1.48
***************
*** 298,303 ****
              companyIndex.put(c, new Integer(i));
              rowVisibilityObservers[i]
!                    = new RowVisibility (this, certPerPlayerYOffset + i, c.getClosedModel());
!             boolean visible = !c.isClosed();
  
              f = new Caption(c.getName());
--- 298,303 ----
              companyIndex.put(c, new Integer(i));
              rowVisibilityObservers[i]
!                    = new RowVisibility (this, certPerPlayerYOffset + i, c.getInGameModel());
!             boolean visible = rowVisibilityObservers[i].lastValue();
  
              f = new Caption(c.getName());

Index: GridPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GridPanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GridPanel.java	2 Apr 2010 20:03:54 -0000	1.6
--- GridPanel.java	24 May 2010 11:20:42 -0000	1.7
***************
*** 140,144 ****
              this.rowIndex = rowIndex;
              modelObject.addObserver(this);
!             lastValue = !((BooleanState)modelObject).booleanValue();
          }
  
--- 140,144 ----
              this.rowIndex = rowIndex;
              modelObject.addObserver(this);
!             lastValue = ((BooleanState)modelObject).booleanValue();
          }
  
***************
*** 156,160 ****
          public void update(Observable o1, Object o2) {
              if (o2 instanceof Boolean) {
!                 lastValue = !(Boolean)o2;
                  parent.setRowVisibility(rowIndex, lastValue);
              }
--- 156,160 ----
          public void update(Observable o1, Object o2) {
              if (o2 instanceof Boolean) {
!                 lastValue = (Boolean)o2;
                  parent.setRowVisibility(rowIndex, lastValue);
              }

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** ORPanel.java	24 May 2010 07:49:26 -0000	1.67
--- ORPanel.java	24 May 2010 11:20:42 -0000	1.68
***************
*** 394,398 ****
              c = companies[i];
              rowVisibilityObservers[i]
!                     = new RowVisibility (this, leftCompNameYOffset + i, c.getClosedModel());
              observers.add(rowVisibilityObservers[i]);
  
--- 394,398 ----
              c = companies[i];
              rowVisibilityObservers[i]
!                     = new RowVisibility (this, leftCompNameYOffset + i, c.getInGameModel());
              observers.add(rowVisibilityObservers[i]);
  
***************
*** 985,987 ****
  
  
! }
--- 985,987 ----
  
  
! }
\ No newline at end of file