From: <th...@us...> - 2008-10-31 22:39:14
|
Revision: 8287 http://pcgen.svn.sourceforge.net/pcgen/?rev=8287&view=rev Author: thpr Date: 2008-10-31 22:39:10 +0000 (Fri, 31 Oct 2008) Log Message: ----------- remove support for COUNT= prefix on CHOOSE Modified Paths: -------------- Trunk/pcgen/code/src/java/plugin/lsttokens/ChooseLst.java Trunk/pcgen/code/src/java/plugin/lsttokens/equipmentmodifier/ChooseToken.java Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/ChooseLst.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/ChooseLst.java 2008-10-31 21:58:12 UTC (rev 8286) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/ChooseLst.java 2008-10-31 22:39:10 UTC (rev 8287) @@ -49,7 +49,6 @@ String key; String val = value; int activeLoc = 0; - String count = null; String maxCount = null; List<String> prefixList = new ArrayList<String>(2); while (true) @@ -70,30 +69,8 @@ key = val.substring(activeLoc, pipeLoc); val = val.substring(pipeLoc + 1); } - if (key.startsWith("COUNT=")) + if (key.startsWith("NUMCHOICES=")) { - if (count != null) - { - Logging - .errorPrint("Cannot use COUNT more than once in CHOOSE: " - + value); - return false; - } - prefixList.add(key); - count = key.substring(6); - if (count == null) - { - Logging.errorPrint("COUNT in CHOOSE must be a formula: " - + value); - return false; - } - Logging - .deprecationPrint("Support for COUNT= in CHOOSE" - + "is tenuous, at best, use the SELECT: token " - + value); - } - else if (key.startsWith("NUMCHOICES=")) - { if (maxCount != null) { Logging Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/equipmentmodifier/ChooseToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/equipmentmodifier/ChooseToken.java 2008-10-31 21:58:12 UTC (rev 8286) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/equipmentmodifier/ChooseToken.java 2008-10-31 22:39:10 UTC (rev 8287) @@ -31,7 +31,6 @@ String key; String val = value; int activeLoc = 0; - String count = null; String maxCount = null; List<String> prefixList = new ArrayList<String>(2); while (true) @@ -47,27 +46,8 @@ key = val.substring(activeLoc, pipeLoc); val = val.substring(pipeLoc + 1); } - if (key.startsWith("COUNT=")) + if (key.startsWith("NUMCHOICES=")) { - if (count != null) - { - Logging - .errorPrint("Cannot use COUNT more than once in CHOOSE: " - + value); - return false; - } - prefixList.add(key); - count = key.substring(6); - if (count == null) - { - Logging.errorPrint("COUNT in CHOOSE must be a formula: " - + value); - return false; - } - activeLoc += key.length() + 1; - } - else if (key.startsWith("NUMCHOICES=")) - { if (maxCount != null) { Logging This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |