Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen:[15065] Trunk/pcgen/code/src/java
|
From: <nu...@us...> - 2011-05-29 22:38:49
|
Revision: 15065
http://pcgen.svn.sourceforge.net/pcgen/?rev=15065&view=rev
Author: nuance
Date: 2011-05-29 22:38:42 +0000 (Sun, 29 May 2011)
Log Message:
-----------
CheckStyle updates.
Some reorganisation and renaming of the constants.
Modified Paths:
--------------
Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
Trunk/pcgen/code/src/java/pcgen/cdom/reference/PatternMatchingReference.java
Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java
Trunk/pcgen/code/src/java/pcgen/rules/persistence/ChoiceSetLoadUtilities.java
Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenUtilities.java
Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java
Trunk/pcgen/code/src/java/plugin/lsttokens/CcskillLst.java
Trunk/pcgen/code/src/java/plugin/lsttokens/CskillLst.java
Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CcskillToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CskillToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/equipment/ContainsToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/kit/spells/SpellsToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CcskillToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CskillToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CcskillToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CskillToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/race/MonccskillToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/race/MoncskillToken.java
Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java
Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java
Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -385,8 +385,8 @@
* Various parsing token constants
********************************************************************/
- /** Pipe '|' character as a string. */
- String PIPE = "|"; //$NON-NLS-1$
+ /** Colon ':' character as a string. */
+ String COLON = ":";
/** Comma ',' character as a string. */
String COMMA = ","; //$NON-NLS-1$
@@ -394,25 +394,31 @@
/** Dot '.' character as a string. */
String DOT = ".";
- /** Colon ':' character as a string. */
- String COLON = ":";
-
/** Equals '=' character as a string. */
String EQUALS = "=";
- /** Asterisk '*' character as a string. */
+ /** Percent '%' character as a string. */
+ String PERCENT = "%";
+
+ /** Pipe '|' character as a string. */
+ String PIPE = "|"; //$NON-NLS-1$
+
+ /** Tab '*' character as a string. */
String TAB = "\t";
- /** Percent character as a constant. */
- char PERCENT = '%';
-
/** Asterisk '*' character as a constant. */
char CHAR_ASTERISK = '*';
+ /** Percent character as a constant. */
+ char CHAR_PERCENT = '%';
+
/** A snippet of List code as a constant. */
String LST_DOT_CLEAR = ".CLEAR";
/** A snippet of List code as a constant. */
+ String LST_DOT_CLEAR_ALL = ".CLEARALL";
+
+ /** A snippet of List code as a constant. */
String LST_DOT_CLEAR_DOT = ".CLEAR.";
/** A snippet of List code as a constant. */
@@ -422,27 +428,39 @@
String LST_SEMI_LEVEL_EQUAL = ";LEVEL=";
/** A snippet of List code as a constant. */
- String LST_BASE = "BASE.";
+ String LST_ARMORTYPE_DOT = "ARMORTYPE.";
/** A snippet of List code as a constant. */
+ String LST_ARMORTYPE_EQUAL = "ARMORTYPE=";
+
+ /** A snippet of List code as a constant. */
+ String LST_BASE_DOT = "BASE.";
+
+ /** A snippet of List code as a constant. */
String LST_CAST_DOT = "CAST.";
/** A snippet of List code as a constant. */
String LST_CAST_EQUAL = "CAST=";
/** A snippet of List code as a constant. */
- String LST_TYPE_OLD = "TYPE.";
+ String LST_SHIELDTYPE_DOT = "SHIELDTYPE.";
/** A snippet of List code as a constant. */
- String LST_NOT_TYPE_OLD = "!TYPE.";
+ String LST_SHIELDTYPE_EQUAL = "SHIELDTYPE=";
/** A snippet of List code as a constant. */
- String LST_TYPE = "TYPE=";
+ String LST_TYPE_DOT = "TYPE.";
/** A snippet of List code as a constant. */
- String LST_NOT_TYPE = "!TYPE=";
+ String LST_TYPE_EQUAL = "TYPE=";
/** A snippet of List code as a constant. */
+ String LST_NOT_TYPE_DOT = "!TYPE.";
+
+ /** A snippet of List code as a constant. */
+ String LST_NOT_TYPE_EQUAL = "!TYPE=";
+
+ /** A snippet of List code as a constant. */
String LST_ALL = "ALL";
/** A snippet of List code as a constant. */
@@ -452,7 +470,7 @@
String LST_LIST = "LIST";
/** A snippet of List code as a constant. */
- String LST_PATTERN = "%";
+ String LST_PERCENT_CHOICE = "%CHOICE";
/** A snippet of List code as a constant. */
String LST_PERCENT_LIST = "%LIST";
@@ -461,27 +479,12 @@
String LST_NONE = "NONE";
/** A snippet of List code as a constant. */
- String LST_DOT_CLEAR_ALL = ".CLEARALL";
-
- /** A snippet of List code as a constant. */
String LST_CHOOSE = "CHOOSE:";
/** A snippet of List code as a constant. */
String LST_ADD_CHOICE = "ADDCHOICE:";
/** A snippet of List code as a constant. */
- String LST_SHIELDTYPE = "SHIELDTYPE=";
-
- /** A snippet of List code as a constant. */
- String LST_SHIELDTYPE_OLD = "SHIELDTYPE.";
-
- /** A snippet of List code as a constant. */
- String LST_ARMORTYPE = "ARMORTYPE=";
-
- /** A snippet of List code as a constant. */
- String LST_ARMORTYPE_OLD = "ARMORTYPE.";
-
- /** A snippet of List code as a constant. */
String LST_UNTRAINED = "UNTRAINED";
/** A snippet of List code as a constant. */
@@ -500,9 +503,6 @@
/** A snippet of List code as a constant. */
String LST_CHOICE = "CHOICE";
- /** A snippet of List code as a constant. */
- String LST_PERCENT_CHOICE = "%CHOICE";
-
/** A constant used in List parsing of Favoured Class. */
String HIGHEST_LEVEL_CLASS = "HIGHESTLEVELCLASS";
Modified: Trunk/pcgen/code/src/java/pcgen/cdom/reference/PatternMatchingReference.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/reference/PatternMatchingReference.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/reference/PatternMatchingReference.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -73,7 +73,7 @@
* The pattern used to identify items which this
* PatternMatchingReference will contain. Note that this pattern
* must end with the PCGen pattern characters (defined by
- * Constants.LST_PATTERN)
+ * Constants.PERCENT)
* @throws IllegalArgumentException
* if the starting group is null or the provided pattern does
* not end with the PCGen pattern characters
@@ -88,7 +88,7 @@
"Starting Group cannot be null in PatternMatchingReference");
}
all = startingGroup;
- String lstPattern = Constants.LST_PATTERN;
+ String lstPattern = Constants.PERCENT;
int patternchar = patternText.length() - lstPattern.length();
if (patternText.indexOf(lstPattern) != patternchar)
{
Modified: Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -361,7 +361,7 @@
*/
private static boolean isTypeTest(String key)
{
- return key.startsWith(Constants.LST_TYPE) || key.startsWith(Constants.LST_TYPE_OLD);
+ return key.startsWith(Constants.LST_TYPE_EQUAL) || key.startsWith(Constants.LST_TYPE_DOT);
}
/**
Modified: Trunk/pcgen/code/src/java/pcgen/rules/persistence/ChoiceSetLoadUtilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/rules/persistence/ChoiceSetLoadUtilities.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/pcgen/rules/persistence/ChoiceSetLoadUtilities.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -346,12 +346,12 @@
return sc.getAllReference();
}
String key = pi.key;
- if (key.startsWith(Constants.LST_TYPE_OLD))
+ if (key.startsWith(Constants.LST_TYPE_DOT))
{
return TokenUtilities.getTypeReference(sc, key
.substring(5));
}
- if (key.startsWith(Constants.LST_NOT_TYPE_OLD))
+ if (key.startsWith(Constants.LST_NOT_TYPE_DOT))
{
return new NegatingPrimitive<T>(TokenUtilities.getTypeReference(
sc, key.substring(6)));
Modified: Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenUtilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenUtilities.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenUtilities.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -50,13 +50,13 @@
public static <T extends Loadable> CDOMReference<T> getTypeOrPrimitive(
ReferenceManufacturer<T> rm, String s)
{
- if (s.startsWith(Constants.LST_TYPE_OLD)
- || s.startsWith(Constants.LST_TYPE))
+ if (s.startsWith(Constants.LST_TYPE_DOT)
+ || s.startsWith(Constants.LST_TYPE_EQUAL))
{
return getTypeReference(rm, s.substring(5));
}
- else if (s.startsWith(Constants.LST_NOT_TYPE_OLD)
- || s.startsWith(Constants.LST_NOT_TYPE))
+ else if (s.startsWith(Constants.LST_NOT_TYPE_DOT)
+ || s.startsWith(Constants.LST_NOT_TYPE_EQUAL))
{
Logging.errorPrint("!TYPE not supported in token, found: " + s);
return null;
Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -45,7 +45,7 @@
boolean isBase = false;
final String token;
- if (argToken.startsWith(Constants.LST_BASE))
+ if (argToken.startsWith(Constants.LST_BASE_DOT))
{
token = argToken.substring(Constants.SUBSTRING_LENGTH_FIVE);
isBase = true;
@@ -98,7 +98,7 @@
}
String token = ((CheckInfo) obj).isBase()
- ? Constants.LST_BASE
+ ? Constants.LST_BASE_DOT
: Constants.EMPTY_STRING;
return token + ((CheckInfo) obj).getPobj().getLSTformat(false);
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/CcskillLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/CcskillLst.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/CcskillLst.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -162,7 +162,7 @@
private CDOMReference<Skill> getSkillReference(LoadContext context,
String tokText)
{
- if (tokText.endsWith(Constants.LST_PATTERN))
+ if (tokText.endsWith(Constants.PERCENT))
{
return new PatternMatchingReference<Skill>(Skill.class, context.ref
.getCDOMAllReference(SKILL_CLASS), tokText);
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/CskillLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/CskillLst.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/CskillLst.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -161,7 +161,7 @@
private CDOMReference<Skill> getSkillReference(LoadContext context,
String tokText)
{
- if (tokText.endsWith(Constants.LST_PATTERN))
+ if (tokText.endsWith(Constants.PERCENT))
{
return new PatternMatchingReference<Skill>(Skill.class, context.ref
.getCDOMAllReference(SKILL_CLASS), tokText);
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -136,8 +136,8 @@
{
spelltypes.add(token);
}
- else if (token.startsWith(Constants.LST_TYPE_OLD)
- || token.startsWith(Constants.LST_TYPE))
+ else if (token.startsWith(Constants.LST_TYPE_DOT)
+ || token.startsWith(Constants.LST_TYPE_EQUAL))
{
CDOMReference<PCClass> ref = TokenUtilities
.getTypeReference(context, PCCLASS_CLASS, token
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -139,8 +139,8 @@
armorProfs
.add(context.ref.getCDOMAllReference(ARMORPROF_CLASS));
}
- else if (aProf.startsWith(Constants.LST_ARMORTYPE_OLD)
- || aProf.startsWith(Constants.LST_ARMORTYPE))
+ else if (aProf.startsWith(Constants.LST_ARMORTYPE_DOT)
+ || aProf.startsWith(Constants.LST_ARMORTYPE_EQUAL))
{
foundOther = true;
CDOMReference<Equipment> ref = TokenUtilities.getTypeReference(
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -139,8 +139,8 @@
shieldProfs.add(context.ref
.getCDOMAllReference(SHIELDPROF_CLASS));
}
- else if (aProf.startsWith(Constants.LST_SHIELDTYPE_OLD)
- || aProf.startsWith(Constants.LST_SHIELDTYPE))
+ else if (aProf.startsWith(Constants.LST_SHIELDTYPE_DOT)
+ || aProf.startsWith(Constants.LST_SHIELDTYPE_EQUAL))
{
foundOther = true;
CDOMReference<Equipment> ref = TokenUtilities.getTypeReference(
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -146,8 +146,8 @@
else
{
foundOther = true;
- if (aProf.startsWith(Constants.LST_TYPE_OLD)
- || aProf.startsWith(Constants.LST_TYPE))
+ if (aProf.startsWith(Constants.LST_TYPE_DOT)
+ || aProf.startsWith(Constants.LST_TYPE_EQUAL))
{
CDOMGroupRef<WeaponProf> rr = TokenUtilities
.getTypeReference(context, WEAPONPROF_CLASS,
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CcskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CcskillToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CcskillToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -167,7 +167,7 @@
private CDOMReference<Skill> getSkillReference(LoadContext context,
String tokText)
{
- if (tokText.endsWith(Constants.LST_PATTERN))
+ if (tokText.endsWith(Constants.PERCENT))
{
return new PatternMatchingReference<Skill>(Skill.class, context.ref
.getCDOMAllReference(SKILL_CLASS), tokText);
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CskillToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CskillToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -166,7 +166,7 @@
private CDOMReference<Skill> getSkillReference(LoadContext context,
String tokText)
{
- if (tokText.endsWith(Constants.LST_PATTERN))
+ if (tokText.endsWith(Constants.PERCENT))
{
return new PatternMatchingReference<Skill>(Skill.class, context.ref
.getCDOMAllReference(SKILL_CLASS), tokText);
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/equipment/ContainsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/equipment/ContainsToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/equipment/ContainsToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -71,8 +71,8 @@
weightCapacity = weightCapacity.substring(1);
}
- int percentLoc = weightCapacity.indexOf(Constants.PERCENT);
- if (percentLoc != weightCapacity.lastIndexOf(Constants.PERCENT))
+ int percentLoc = weightCapacity.indexOf(Constants.CHAR_PERCENT);
+ if (percentLoc != weightCapacity.lastIndexOf(Constants.CHAR_PERCENT))
{
return new ParseResult.Fail("Cannot have two weight reduction "
+ "characters (indicated by %): " + value);
@@ -224,7 +224,7 @@
IntegerKey.CONTAINER_REDUCE_WEIGHT);
if (reducePercent != null)
{
- sb.append(reducePercent).append(Constants.PERCENT);
+ sb.append(reducePercent).append(Constants.CHAR_PERCENT);
}
BigDecimal cap = context.getObjectContext().getObject(eq,
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/kit/spells/SpellsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/kit/spells/SpellsToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/kit/spells/SpellsToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -213,7 +213,7 @@
{
StringBuilder spell = new StringBuilder();
spell.append(StringUtil.replaceAll(ksi.getLSTformat(),
- Constants.LST_TYPE, Constants.LST_TYPE_OLD));
+ Constants.LST_TYPE_EQUAL, Constants.LST_TYPE_DOT));
if (abils != null && !abils.isEmpty())
{
spell.append('[');
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CcskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CcskillToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CcskillToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -146,7 +146,7 @@
private CDOMReference<Skill> getSkillReference(LoadContext context,
String tokText)
{
- if (tokText.endsWith(Constants.LST_PATTERN))
+ if (tokText.endsWith(Constants.PERCENT))
{
return new PatternMatchingReference<Skill>(Skill.class, context.ref
.getCDOMAllReference(SKILL_CLASS), tokText);
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CskillToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CskillToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -149,7 +149,7 @@
private CDOMReference<Skill> getSkillReference(LoadContext context,
String tokText)
{
- if (tokText.endsWith(Constants.LST_PATTERN))
+ if (tokText.endsWith(Constants.PERCENT))
{
return new PatternMatchingReference<Skill>(Skill.class, context.ref
.getCDOMAllReference(SKILL_CLASS), tokText);
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CcskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CcskillToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CcskillToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -147,7 +147,7 @@
private CDOMReference<Skill> getSkillReference(LoadContext context,
String tokText)
{
- if (tokText.endsWith(Constants.LST_PATTERN))
+ if (tokText.endsWith(Constants.PERCENT))
{
return new PatternMatchingReference<Skill>(Skill.class, context.ref
.getCDOMAllReference(SKILL_CLASS), tokText);
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CskillToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CskillToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -146,7 +146,7 @@
private CDOMReference<Skill> getSkillReference(LoadContext context,
String tokText)
{
- if (tokText.endsWith(Constants.LST_PATTERN))
+ if (tokText.endsWith(Constants.PERCENT))
{
return new PatternMatchingReference<Skill>(Skill.class, context.ref
.getCDOMAllReference(SKILL_CLASS), tokText);
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/race/MonccskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/race/MonccskillToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/race/MonccskillToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -154,7 +154,7 @@
private CDOMReference<Skill> getSkillReference(LoadContext context, Race r,
String tokText)
{
- if (tokText.endsWith(Constants.LST_PATTERN))
+ if (tokText.endsWith(Constants.PERCENT))
{
return new PatternMatchingReference<Skill>(Skill.class, context.ref
.getCDOMAllReference(SKILL_CLASS), tokText);
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/race/MoncskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/race/MoncskillToken.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/race/MoncskillToken.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -185,7 +185,7 @@
private CDOMReference<Skill> getSkillReference(LoadContext context,
String tokText)
{
- if (tokText.endsWith(Constants.LST_PATTERN))
+ if (tokText.endsWith(Constants.PERCENT))
{
return new PatternMatchingReference<Skill>(Skill.class, context.ref
.getCDOMAllReference(SKILL_CLASS), tokText);
Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -64,8 +64,8 @@
}
// Match against a TYPE of armour
- if (desiredType.startsWith(Constants.LST_TYPE)
- || desiredType.startsWith(Constants.LST_TYPE_OLD))
+ if (desiredType.startsWith(Constants.LST_TYPE_EQUAL)
+ || desiredType.startsWith(Constants.LST_TYPE_DOT))
{
String stripped = desiredType.substring(Constants.SUBSTRING_LENGTH_FIVE);
Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java 2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java 2011-05-29 22:38:42 UTC (rev 15065)
@@ -73,8 +73,8 @@
// Work out exactlywhat we are going to test.
final String aString = prereq.getKey();
List<String> typeList = null;
- if (aString.startsWith(Constants.LST_TYPE)
- || aString.startsWith(Constants.LST_TYPE_OLD))
+ if (aString.startsWith(Constants.LST_TYPE_EQUAL)
+ || aString.startsWith(Constants.LST_TYPE_DOT))
{
String stripped = aString.substring(Constants.SUBSTRING_LENGTH_FIVE);
typeList = CoreUtility.split(stripped, '.');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
