[Rails-commits] 18xx/rails/ui/swing/hexmap GUITile.java,1.17,1.18

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

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

Modified Files:
	GUITile.java 
Log Message:
More rationalising of static method usage

Index: GUITile.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUITile.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** GUITile.java	2 Nov 2009 23:30:36 -0000	1.17
--- GUITile.java	4 Nov 2009 20:33:22 -0000	1.18
***************
*** 30,36 ****
      protected double tileScale = GUIHex.NORMAL_SCALE;
  
!     protected static double baseRotation;
! 
!     protected static boolean initialised = false;
  
      protected MapHex hex = null;
--- 30,34 ----
      protected double tileScale = GUIHex.NORMAL_SCALE;
  
!     protected double baseRotation;
  
      protected MapHex hex = null;
***************
*** 48,58 ****
          this.tileId = tileId;
          this.hex = hex;
!         tile = TileManager.get().getTile(tileId);
          tileImage = imageLoader.getTile(tileId);
  
-         if (!initialised) initialise();
-     }
- 
-     private void initialise() {
          if (hex.getTileOrientation() == MapHex.EW) {
              baseRotation = 0.5 * DEG60;
--- 46,52 ----
          this.tileId = tileId;
          this.hex = hex;
!         tile = GameManager.getInstance().getTileManager().getTile(tileId);
          tileImage = imageLoader.getTile(tileId);
  
          if (hex.getTileOrientation() == MapHex.EW) {
              baseRotation = 0.5 * DEG60;
***************
*** 60,64 ****
              baseRotation = 0.0;
          }
-         initialised = true;
      }
  
--- 54,57 ----