[Rails-commits] 18xx/rails/ui/swing StatusWindow.java, 1.29, 1.30 ORPanel.java, 1.33, 1.34

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

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

Modified Files:
	StatusWindow.java ORPanel.java 
Log Message:
Implemented request to show low-price colours in SR and OR panels.
Added a generic Model-to-View update mechanism (used by above)
All configurable colours can now be specified as RGB decimally or hexadecimally.

Index: StatusWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/StatusWindow.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** StatusWindow.java	27 Nov 2009 20:32:44 -0000	1.29
--- StatusWindow.java	13 Dec 2009 16:39:47 -0000	1.30
***************
*** 81,92 ****
              new ArrayList<ActionMenuItem>();
  
-     /**
-      * Selector for the pattern to be used in keeping the individual UI fields
-      * up-to-date: <br> - true: push changes (via the Observer/Observable
-      * pattern), <br> - false: pull everything on repaint. NOTE: currently,
-      * 'false' does not work for the stock chart.
-      */
-     public static boolean useObserver = true;
- 
      protected static Logger log =
              Logger.getLogger(StatusWindow.class.getPackage().getName());
--- 81,84 ----

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ORPanel.java	12 Sep 2009 19:48:39 -0000	1.33
--- ORPanel.java	13 Dec 2009 16:39:47 -0000	1.34
***************
*** 217,233 ****
  
      public void redisplay() {
!         if (StatusWindow.useObserver) {
!             revalidate();
!         } else {
!             repaint();
!         }
      }
  
      private void deRegisterObservers() {
          log.debug("Deregistering observers");
!         if (StatusWindow.useObserver) {
!             for (ViewObject vo : observers) {
!                 vo.deRegister();
!             }
          }
      }
--- 217,227 ----
  
      public void redisplay() {
!         revalidate();
      }
  
      private void deRegisterObservers() {
          log.debug("Deregistering observers");
!         for (ViewObject vo : observers) {
!             vo.deRegister();
          }
      }
***************
*** 491,495 ****
          statusPanel.add(comp, gbc);
  
!         if (StatusWindow.useObserver && comp instanceof ViewObject
              && ((ViewObject) comp).getModel() != null) {
              observers.add((ViewObject) comp);
--- 485,489 ----
          statusPanel.add(comp, gbc);
  
!         if (comp instanceof ViewObject
              && ((ViewObject) comp).getModel() != null) {
              observers.add((ViewObject) comp);