[vassalengine-svn] SF.net SVN: vassalengine:[4363] VASSAL-src/trunk/src/VASSAL/build/module/ map/boardPicker/board/HexGrid.java

[<uck...@us...>]

Revision: 4363
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4363&view=rev
Author:   uckelman
Date:     2008-10-29 15:46:05 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
Merged swampwallaby-work 4356.
Fixed Bug 2194826: ArithmeticException in HexGrid.HexGridEditor.check().

Modified Paths:
--------------
    VASSAL-src/trunk/src/VASSAL/build/module/map/boardPicker/board/HexGrid.java

Modified: VASSAL-src/trunk/src/VASSAL/build/module/map/boardPicker/board/HexGrid.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/build/module/map/boardPicker/board/HexGrid.java	2008-10-29 15:38:52 UTC (rev 4362)
+++ VASSAL-src/trunk/src/VASSAL/build/module/map/boardPicker/board/HexGrid.java	2008-10-29 15:46:05 UTC (rev 4363)
@@ -942,6 +942,10 @@
       
       int r = abs(p1.x - p2.x);
       int width = r * 3 / 2;
+      if (width < 1) {
+        reportShapeError();
+        return;
+      }
       int height = abs(p3.y - p2.y) * 2;
       
       int Xoff = min(p1.x, p2.x) % width + r/2;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.