[Rails-devel] Fix for MapHex Display Problem

[<Dr....@t-...>]

Hi, 

	please find enclosed the patch for the small problem created with the
introduction of tilebased pictureIDs. 

	Autor: Martin Brumm <Dr....@t-...>  2012-03-18
10:01:39
Eintragender: Martin Brumm <Dr....@t-...>  2012-03-18
10:01:39
Eltern: a384f297999ccc2de0d66a1c9d836b37d6e45dd8 (Fixed the startprice
but didnt remove the pop up for IG/BCR)
Zweig: master
Folgt auf: v1.5.0
Vorgänger von: 

    Fixed new pictureID Display. Tiles with a positive Picture ID have
    preference over hex.PictureIDs.

---------------------- rails/ui/swing/hexmap/GUITile.java
----------------------
index f7162f9..5ccf092 100644
@@ -53,7 +53,12 @@ public class GUITile {
         this.hex = (MapHex)guiHex.getModel();
         TileManager tileManager =
guiHex.getHexMap().orUIManager.getTileManager();
         tile = tileManager.getTile(tileId);
-        picId = hex.getPictureId();
+        
+        if (tile.getPictureId() >0 ) { 
+            picId= tile.getPictureId();
+        } else {        
+                picId = hex.getPictureId();
+        }

         if (hex.getTileOrientation() == TileOrientation.EW) {
             baseRotation = 0.5 * DEG60;