[Freecol-commits] freecol/src/net/sf/freecol/client/gui GUI.java, 1.130, 1.131

[kloune <kl...@us...>]

Update of /cvsroot/freecol/freecol/src/net/sf/freecol/client/gui
In directory sc8-pr-cvs17:/tmp/cvs-serv13336/src/net/sf/freecol/client/gui

Modified Files:
	GUI.java 
Log Message:
- Number of inhabitants not shown anymore in the colony dialog on the colony tile
- Some code cleanup

Index: GUI.java
===================================================================
RCS file: /cvsroot/freecol/freecol/src/net/sf/freecol/client/gui/GUI.java,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** GUI.java	24 Jun 2007 10:18:11 -0000	1.130
--- GUI.java	24 Jun 2007 14:42:45 -0000	1.131
***************
*** 1013,1017 ****
                      
                      // Display the Tile overlays:
!                     displayTileOverlays(g, map, tile, xx, yy, true);
                      
                      if(viewMode.displayTileCursor(tile,xx,yy)){
--- 1013,1017 ----
                      
                      // Display the Tile overlays:
!                     displayTileOverlays(g, map, tile, xx, yy, true, true);
                      
                      if(viewMode.displayTileCursor(tile,xx,yy)){
***************
*** 1684,1688 ****
              g.drawImage(lib.getMiscImage(ImageLibrary.TILE_TAKEN), x, y, null);
          }
!         displayTileOverlays(g, map, tile, x, y, false);
          
          int nation = tile.getNationOwner();
--- 1684,1688 ----
              g.drawImage(lib.getMiscImage(ImageLibrary.TILE_TAKEN), x, y, null);
          }
!         displayTileOverlays(g, map, tile, x, y, false, false);
          
          int nation = tile.getNationOwner();
***************
*** 1764,1768 ****
      public void displayTile(Graphics2D g, Map map, Tile tile, int x, int y, boolean drawUnexploredBorders) {
          displayBaseTile(g, map, tile, x, y, drawUnexploredBorders);
!         displayTileOverlays(g, map, tile, x, y, drawUnexploredBorders);
      }
  
--- 1764,1768 ----
      public void displayTile(Graphics2D g, Map map, Tile tile, int x, int y, boolean drawUnexploredBorders) {
          displayBaseTile(g, map, tile, x, y, drawUnexploredBorders);
!         displayTileOverlays(g, map, tile, x, y, drawUnexploredBorders, true);
      }
  
***************
*** 1835,1842 ****
       * @param drawUnexploredBorders If true; draws border between explored and
       *        unexplored terrain.
       */
!     private void displayTileOverlays(Graphics2D g, Map map, Tile tile, int x, int y, boolean drawUnexploredBorders) {  
          displayAdditionsAndImprovements(g, map, tile, x, y);
!         displaySettlement(g, map, tile, x, y);
          displayFogOfWar(g, map, tile, x, y);
          if (drawUnexploredBorders)
--- 1835,1843 ----
       * @param drawUnexploredBorders If true; draws border between explored and
       *        unexplored terrain.
+      * @param withNumber indicates if the number of inhabitants should be drawn too.
       */
!     private void displayTileOverlays(Graphics2D g, Map map, Tile tile, int x, int y, boolean drawUnexploredBorders, boolean withNumber) {  
          displayAdditionsAndImprovements(g, map, tile, x, y);
!         displaySettlement(g, map, tile, x, y, withNumber);
          displayFogOfWar(g, map, tile, x, y);
          if (drawUnexploredBorders)
***************
*** 1978,1982 ****
       * (in pixels).
       */
!     private void displaySettlement(Graphics2D g, Map map, Tile tile, int x, int y) {  
          if (tile.isExplored()) {
              Settlement settlement = tile.getSettlement();
--- 1979,1983 ----
       * (in pixels).
       */
!     private void displaySettlement(Graphics2D g, Map map, Tile tile, int x, int y, boolean withNumber) {  
          if (tile.isExplored()) {
              Settlement settlement = tile.getSettlement();
***************
*** 1989,1997 ****
                      g.drawImage(lib.getColonyImage(type), x + (lib.getTerrainImageWidth(tile.getType()) - lib.getColonyImageWidth(type)) / 2, y + (lib.getTerrainImageHeight(tile.getType()) - lib.getColonyImageHeight(type)) / 2, null);
  
!                     String populationString = Integer.toString(((Colony)settlement).getUnitCount());
!                     Color theColor = null;
  
!                     int bonus = ((Colony)settlement).getProductionBonus();
!                     switch (bonus) {
                          case 2:
                              theColor = Color.BLUE;
--- 1990,1999 ----
                      g.drawImage(lib.getColonyImage(type), x + (lib.getTerrainImageWidth(tile.getType()) - lib.getColonyImageWidth(type)) / 2, y + (lib.getTerrainImageHeight(tile.getType()) - lib.getColonyImageHeight(type)) / 2, null);
  
!                     if (withNumber) {
!                         String populationString = Integer.toString(((Colony)settlement).getUnitCount());
!                         Color theColor = null;
  
!                         int bonus = ((Colony)settlement).getProductionBonus();
!                         switch (bonus) {
                          case 2:
                              theColor = Color.BLUE;
***************
*** 2008,2017 ****
                          default:
                              theColor = Color.WHITE;
!                             break;
!                     }
! 
!                     BufferedImage stringImage = createStringImage(g, populationString, theColor, lib.getTerrainImageWidth(tile.getType()), 12);
!                     g.drawImage(stringImage, x + (lib.getTerrainImageWidth(tile.getType()) - stringImage.getWidth())/2 + 1, y + ((lib.getTerrainImageHeight(tile.getType()) - stringImage.getHeight()) / 2) + 1, null);
  
                      g.setColor(Color.BLACK);
                  } else if (settlement instanceof IndianSettlement) {
--- 2010,2019 ----
                          default:
                              theColor = Color.WHITE;
!                         break;
!                         }
  
+                         BufferedImage stringImage = createStringImage(g, populationString, theColor, lib.getTerrainImageWidth(tile.getType()), 12);
+                         g.drawImage(stringImage, x + (lib.getTerrainImageWidth(tile.getType()) - stringImage.getWidth())/2 + 1, y + ((lib.getTerrainImageHeight(tile.getType()) - stringImage.getHeight()) / 2) + 1, null);
+                     }
                      g.setColor(Color.BLACK);
                  } else if (settlement instanceof IndianSettlement) {