[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[7765] VASSAL-src/trunk
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2011-08-17 18:49:15
|
Revision: 7765 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7765&view=rev Author: uckelman Date: 2011-08-17 18:49:07 +0000 (Wed, 17 Aug 2011) Log Message: ----------- Merged 3.1@7764. Fixed Bug 3115: NPE in PlayerHand.mapSize(). Check whether Piece.getMap() == nu ll before calling Map.boundingBoxOf(). Modified Paths: -------------- VASSAL-src/trunk/src/VASSAL/build/module/PlayerHand.java Property Changed: ---------------- VASSAL-src/trunk/ Property changes on: VASSAL-src/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /VASSAL-src/branches/3.1:7756 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/uckelman-working2:7194-7700 + /VASSAL-src/branches/3.1:7756,7764 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/uckelman-working2:7194-7700 Modified: VASSAL-src/trunk/src/VASSAL/build/module/PlayerHand.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/module/PlayerHand.java 2011-08-17 18:29:35 UTC (rev 7764) +++ VASSAL-src/trunk/src/VASSAL/build/module/PlayerHand.java 2011-08-17 18:49:07 UTC (rev 7765) @@ -65,8 +65,15 @@ public Dimension mapSize() { final Rectangle r = new Rectangle(0,0,200,200); - for (GamePiece p : pieces.getPieces()) r.add(boundingBoxOf(p)); r.add(new Rectangle(super.mapSize())); + + for (GamePiece p : pieces.getPieces()) { + final Rectangle bb = boundingBoxOf(p); + if (bb != null) { + r.add(bb); + } + } + return r.getSize(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Get a FREE DOWNLOAD! and learn more about uberSVN rich system, user administration capabilities and model configuration. Take the hassle out of deploying and managing Subversion and the tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2 _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |