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

[<nu...@us...>]

Revision: 15050
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15050&view=rev
Author:   nuance
Date:     2011-05-29 13:02:34 +0000 (Sun, 29 May 2011)

Log Message:
-----------
CheckStyle updates

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/character/CachedVariable.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAttackTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreCheckTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSpellTypeTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreStatTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreUnarmedAttackTester.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/character/CachedVariable.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/character/CachedVariable.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/pcgen/core/character/CachedVariable.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -26,43 +26,45 @@
 package pcgen.core.character;
 
 /**
- * @author Valued Customer
- * @param <T> 
- * @todo This doesn't belong in this package.  It should probably be an inner
+ * @param <T>
+ * Todo This doesn't belong in this package.  It should probably be an inner
  * class in VariableProcessor.
  *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
  */
-public final class CachedVariable<T> {
+public final class CachedVariable<T>
+{
 	private int serial;
 	private T value;
 	/**
 	 * @return Returns the serial.
 	 */
-	public int getSerial() {
+	public int getSerial()
+	{
 		return serial;
 	}
 
 	/**
-	 * @param serial The serial to set.
+	 * @param i The serial to set.
 	 */
-	public void setSerial(final int serial) {
-		this.serial = serial;
+	public void setSerial(final int i)
+	{
+		serial = i;
 	}
 
 	/**
 	 * @return Returns the value.
 	 */
-	public T getValue() {
+	public T getValue()
+	{
 		return value;
 	}
 
 	/**
-	 * @param value The value to set.
+	 * @param v The value to set.
 	 */
-	public void setValue(final T value) {
-		this.value = value;
+	public void setValue(final T v)
+	{
+		value = v;
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -29,6 +29,7 @@
 import java.util.StringTokenizer;
 
 import pcgen.cdom.base.CDOMObject;
+import pcgen.cdom.base.Constants;
 import pcgen.core.Equipment;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.prereq.AbstractPrerequisiteTest;
@@ -36,8 +37,7 @@
 import pcgen.core.prereq.PrerequisiteTest;
 
 /**
- * @author wardc
- *
+ * Prerequisite test the type of a piece of armour.
  */
 public class PreArmorTypeTester extends AbstractPrerequisiteTest implements PrerequisiteTest
 {
@@ -64,12 +64,13 @@
 				}
 
 				// Match against a TYPE of armour
-				if (desiredType.startsWith("TYPE=")
-					|| desiredType.startsWith("TYPE.")) //$NON-NLS-1$ //$NON-NLS-2$
+				if (desiredType.startsWith(Constants.LST_TYPE)
+					|| desiredType.startsWith(Constants.LST_TYPE_OLD))
 				{
-					StringTokenizer tok =
-							new StringTokenizer(desiredType.substring(5)
-								.toUpperCase(), ".");
+
+					String stripped = desiredType.substring(Constants.LENGTH_OF_TYPE_SUBSTRING);
+					StringTokenizer tok = new StringTokenizer(stripped.toUpperCase(), ".");
+
 					boolean match = false;
 					if (tok.hasMoreTokens())
 					{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAttackTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAttackTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAttackTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -35,8 +35,7 @@
 import pcgen.util.PropertyFactory;
 
 /**
- * @author wardc
- *
+ * Prerequisite test the type of a piece of armour.
  */
 public class PreAttackTester extends AbstractPrerequisiteTest implements PrerequisiteTest
 {
@@ -45,7 +44,10 @@
 	 * @see pcgen.core.prereq.PrerequisiteTest#passes(pcgen.core.PlayerCharacter)
 	 */
 	@Override
-	public int passes(final Prerequisite prereq, final PlayerCharacter character, CDOMObject source)
+	public int passes(
+		final Prerequisite prereq,
+		final PlayerCharacter character,
+		CDOMObject source)
 		throws PrerequisiteException
 	{
 		int runningTotal;
@@ -58,8 +60,10 @@
 		}
 		catch (NumberFormatException exc)
 		{
-			throw new PrerequisiteException(PropertyFactory.getFormattedString(
-				"PreAttack.error.badly_formed_attribute", prereq.getOperand())); //$NON-NLS-1$
+			throw new PrerequisiteException(
+				PropertyFactory.getFormattedString(
+					"PreAttack.error.badly_formed_attribute", //$NON-NLS-1$
+					prereq.getOperand()));
 		}
 
 		return countedTotal(prereq, runningTotal);
@@ -80,9 +84,10 @@
 	@Override
 	public String toHtmlString(final Prerequisite prereq)
 	{
-		return PropertyFactory
-			.getFormattedString(
-				"PreAttack.toHtml", new Object[]{prereq.getOperator().toDisplayString(), prereq.getOperand()}); //$NON-NLS-1$ //$NON-NLS-2$
+		return PropertyFactory.getFormattedString(
+			"PreAttack.toHtml",  //$NON-NLS-1$
+			prereq.getOperator().toDisplayString(),
+			prereq.getOperand());
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreCheckTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreCheckTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreCheckTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -15,15 +15,12 @@
 import pcgen.core.prereq.PrerequisiteTest;
 
 /**
- * @author wardc
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
+ * Prerequisite test that the character has a non-zero value for a given check.
  */
 public class PreCheckTester extends AbstractPrerequisiteTest implements PrerequisiteTest
 {
 
-	/** Constructor */
+	/** Constructor. */
 	public PreCheckTester()
 	{
 		super();
@@ -47,17 +44,12 @@
 		int runningTotal = 0;
 
 		final String checkName = prereq.getKey();
-		final int operand =
-				character.getVariableValue(prereq.getOperand(), "").intValue(); //$NON-NLS-1$
-		PCCheck check = Globals.getContext().ref
-				.silentlyGetConstructedCDOMObject(PCCheck.class, checkName);
+		final int operand = character.getVariableValue(prereq.getOperand(), "").intValue(); //$NON-NLS-1$
+		PCCheck check = Globals.getContext().ref.silentlyGetConstructedCDOMObject(PCCheck.class, checkName);
 		if (check != null)
 		{
-			final int characterCheckBonus =
-					character.getTotalCheck(check);
-			runningTotal =
-					prereq.getOperator().compare(characterCheckBonus, operand) > 0
-						? 1 : 0;
+			final int characterCheckBonus = character.getTotalCheck(check);
+			runningTotal = prereq.getOperator().compare(characterCheckBonus, operand) > 0 ? 1 : 0;
 		}
 		return countedTotal(prereq, runningTotal);
 	}

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -18,10 +18,7 @@
 import pcgen.util.PropertyFactory;
 
 /**
- * @author wardc
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
+ * Prerequisite test that the character has a deity with the correct alignment.
  */
 public class PreDeityAlignTester extends AbstractPrerequisiteTest implements PrerequisiteTest
 {
@@ -84,9 +81,10 @@
 	@Override
 	public String toHtmlString(final Prerequisite prereq)
 	{
-		return PropertyFactory
-			.getFormattedString(
-				"PreDeityAlign.toHtml", prereq.getOperator().toDisplayString(), getPCAlignment(prereq.getOperand()).getAbb()); //$NON-NLS-1$
+		return PropertyFactory.getFormattedString(
+			"PreDeityAlign.toHtml", //$NON-NLS-1$
+			prereq.getOperator().toDisplayString(),
+			getPCAlignment(prereq.getOperand()).getAbb());
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -27,6 +27,7 @@
 package plugin.pretokens.test;
 
 import pcgen.cdom.base.CDOMObject;
+import pcgen.cdom.base.Constants;
 import pcgen.core.Equipment;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.prereq.AbstractPrerequisiteTest;
@@ -39,7 +40,7 @@
 import java.util.List;
 
 /**
- * @author wardc
+ * Sets requirements for items a character must possess.
  *
  */
 public class PreItemTester extends AbstractPrerequisiteTest implements
@@ -72,9 +73,11 @@
 			// Work out exactlywhat we are going to test.
 			final String aString = prereq.getKey();
 			List<String> typeList = null;
-			if (aString.startsWith("TYPE=") || aString.startsWith("TYPE.")) //$NON-NLS-1$ //$NON-NLS-2$
+			if (aString.startsWith(Constants.LST_TYPE)
+				|| aString.startsWith(Constants.LST_TYPE_OLD))
 			{
-				typeList = CoreUtility.split(aString.substring(5), '.');
+				String stripped = aString.substring(Constants.LENGTH_OF_TYPE_SUBSTRING);
+				typeList = CoreUtility.split(stripped, '.');
 			}
 
 			for (Equipment eq : character.getEquipmentSet())

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSpellTypeTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSpellTypeTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSpellTypeTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -35,7 +35,7 @@
 import pcgen.util.PropertyFactory;
 
 /**
- * @author wardc
+ * This is used to check the characters spellcasting ability.
  *
  */
 public class PreSpellTypeTester extends AbstractPrerequisiteTest implements
@@ -57,16 +57,15 @@
 		catch (NumberFormatException e)
 		{
 			requiredLevel = 1;
-			Logging
-				.errorPrintLocalised(
-					"PreSpellType.Badly_formed_spell_type", prereq.getOperand(), prereq.toString()); //$NON-NLS-1$
+			Logging.errorPrintLocalised(
+				"PreSpellType.Badly_formed_spell_type", //$NON-NLS-1$
+				prereq.getOperand(),
+				prereq.toString());
 		}
 
-		int count = character.countSpellCastTypeLevel(castingType,
-				requiredLevel);
+		int count = character.countSpellCastTypeLevel(castingType, requiredLevel);
 
-		final int runningTotal =
-			prereq.getOperator().compare(count, 1);
+		final int runningTotal = prereq.getOperator().compare(count, 1);
 		return countedTotal(prereq, runningTotal);
 	}
 
@@ -86,8 +85,8 @@
 	public String toHtmlString(final Prerequisite prereq)
 	{
 		return PropertyFactory.getFormattedString("PreSpellType.toHtml", //$NON-NLS-1$
-			new Object[]{prereq.getOperator().toDisplayString(),
-				1, prereq.getKey(), prereq.getOperand()});
+			prereq.getOperator().toDisplayString(),
+			1, prereq.getKey(), prereq.getOperand());
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreStatTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreStatTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreStatTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -76,9 +76,11 @@
 	@Override
 	public String toHtmlString(final Prerequisite prereq)
 	{
-		return PropertyFactory
-			.getFormattedString(
-				"PreStat.toHtml", prereq.getKey(), prereq.getOperator().toString(), prereq.getOperand()); //$NON-NLS-1$
+		return PropertyFactory.getFormattedString(
+			"PreStat.toHtml", //$NON-NLS-1$
+			prereq.getKey(),
+			prereq.getOperator().toString(),
+			prereq.getOperand());
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreUnarmedAttackTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreUnarmedAttackTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreUnarmedAttackTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -75,9 +75,10 @@
 	@Override
 	public String toHtmlString(final Prerequisite prereq)
 	{
-		return PropertyFactory
-			.getFormattedString(
-				"PreUnarmedAttack.toHtml", prereq.getOperator().toString(), prereq.getOperand()); //$NON-NLS-1$
+		return PropertyFactory.getFormattedString(
+			"PreUnarmedAttack.toHtml", //$NON-NLS-1$
+			prereq.getOperator().toString(),
+			prereq.getOperand());
 	}
 
 }


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