[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[8763] VASSAL-src/trunk/src/VA
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2013-06-17 08:22:43
|
Revision: 8763 http://sourceforge.net/p/vassalengine/svn/8763 Author: uckelman Date: 2013-06-17 08:22:38 +0000 (Mon, 17 Jun 2013) Log Message: ----------- Merged Brent-3.2-Work@8760. Fixed Bug 2545: NPE in TurnTracker$SetDialog.addChildControls() Modified Paths: -------------- VASSAL-src/trunk/src/VASSAL/build/module/turn/TurnComponent.java VASSAL-src/trunk/src/VASSAL/i18n/VASSAL.properties Modified: VASSAL-src/trunk/src/VASSAL/build/module/turn/TurnComponent.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/module/turn/TurnComponent.java 2013-06-17 08:17:33 UTC (rev 8762) +++ VASSAL-src/trunk/src/VASSAL/build/module/turn/TurnComponent.java 2013-06-17 08:22:38 UTC (rev 8763) @@ -24,8 +24,11 @@ import java.util.List; import VASSAL.build.AbstractConfigurable; +import VASSAL.build.BadDataReport; import VASSAL.build.Buildable; import VASSAL.build.module.documentation.HelpFile; +import VASSAL.i18n.Resources; +import VASSAL.tools.ErrorDialog; /** * Generic Turn Component @@ -47,9 +50,15 @@ } protected TurnLevel getTurnLevel(int i) { - if (i >= levels.size()) { - return null; + if (levels.size() == 0) { + ErrorDialog.bug(new Exception(Resources.getString("TurnTracker.level_error", i, levels.size()))); } + else { + if (i >= levels.size()) { + ErrorDialog.dataError(new BadDataReport(Resources.getString("TurnTracker.level_error", i, levels.size()), getConfigureName())); + return levels.get(levels.size()-1); + } + } return levels.get(i); } Modified: VASSAL-src/trunk/src/VASSAL/i18n/VASSAL.properties =================================================================== --- VASSAL-src/trunk/src/VASSAL/i18n/VASSAL.properties 2013-06-17 08:17:33 UTC (rev 8762) +++ VASSAL-src/trunk/src/VASSAL/i18n/VASSAL.properties 2013-06-17 08:22:38 UTC (rev 8763) @@ -751,6 +751,7 @@ TurnTracker.discard_changes=Discard Changes TurnTracker.turn_off=Turn off any list items you do not wish to appear TurnTracker.select=Select:\ \ +TurnTracker.level_error=Turn Component %1$s: Level requested (%2$s) greater than number of levels defined (%3$s) # Tutorial Tutorial.Tutorial.loading=Loading tutorial This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |