[pcgen-commit-svn] SF.net SVN: pcgen: [3098] Trunk/pcgen/code/src/java

[<th...@us...>]

Revision: 3098
          http://svn.sourceforge.net/pcgen/?rev=3098&view=rev
Author:   thpr
Date:     2007-05-31 18:37:03 -0700 (Thu, 31 May 2007)

Log Message:
-----------
New CHOOSE system fix:
  Resolves [ 1728855 ] Cannot create custom wand
  
Issue#: 1728855

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/ChooseLoader.java
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/ChooseLstToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/ChooseLst.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProfToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorTypeToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CCSkillListToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CSkillsToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EqBuilderSpellToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EqBuilderToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipTypeToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatAddToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatListToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/HPToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NoChoiceToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NonClassSkillListToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ProficiencyToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SchoolsToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProfToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCCSkillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCSkillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellClassesToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellListToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/StatToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfsToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SkillListToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/WeaponFocusToken.java

Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/ChooseLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/ChooseLoader.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/ChooseLoader.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -43,8 +43,8 @@
 	 * @param source
 	 * @throws PersistenceLayerException
 	 */
-	public static boolean parseToken(PObject target, String key, String value,
-		int level)
+	public static boolean parseToken(PObject target, String prefix, String key,
+		String value, int level)
 	{
 		Map<String, LstToken> tokenMap =
 				TokenStore.inst().getTokenMap(ChooseLstToken.class);
@@ -52,7 +52,7 @@
 		if (token != null)
 		{
 			LstUtils.deprecationCheck(token, target, value);
-			if (!token.parse(target, value))
+			if (!token.parse(target, prefix, value))
 			{
 				//514 deprecation changes
 //				Logging

Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/ChooseLstToken.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/ChooseLstToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/ChooseLstToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -34,5 +34,5 @@
  */
 public interface ChooseLstToken extends LstToken
 {
-	public abstract boolean parse(PObject po, String value);
+	public abstract boolean parse(PObject po, String prefix, String value);
 }

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/ChooseLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/ChooseLst.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/ChooseLst.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -4,8 +4,12 @@
  */
 package plugin.lsttokens;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import pcgen.core.Constants;
 import pcgen.core.PObject;
+import pcgen.core.utils.CoreUtility;
 import pcgen.persistence.lst.ChooseLoader;
 import pcgen.persistence.lst.GlobalLstToken;
 import pcgen.util.Logging;
@@ -31,6 +35,7 @@
 			int activeLoc = 0;
 			String count = null;
 			String maxCount = null;
+			List<String> prefixList = new ArrayList<String>(2);
 			while (true)
 			{
 				int pipeLoc = val.indexOf(Constants.PIPE, activeLoc);
@@ -61,6 +66,7 @@
 								+ value);
 						return false;
 					}
+					prefixList.add(key);
 					count = key.substring(6);
 					if (count == null)
 					{
@@ -79,6 +85,7 @@
 								+ value);
 						return false;
 					}
+					prefixList.add(key);
 					maxCount = key.substring(11);
 					if (maxCount == null || maxCount.length() == 0)
 					{
@@ -93,7 +100,8 @@
 					break;
 				}
 			}
-			boolean parse = ChooseLoader.parseToken(obj, key, val, anInt);
+			String prefixString = CoreUtility.join(prefixList, "|");
+			boolean parse = ChooseLoader.parseToken(obj, prefixString, key, val, anInt);
 			if (!parse)
 			{
 				parseOld(obj, value, anInt);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProfToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProfToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class ArmorProfToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -74,7 +74,13 @@
 				+ " first argument must be an Integer : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorTypeToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorTypeToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorTypeToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,12 +24,18 @@
 public class ArmorTypeToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value == null)
 		{
 			// No args - legal
-			po.setChoiceString(value);
+			StringBuilder sb = new StringBuilder();
+			if (prefix.length() > 0)
+			{
+				sb.append(prefix).append('|');
+			}
+			sb.append(getTokenName());
+			po.setChoiceString(sb.toString());
 			return true;
 		}
 		Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CCSkillListToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CCSkillListToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CCSkillListToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class CCSkillListToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf('|') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator ,, : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CSkillsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CSkillsToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CSkillsToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,12 +24,18 @@
 public class CSkillsToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value == null)
 		{
 			// No args - legal
-			po.setChoiceString(value);
+			StringBuilder sb = new StringBuilder();
+			if (prefix.length() > 0)
+			{
+				sb.append(prefix).append('|');
+			}
+			sb.append(getTokenName());
+			po.setChoiceString(sb.toString());
 			return true;
 		}
 		Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class DomainToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf('|') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator ,, : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EqBuilderSpellToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EqBuilderSpellToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EqBuilderSpellToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -27,7 +27,7 @@
 public class EqBuilderSpellToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value == null)
 		{
@@ -104,7 +104,13 @@
 				return false;
 			}
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EqBuilderToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EqBuilderToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EqBuilderToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,12 +24,22 @@
 public class EqBuilderToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value == null || "1".equals(value))
 		{
 			// No args - legal
-			po.setChoiceString(value);
+			StringBuilder sb = new StringBuilder();
+			if (prefix.length() > 0)
+			{
+				sb.append(prefix).append('|');
+			}
+			sb.append(getTokenName());
+			if (value != null)
+			{
+				sb.append('|').append(value);
+			}
+			po.setChoiceString(sb.toString());
 			return true;
 		}
 		Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipTypeToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipTypeToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipTypeToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class EquipTypeToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf('|') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator .. : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatAddToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatAddToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatAddToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class FeatAddToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator || : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatListToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatListToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatListToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class FeatListToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator || : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class FeatSelectToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator || : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class FeatToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator || : " + value);
 			return false;
 		}
-		po.setChoiceString("FEAT=" + value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append("FEAT=").append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/HPToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/HPToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/HPToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class HPToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf('|') != -1)
 		{
@@ -38,7 +38,13 @@
 				+ " arguments may not contain [] : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NoChoiceToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NoChoiceToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NoChoiceToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,12 +24,18 @@
 public class NoChoiceToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value == null)
 		{
 			// No args - legal
-			po.setChoiceString(value);
+			StringBuilder sb = new StringBuilder();
+			if (prefix.length() > 0)
+			{
+				sb.append(prefix).append('|');
+			}
+			sb.append(getTokenName());
+			po.setChoiceString(sb.toString());
 			return true;
 		}
 		Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NonClassSkillListToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NonClassSkillListToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NonClassSkillListToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class NonClassSkillListToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator || : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -27,7 +27,7 @@
 public class NumberToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -93,7 +93,13 @@
 				+ " third argument was not TITLE=");
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ProficiencyToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ProficiencyToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ProficiencyToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -27,7 +27,7 @@
 public class ProficiencyToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -89,7 +89,13 @@
 				+ " second argument was not PC, ALL, or UNIQUE");
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SchoolsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SchoolsToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SchoolsToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,12 +24,18 @@
 public class SchoolsToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value == null || "1".equals(value))
 		{
 			// No args - legal
-			po.setChoiceString(value);
+			StringBuilder sb = new StringBuilder();
+			if (prefix.length() > 0)
+			{
+				sb.append(prefix).append('|');
+			}
+			sb.append(getTokenName());
+			po.setChoiceString(sb.toString());
 			return true;
 		}
 		Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProfToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProfToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class ShieldProfToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator || : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCCSkillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCCSkillToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCCSkillToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class SkillsNamedToCCSkillToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator || : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCSkillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCSkillToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCSkillToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class SkillsNamedToCSkillToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator || : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class SkillsNamedToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator || : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,12 +24,18 @@
 public class SkillsToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value == null)
 		{
 			// No args - legal
-			po.setChoiceString(value);
+			StringBuilder sb = new StringBuilder();
+			if (prefix.length() > 0)
+			{
+				sb.append(prefix).append('|');
+			}
+			sb.append(getTokenName());
+			po.setChoiceString(sb.toString());
 			return true;
 		}
 		Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellClassesToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellClassesToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellClassesToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,12 +24,18 @@
 public class SpellClassesToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value == null)
 		{
 			// No args - legal
-			po.setChoiceString(value);
+			StringBuilder sb = new StringBuilder();
+			if (prefix.length() > 0)
+			{
+				sb.append(prefix).append('|');
+			}
+			sb.append(getTokenName());
+			po.setChoiceString(sb.toString());
 			return true;
 		}
 		Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellListToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellListToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellListToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class SpellListToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -63,7 +63,13 @@
 				+ " argument was not Y or N");
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -27,7 +27,7 @@
 public class SpellsToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -72,7 +72,13 @@
 				return false;
 			}
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/StatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/StatToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/StatToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -30,7 +30,7 @@
 public class StatToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value == null)
 		{
@@ -76,7 +76,13 @@
 			Logging.errorPrint("Did not find STAT: " + tokText
 				+ " used in CHOOSE: " + value);
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class UserInputToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -87,7 +87,13 @@
 				+ " second argument must end with \" : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class WeaponProfToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -74,7 +74,13 @@
 				+ " first argument must be an Integer : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfsToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfsToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -24,7 +24,7 @@
 public class WeaponProfsToken implements ChooseLstToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		if (value.indexOf(',') != -1)
 		{
@@ -56,7 +56,13 @@
 				+ " arguments uses double separator || : " + value);
 			return false;
 		}
-		po.setChoiceString(value);
+		StringBuilder sb = new StringBuilder();
+		if (prefix.length() > 0)
+		{
+			sb.append(prefix).append('|');
+		}
+		sb.append(getTokenName()).append('|').append(value);
+		po.setChoiceString(sb.toString());
 		return true;
 	}
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SkillListToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SkillListToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SkillListToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -25,7 +25,7 @@
 public class SkillListToken implements ChooseLstToken, DeprecatedToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		Logging.errorPrint("CHOOSE:SKILLLIST (or CHOOSE:SKILLIST)"
 			+ "is non-functioning and deprecated: " + value);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/WeaponFocusToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/WeaponFocusToken.java	2007-06-01 00:44:24 UTC (rev 3097)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/WeaponFocusToken.java	2007-06-01 01:37:03 UTC (rev 3098)
@@ -25,7 +25,7 @@
 public class WeaponFocusToken implements ChooseLstToken, DeprecatedToken
 {
 
-	public boolean parse(PObject po, String value)
+	public boolean parse(PObject po, String prefix, String value)
 	{
 		Logging.errorPrint("CHOOSE:WEAPONFOCUS is deprecated: " + value);
 		Logging.errorPrint("  Please use CHOOSE:FEAT=???");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.