[pcgen-commit-svn] SF.net SVN: pcgen:[10452] Trunk/pcgen/code/src/java/pcgen/io/exporttoken/ AbilityToken.java

[<kar...@us...>]

Revision: 10452
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10452&view=rev
Author:   karianna
Date:     2009-09-09 13:14:27 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
Code and Comments tidyup after several discussions on the developers mailing list.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AbilityToken.java

Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AbilityToken.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AbilityToken.java	2009-09-09 12:42:02 UTC (rev 10451)
+++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AbilityToken.java	2009-09-09 13:14:27 UTC (rev 10452)
@@ -90,11 +90,10 @@
 	/** The current visibility filtering to apply */
 	private int visibility = ABILITY_DEFAULT;
 
-	// TODO: Should the following 4 variables be here?  They don't get used for anythign useful
 	/** The cached PC */
 	private PlayerCharacter cachedPC = null;
 
-	/** TODO */
+	/** The cached PC serial (serial holds whether a PC has been changed) */
 	private int cachedPcSerial = 0;
 
 	/** The last token in the list of abilities */
@@ -157,20 +156,13 @@
 		PlayerCharacter pc, ExportHandler eh, final StringTokenizer aTok,
 		final String tokenString, final AbilityCategory aCategory)
 	{
+		boolean cacheAbilityProcessingData =
+				(cachedPC != pc || !aCategory.equals(lastCategory)
+					|| cachedPcSerial != pc.getSerial() || !tokenString
+					.equals(lastToken));
+
 		// As this method can effectively be called by an OS FOR token, there 
 		// is a performance saving in caching some of the one-off processing data 
-		boolean cacheAbilityProcessingData;
-		if (cachedPC != pc || !aCategory.equals(lastCategory)
-			|| cachedPcSerial != pc.getSerial()
-			|| !tokenString.equals(lastToken))
-		{
-			cacheAbilityProcessingData = true;
-		}
-		else
-		{
-			cacheAbilityProcessingData = false;
-		}
-
 		if (cacheAbilityProcessingData)
 		{
 			// Overridden by subclasses to return the right list.
@@ -417,15 +409,15 @@
 	private String getRetString(String tokenSource, PlayerCharacter pc,
 		ExportHandler eh, int abilityIndex, List<Ability> aList)
 	{
-		String retString = null;
+		String retString = "";
 		Ability aAbility;
 		// If the ability index given is within a valid range
 		if (abilityIndex >= 0 && abilityIndex < aList.size())
 		{
 			aAbility = aList.get(abilityIndex);
 
-			// If it is the last item and there's a valid export handler and TODO
-			// Then tell the ExpotrHandler that there is no more processing needed
+			// If it is the last item and there's a valid export handler and ??? TODO
+			// Then tell the ExportHandler that there is no more processing needed
 			if (abilityIndex == aList.size() - 1 && eh != null
 				&& eh.getExistsOnly())
 			{


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