From: <th...@us...> - 2007-08-20 16:38:34
|
Revision: 3821 http://pcgen.svn.sourceforge.net/pcgen/?rev=3821&view=rev Author: thpr Date: 2007-08-20 09:38:36 -0700 (Mon, 20 Aug 2007) Log Message: ----------- CDOM: Minor cleanup Modified Paths: -------------- branches/cdom/code/src/java/pcgen/persistence/SimpleReferenceContext.java branches/cdom/code/src/java/plugin/lsttokens/auto/EquipToken.java Modified: branches/cdom/code/src/java/pcgen/persistence/SimpleReferenceContext.java =================================================================== --- branches/cdom/code/src/java/pcgen/persistence/SimpleReferenceContext.java 2007-08-20 16:34:02 UTC (rev 3820) +++ branches/cdom/code/src/java/pcgen/persistence/SimpleReferenceContext.java 2007-08-20 16:38:36 UTC (rev 3821) @@ -238,6 +238,15 @@ { throw new IllegalArgumentException(val); } + try + { + Integer.parseInt(val); + throw new IllegalArgumentException(val); + } + catch (NumberFormatException nfe) + { + // ok + } if (val.startsWith("TYPE")) { throw new IllegalArgumentException(val); Modified: branches/cdom/code/src/java/plugin/lsttokens/auto/EquipToken.java =================================================================== --- branches/cdom/code/src/java/plugin/lsttokens/auto/EquipToken.java 2007-08-20 16:34:02 UTC (rev 3820) +++ branches/cdom/code/src/java/plugin/lsttokens/auto/EquipToken.java 2007-08-20 16:38:36 UTC (rev 3821) @@ -77,7 +77,7 @@ public boolean parse(LoadContext context, PObject obj, String value) { - String armorProfs; + String equipItems; Prerequisite prereq = null; // Do not initialize, null is significant! /* @@ -87,12 +87,12 @@ // Note: May contain PRExxx if (value.indexOf("[") == -1) { - armorProfs = value; + equipItems = value; } else { int openBracketLoc = value.indexOf("["); - armorProfs = value.substring(0, openBracketLoc); + equipItems = value.substring(0, openBracketLoc); if (!value.endsWith("]")) { Logging.errorPrint("Unresolved Prerequisite in " @@ -110,7 +110,7 @@ } } - if (hasIllegalSeparator('|', armorProfs)) + if (hasIllegalSeparator('|', equipItems)) { return false; } @@ -118,7 +118,7 @@ boolean foundAny = false; boolean foundOther = false; - StringTokenizer tok = new StringTokenizer(armorProfs, Constants.PIPE); + StringTokenizer tok = new StringTokenizer(equipItems, Constants.PIPE); List<PrereqObject> refs = new ArrayList<PrereqObject>(); while (tok.hasMoreTokens()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |