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-serv2758/rails/ui/swing

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

Index: GameStatus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameStatus.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** GameStatus.java	24 May 2010 11:20:42 -0000	1.48
--- GameStatus.java	24 May 2010 11:42:35 -0000	1.49
***************
*** 298,302 ****
              companyIndex.put(c, new Integer(i));
              rowVisibilityObservers[i]
!                    = new RowVisibility (this, certPerPlayerYOffset + i, c.getInGameModel());
              boolean visible = rowVisibilityObservers[i].lastValue();
  
--- 298,302 ----
              companyIndex.put(c, new Integer(i));
              rowVisibilityObservers[i]
!                    = new RowVisibility (this, certPerPlayerYOffset + i, c.getInGameModel(), false);
              boolean visible = rowVisibilityObservers[i].lastValue();
  

Index: GridPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GridPanel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GridPanel.java	24 May 2010 11:20:42 -0000	1.7
--- GridPanel.java	24 May 2010 11:42:35 -0000	1.8
***************
*** 134,144 ****
          private int rowIndex;
          private boolean lastValue;
  
!         public RowVisibility (GridPanel parent, int rowIndex, ModelObject model) {
              this.parent = parent;
              this.modelObject = model;
              this.rowIndex = rowIndex;
              modelObject.addObserver(this);
!             lastValue = ((BooleanState)modelObject).booleanValue();
          }
  
--- 134,146 ----
          private int rowIndex;
          private boolean lastValue;
+         private boolean reverseValue;
  
!         public RowVisibility (GridPanel parent, int rowIndex, ModelObject model, boolean reverseValue) {
              this.parent = parent;
              this.modelObject = model;
              this.rowIndex = rowIndex;
+             this.reverseValue = reverseValue;
              modelObject.addObserver(this);
!             lastValue = ((BooleanState)modelObject).booleanValue() != reverseValue;
          }
  

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** ORPanel.java	24 May 2010 11:20:42 -0000	1.68
--- ORPanel.java	24 May 2010 11:42:35 -0000	1.69
***************
*** 394,398 ****
              c = companies[i];
              rowVisibilityObservers[i]
!                     = new RowVisibility (this, leftCompNameYOffset + i, c.getInGameModel());
              observers.add(rowVisibilityObservers[i]);
  
--- 394,398 ----
              c = companies[i];
              rowVisibilityObservers[i]
!                     = new RowVisibility (this, leftCompNameYOffset + i, c.getInGameModel(), true);
              observers.add(rowVisibilityObservers[i]);