[vassalengine-svn] SF.net SVN: vassalengine:[4517] VASSAL-src/trunk

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

Revision: 4517
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4517&view=rev
Author:   uckelman
Date:     2008-11-22 11:48:22 +0000 (Sat, 22 Nov 2008)

Log Message:
-----------
Merged swampwallaby-work 4515.
Fixed Bug 2316022: ArithmeticException in PropertySheet.TickLabel.mouseClicked

Modified Paths:
--------------
    VASSAL-src/trunk/NOTES
    VASSAL-src/trunk/src/VASSAL/counters/PropertySheet.java

Modified: VASSAL-src/trunk/NOTES
===================================================================
--- VASSAL-src/trunk/NOTES	2008-11-22 04:37:04 UTC (rev 4516)
+++ VASSAL-src/trunk/NOTES	2008-11-22 11:48:22 UTC (rev 4517)
@@ -27,8 +27,7 @@
 
 A number of problems present in 3.1.0-beta5 are fixed in 3.1.0-beta6:
 
-HEAD=4508
-
+* Bug 2316022: ArithmeticException in PropertySheet.TickLabel.mouseClicked
 * Bug 2309593: Move Fixed Distance auto-report never turns off
 * Bug 2306908: Default option for 'Auto-Report Moves' should be Always
 * Bug 2306873: Not a Number when referencing DiceButton value in Edit mode
@@ -41,6 +40,7 @@
 * Bug 2280943: Delete key no longer deletes elements in Edit Mode
 * Bug 2280253: NPE if no Key Command specified
 * Bug 2273032: NPE in PlaceMarker.placeMarker()
+* Bug 2261405: Unable to move region in irregular grid
 * Bug 2259361: NPE in FreeRotator.mouseReleased()
 * Bug 2254357: StringIndexOutOfBoundsException in FormattedStringConfigurer
 * Bug 2250058: NPE when adding a Place Marker to a prototype.

Modified: VASSAL-src/trunk/src/VASSAL/counters/PropertySheet.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/counters/PropertySheet.java	2008-11-22 04:37:04 UTC (rev 4516)
+++ VASSAL-src/trunk/src/VASSAL/counters/PropertySheet.java	2008-11-22 11:48:22 UTC (rev 4517)
@@ -1209,7 +1209,8 @@
         numRows = dx < 3 ? 3 : dx < 6 ? 2 : 1;
 
         dx = Math.min(displayWidth * numRows / maxTicks, Math.min(getHeight() / numRows, 10));
-
+        if (dx < 1) dx = 1;
+        
         numCols = (maxTicks + numRows - 1) / numRows;
 
         int dy = dx;


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