[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[8184] VASSAL-src/trunk
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2012-05-29 21:22:12
|
Revision: 8184 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8184&view=rev Author: uckelman Date: 2012-05-29 21:22:05 +0000 (Tue, 29 May 2012) Log Message: ----------- Merged 3.1@8182. Fixed Bug 4473: TabWidget updates its name using stale values Modified Paths: -------------- VASSAL-src/trunk/src/VASSAL/build/widget/TabWidget.java Property Changed: ---------------- VASSAL-src/trunk/ Property changes on: VASSAL-src/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813,7872,7876,7879,7909,7913,7964,7966,7968,7998,8097,8111-8112,8159-8162,8172,8181 /VASSAL-src/branches/brent-3.2:7824-7825,7862-7865,7875,7878,7882,7884,7886,7896,7903,7911,7917,7929,7942,7988,7995 /VASSAL-src/branches/george973-bugs:7800,7806,7962-7963 /VASSAL-src/branches/george973-bugs-3.2:8081 /VASSAL-src/branches/george973-ocs:8167-8169 /VASSAL-src/branches/lance-3.2 8085:8127 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/pgeerkens-3.2:7836-7837,7839,7841-7842,7849,7893,7899,7902,7904,7906,7922,7930 /VASSAL-src/branches/uckelman-integration:7971-8007 /VASSAL-src/branches/uckelman-working2:7194-7700 /VASSAL-src/branches/viewport-3.2:7992 + /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813,7872,7876,7879,7909,7913,7964,7966,7968,7998,8097,8111-8112,8159-8162,8172,8181-8182 /VASSAL-src/branches/brent-3.2:7824-7825,7862-7865,7875,7878,7882,7884,7886,7896,7903,7911,7917,7929,7942,7988,7995 /VASSAL-src/branches/george973-bugs:7800,7806,7962-7963 /VASSAL-src/branches/george973-bugs-3.2:8081 /VASSAL-src/branches/george973-ocs:8167-8169 /VASSAL-src/branches/lance-3.2 8085:8127 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/pgeerkens-3.2:7836-7837,7839,7841-7842,7849,7893,7899,7902,7904,7906,7922,7930 /VASSAL-src/branches/uckelman-integration:7971-8007 /VASSAL-src/branches/uckelman-working2:7194-7700 /VASSAL-src/branches/viewport-3.2:7992 Modified: VASSAL-src/trunk/src/VASSAL/build/widget/TabWidget.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/widget/TabWidget.java 2012-05-29 21:15:46 UTC (rev 8183) +++ VASSAL-src/trunk/src/VASSAL/build/widget/TabWidget.java 2012-05-29 21:22:05 UTC (rev 8184) @@ -94,11 +94,8 @@ if (Configurable.NAME_PROPERTY.equals(evt.getPropertyName())) { final Widget src = (Widget) evt.getSource(); final int index = widgets.indexOf(src); - String name = src.getConfigureName(); - if (name == null) { - name = ""; - } - tab.setTitleAt(index, name); + final Object name = evt.getNewValue(); + tab.setTitleAt(index, name == null ? "" : name.toString()); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |