[Rails-commits] 18xx/rails/ui/swing/hexmap GUIHex.java, 1.20, 1.21 HexMap.java, 1.15, 1.16

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

Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28138/rails/ui/swing/hexmap

Modified Files:
	GUIHex.java HexMap.java 
Log Message:
Removed statics from some manager classes

Index: GUIHex.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUIHex.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** GUIHex.java	2 Dec 2008 20:29:15 -0000	1.20
--- GUIHex.java	8 Sep 2009 21:48:57 -0000	1.21
***************
*** 58,62 ****
       * Stores the neighbouring views. This parallels the neighors field in
       * MapHex, just on the view side.
!      * 
       * @todo check if we can avoid this
       */
--- 58,62 ----
       * Stores the neighbouring views. This parallels the neighors field in
       * MapHex, just on the view side.
!      *
       * @todo check if we can avoid this
       */
***************
*** 554,558 ****
                          "): value ");
                  if (model.hasOffBoardValues()) {
!                     tt.append(model.getCurrentOffBoardValue()).append(" [");
                      int[] values = model.getOffBoardValues();
                      for (int i = 0; i < values.length; i++) {
--- 554,558 ----
                          "): value ");
                  if (model.hasOffBoardValues()) {
!                     tt.append(model.getCurrentOffBoardValue(hexMap.getPhase())).append(" [");
                      int[] values = model.getOffBoardValues();
                      for (int i = 0; i < values.length; i++) {

Index: HexMap.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/HexMap.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** HexMap.java	4 May 2009 20:29:15 -0000	1.15
--- HexMap.java	8 Sep 2009 21:48:58 -0000	1.16
***************
*** 3,21 ****
  
  import java.awt.*;
- import java.awt.geom.*;
  import java.awt.event.*;
  import java.util.*;
  import java.util.List;
  
! import javax.swing.*;
  
  import org.apache.log4j.Logger;
  
! import rails.game.*;
! import rails.game.action.LayBonusToken;
! import rails.game.action.LayTile;
! import rails.game.action.LayBaseToken;
! import rails.game.action.LayToken;
! import rails.ui.swing.*;
  
  /**
--- 3,20 ----
  
  import java.awt.*;
  import java.awt.event.*;
+ import java.awt.geom.Point2D;
  import java.util.*;
  import java.util.List;
  
! import javax.swing.JComponent;
  
  import org.apache.log4j.Logger;
  
! import rails.game.MapHex;
! import rails.game.PhaseI;
! import rails.game.action.*;
! import rails.ui.swing.ORUIManager;
! import rails.ui.swing.Scale;
  
  /**
***************
*** 95,104 ****
          return null;
      }
!     
      public GUIHex getHexByName (String hexName) {
          return hexesByName.get (hexName);
      }
  
!     public void paintComponent(Graphics g) {
          super.paintComponent(g);
  
--- 94,104 ----
          return null;
      }
! 
      public GUIHex getHexByName (String hexName) {
          return hexesByName.get (hexName);
      }
  
!     @Override
! 	public void paintComponent(Graphics g) {
          super.paintComponent(g);
  
***************
*** 124,130 ****
      }
  
!     public Dimension getMinimumSize() {
          Dimension dim = new Dimension();
!         Rectangle r = ((GUIHex) h[h.length][h[0].length]).getBounds();
          dim.height = r.height + 40;
          dim.width = r.width + 100;
--- 124,131 ----
      }
  
!     @Override
! 	public Dimension getMinimumSize() {
          Dimension dim = new Dimension();
!         Rectangle r = (h[h.length][h[0].length]).getBounds();
          dim.height = r.height + 40;
          dim.width = r.width + 100;
***************
*** 132,136 ****
      }
  
!     public Dimension getPreferredSize() {
          return preferredSize;
      }
--- 133,138 ----
      }
  
!     @Override
! 	public Dimension getPreferredSize() {
          return preferredSize;
      }
***************
*** 282,285 ****
--- 284,300 ----
      }
  
+     /**
+      * Off-board tiles must be able to retrieve the current phase.
+      *
+      * @return The current Phase object.
+      */
+     public PhaseI getPhase () {
+     	if (orUIManager != null) {
+     		return orUIManager.getGameUIManager().getGameManager().getPhaseManager().getCurrentPhase();
+     	} else {
+     		return null;
+     	}
+     }
+ 
      public void mouseClicked(MouseEvent arg0) {
          Point point = arg0.getPoint();
***************
*** 291,295 ****
      /*
       * (non-Javadoc)
!      * 
       * @see java.awt.event.MouseMotionListener#mouseDragged(java.awt.event.MouseEvent)
       */
--- 306,310 ----
      /*
       * (non-Javadoc)
!      *
       * @see java.awt.event.MouseMotionListener#mouseDragged(java.awt.event.MouseEvent)
       */
***************
*** 298,302 ****
      /*
       * (non-Javadoc)
!      * 
       * @see java.awt.event.MouseMotionListener#mouseMoved(java.awt.event.MouseEvent)
       */
--- 313,317 ----
      /*
       * (non-Javadoc)
!      *
       * @see java.awt.event.MouseMotionListener#mouseMoved(java.awt.event.MouseEvent)
       */
***************
*** 315,319 ****
      public void mouseReleased(MouseEvent arg0) {}
  
!     public static void updateOffBoardToolTips() {
          for (GUIHex hex : hexes) {
              if (hex.getHexModel().hasOffBoardValues()) {
--- 330,334 ----
      public void mouseReleased(MouseEvent arg0) {}
  
!     public void updateOffBoardToolTips() {
          for (GUIHex hex : hexes) {
              if (hex.getHexModel().hasOffBoardValues()) {