[vassalengine-svn] SF.net SVN: vassalengine:[4371] VASSAL-src/trunk/src/VASSAL/build/widget/ PieceS
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2008-10-31 22:07:27
|
Revision: 4371 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4371&view=rev Author: uckelman Date: 2008-10-31 22:07:13 +0000 (Fri, 31 Oct 2008) Log Message: ----------- Merged swampwallaby-work 4369. RFE 2193791: Pieces in palette to show correct dynamic property values. Also fixes Bad Data Errors when opening palette. Modified Paths: -------------- VASSAL-src/trunk/src/VASSAL/build/widget/PieceSlot.java Modified: VASSAL-src/trunk/src/VASSAL/build/widget/PieceSlot.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/widget/PieceSlot.java 2008-10-31 05:41:41 UTC (rev 4370) +++ VASSAL-src/trunk/src/VASSAL/build/widget/PieceSlot.java 2008-10-31 22:07:13 UTC (rev 4371) @@ -132,10 +132,12 @@ panel.getSize().height / 2)); } } + if (c != null) { c.setProperty(Properties.PIECE_ID, getGpId()); } - return c; + + return PieceCloner.getInstance().clonePiece(c); } public void paint(Graphics g) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |