From: <th...@us...> - 2008-01-30 00:41:45
|
Revision: 5048 http://pcgen.svn.sourceforge.net/pcgen/?rev=5048&view=rev Author: thpr Date: 2008-01-29 16:41:50 -0800 (Tue, 29 Jan 2008) Log Message: ----------- [ 1882119 ] AUTO:SHIELDPROF not working as designed Issue#: 1882119 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Trunk/pcgen/code/src/java/plugin/lsttokens/AutoLst.java Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java Trunk/pcgen/code/src/java/plugin/lsttokens/auto/FeatToken.java Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2008-01-30 00:40:29 UTC (rev 5047) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2008-01-30 00:41:50 UTC (rev 5048) @@ -7685,7 +7685,7 @@ // if (aProf.startsWith("SHIELDTYPE=") || aProf.startsWith("SHIELDTYPE.")) { - armorProfList.add(0, aProf); + shieldProfList.add(0, aProf); } else if (aProf.startsWith("TYPE=") || aProf.startsWith("TYPE.")) { Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/AutoLst.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/AutoLst.java 2008-01-30 00:40:29 UTC (rev 5047) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/AutoLst.java 2008-01-30 00:41:50 UTC (rev 5048) @@ -31,6 +31,7 @@ return false; } String subKey = value.substring(0, barLoc); - return AutoLoader.parseLine(obj, subKey, value, anInt); + return AutoLoader.parseLine(obj, subKey, value.substring(barLoc + 1), + anInt); } } Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java 2008-01-30 00:40:29 UTC (rev 5047) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java 2008-01-30 00:41:50 UTC (rev 5048) @@ -17,6 +17,9 @@ */ package plugin.lsttokens.auto; +import java.util.StringTokenizer; + +import pcgen.core.Constants; import pcgen.core.PObject; import pcgen.persistence.lst.AutoLstToken; import pcgen.util.Logging; @@ -37,10 +40,15 @@ + " is not supported on class level lines"); return false; } - if (value.startsWith("TYPE")) + StringTokenizer st = new StringTokenizer(value, Constants.PIPE); + while (st.hasMoreTokens()) { - Logging.deprecationPrint("TYPE= in AUTO:ARMORPROF is deprecated. " - + "Use ARMORTYPE="); + if (st.nextToken().startsWith("TYPE")) + { + Logging.deprecationPrint("TYPE= in AUTO:ARMORPROF is " + + "deprecated. Use ARMORTYPE="); + break; + } } target.addAutoArray(getTokenName(), value); return true; Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/auto/FeatToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/auto/FeatToken.java 2008-01-30 00:40:29 UTC (rev 5047) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/auto/FeatToken.java 2008-01-30 00:41:50 UTC (rev 5048) @@ -43,9 +43,6 @@ public boolean parse(PObject target, String value, int level) { final StringTokenizer tok = new StringTokenizer(value, Constants.PIPE); - - tok.nextToken(); // Throw away FEAT - ArrayList<Prerequisite> preReqs = new ArrayList<Prerequisite>(); if (level > -9) { Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java 2008-01-30 00:40:29 UTC (rev 5047) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java 2008-01-30 00:41:50 UTC (rev 5048) @@ -17,6 +17,9 @@ */ package plugin.lsttokens.auto; +import java.util.StringTokenizer; + +import pcgen.core.Constants; import pcgen.core.PObject; import pcgen.persistence.lst.AutoLstToken; import pcgen.util.Logging; @@ -37,10 +40,15 @@ + " is not supported on class level lines"); return false; } - if (value.startsWith("TYPE")) + StringTokenizer st = new StringTokenizer(value, Constants.PIPE); + while (st.hasMoreTokens()) { - Logging.deprecationPrint("TYPE= in AUTO:" + getTokenName() - + " is deprecated. " + "Use SHIELDTYPE="); + if (st.nextToken().startsWith("TYPE")) + { + Logging.deprecationPrint("TYPE= in AUTO:SHIELDPROF is " + + "deprecated. Use SHIELDTYPE="); + break; + } } target.addAutoArray(getTokenName(), value); return true; Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java 2008-01-30 00:40:29 UTC (rev 5047) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java 2008-01-30 00:41:50 UTC (rev 5048) @@ -17,6 +17,9 @@ */ package plugin.lsttokens.auto; +import java.util.StringTokenizer; + +import pcgen.core.Constants; import pcgen.core.PObject; import pcgen.persistence.lst.AutoLstToken; import pcgen.util.Logging; @@ -37,12 +40,17 @@ + " is not supported on class level lines"); return false; } - if (value.startsWith("TYPE")) + StringTokenizer st = new StringTokenizer(value, Constants.PIPE); + while (st.hasMoreTokens()) { - Logging.deprecationPrint("TYPE= in AUTO:" + getTokenName() - + " Must refer to the Weapon Proficiency LST File. " - + "Consider WEAPONTYPE= " - + "if you are trying to match an Equipment TYPE"); + if (st.nextToken().startsWith("TYPE")) + { +// Logging.deprecationPrint("TYPE= in AUTO:" + getTokenName() +// + " Must refer to the Weapon Proficiency LST File. " +// + "Consider WEAPONTYPE= " +// + "if you are trying to match an Equipment TYPE"); + break; + } } target.addAutoArray(getTokenName(), value); return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |