Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen:[15063] Trunk/pcgen/code/src/java
|
From: <nu...@us...> - 2011-05-29 21:17:25
|
Revision: 15063
http://pcgen.svn.sourceforge.net/pcgen/?rev=15063&view=rev
Author: nuance
Date: 2011-05-29 21:17:18 +0000 (Sun, 29 May 2011)
Log Message:
-----------
CheckStyle updates.
Modified Paths:
--------------
Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java
Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java
Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.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 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java 2011-05-29 21:17:18 UTC (rev 15063)
@@ -419,6 +419,12 @@
String LST_BASE = "BASE.";
/** A snippet of List code as a constant. */
+ String LST_CAST_OLD = "CAST.";
+
+ /** A snippet of List code as a constant. */
+ String LST_CAST = "CAST=";
+
+ /** A snippet of List code as a constant. */
String LST_TYPE_OLD = "TYPE.";
/** A snippet of List code as a constant. */
@@ -598,12 +604,8 @@
int ARBITRARY_END_SKILL_INDEX = 999;
/**
- * The length of the string "BASE.". */
- int LENGTH_OF_BASE_SUBSTRING = 5;
-
- /**
* The length of both the LST_TYPE and LST_TYPE_OLD constants. */
- int LENGTH_OF_TYPE_SUBSTRING = 5;
+ int SUBSTRING_LENGTH_FIVE = 5;
/**
Modified: Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java 2011-05-29 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java 2011-05-29 21:17:18 UTC (rev 15063)
@@ -195,7 +195,7 @@
final boolean keyIsType = isTypeTest(prereq.getKey());
final String strippedKey = keyIsType
- ? prereq.getKey().substring(Constants.LENGTH_OF_TYPE_SUBSTRING)
+ ? prereq.getKey().substring(Constants.SUBSTRING_LENGTH_FIVE)
: prereq.getKey();
int runningTotal = 0;
@@ -251,7 +251,7 @@
if (prereq.getSubKey() != null)
{
- final int len = Constants.LENGTH_OF_TYPE_SUBSTRING;
+ final int len = Constants.SUBSTRING_LENGTH_FIVE;
final boolean subKeyIsType = isTypeTest(prereq.getSubKey());
final String subKey = subKeyIsType
@@ -321,7 +321,7 @@
if (subKeyIsType)
{
- final String type = prereq.getSubKey().substring(Constants.LENGTH_OF_TYPE_SUBSTRING);
+ final String type = prereq.getSubKey().substring(Constants.SUBSTRING_LENGTH_FIVE);
runningTotal = countSubKeyType(character, ability, type, countMults);
}
Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java 2011-05-29 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java 2011-05-29 21:17:18 UTC (rev 15063)
@@ -47,7 +47,7 @@
if (argToken.startsWith(Constants.LST_BASE))
{
- token = argToken.substring(Constants.LENGTH_OF_BASE_SUBSTRING);
+ token = argToken.substring(Constants.SUBSTRING_LENGTH_FIVE);
isBase = true;
}
else
Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java 2011-05-29 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java 2011-05-29 21:17:18 UTC (rev 15063)
@@ -25,6 +25,7 @@
*/
package plugin.bonustokens;
+import pcgen.cdom.base.Constants;
import pcgen.core.PCClass;
import pcgen.core.PCStat;
import pcgen.core.bonus.BonusObj;
@@ -32,32 +33,31 @@
import pcgen.rules.context.LoadContext;
/**
- * <code>Stat</code>
- *
- * @author Greg Bingleman <by...@ho...>
+ * This is the class that implements the Stat bonuses.
*/
public final class Stat extends BonusObj
{
- private static final String[] bonusTags =
+ private static final String[] BONUS_TAGS =
{"BASESPELLSTAT", "BASESPELLKNOWNSTAT"};
@Override
protected boolean parseToken(LoadContext context, final String token)
{
- for (int i = 0; i < bonusTags.length; ++i)
+ for (int i = 0; i < BONUS_TAGS.length; ++i)
{
- if (bonusTags[i].equals(token))
+ if (BONUS_TAGS[i].equals(token))
{
- addBonusInfo(Integer.valueOf(i));
-
+ addBonusInfo(i);
return true;
}
}
- if (token.startsWith("CAST=") || token.startsWith("CAST."))
+ if (token.startsWith(Constants.LST_CAST)
+ || token.startsWith(Constants.LST_CAST_OLD))
{
PCStat stat = context.ref.getAbbreviatedObject(
- PCStat.class, token.substring(5));
+ PCStat.class,
+ token.substring(Constants.SUBSTRING_LENGTH_FIVE));
if (stat != null)
{
@@ -68,8 +68,7 @@
}
else
{
- PCStat stat = context.ref.getAbbreviatedObject(
- PCStat.class, token);
+ PCStat stat = context.ref.getAbbreviatedObject(PCStat.class, token);
if (stat != null)
{
@@ -77,8 +76,8 @@
}
else
{
- final PCClass aClass = context.ref
- .silentlyGetConstructedCDOMObject(PCClass.class, token);
+ final PCClass aClass =
+ context.ref.silentlyGetConstructedCDOMObject(PCClass.class, token);
if (aClass != null)
{
@@ -101,11 +100,11 @@
{
if (obj instanceof Integer)
{
- return bonusTags[((Integer) obj).intValue()];
+ return BONUS_TAGS[(Integer) obj];
}
else if (obj instanceof CastStat)
{
- return "CAST." + ((CastStat) obj).stat.getAbb();
+ return "CAST." + ((CastStat) obj).getStat().getAbb();
}
else if (obj instanceof PCClass)
{
@@ -120,21 +119,28 @@
}
/**
- * Deals with the Stat for casting
+ * Deals with the Stat for casting.
*/
public static class CastStat
{
- /** A stat */
- public final PCStat stat;
+ private final PCStat stat;
/**
- * Constuctor
- * @param argStat
+ * Constructor.
+ * @param argStat The spell casting stat.
*/
public CastStat(final PCStat argStat)
{
stat = argStat;
}
+
+ /** Get the spell casting stat.
+ * @return The spell casting stat.
+ * */
+ public PCStat getStat()
+ {
+ return stat;
+ }
}
@Override
Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java 2011-05-29 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java 2011-05-29 21:17:18 UTC (rev 15063)
@@ -68,7 +68,7 @@
|| desiredType.startsWith(Constants.LST_TYPE_OLD))
{
- String stripped = desiredType.substring(Constants.LENGTH_OF_TYPE_SUBSTRING);
+ String stripped = desiredType.substring(Constants.SUBSTRING_LENGTH_FIVE);
StringTokenizer tok = new StringTokenizer(stripped.toUpperCase(), ".");
boolean match = false;
Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java 2011-05-29 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java 2011-05-29 21:17:18 UTC (rev 15063)
@@ -76,7 +76,7 @@
if (aString.startsWith(Constants.LST_TYPE)
|| aString.startsWith(Constants.LST_TYPE_OLD))
{
- String stripped = aString.substring(Constants.LENGTH_OF_TYPE_SUBSTRING);
+ 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.
|
