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

[<jde...@us...>]

Revision: 2222
          http://svn.sourceforge.net/pcgen/?rev=2222&view=rev
Author:   jdempsey
Date:     2007-02-26 04:30:50 -0800 (Mon, 26 Feb 2007)

Log Message:
-----------
Fix Error when loading character with the Toughness feat
Issue#: 1666027

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/PObject.java
    Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/PObject.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PObject.java	2007-02-26 11:21:29 UTC (rev 2221)
+++ Trunk/pcgen/code/src/java/pcgen/core/PObject.java	2007-02-26 12:30:50 UTC (rev 2222)
@@ -270,6 +270,10 @@
 	 */
 	public final Object getAssociatedObject(final int idx)
 	{
+		if (associatedList == null) 
+		{
+			return Constants.EMPTY_STRING;
+		}
 		return associatedList.get(idx);
 	}
 

Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java	2007-02-26 11:21:29 UTC (rev 2221)
+++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java	2007-02-26 12:30:50 UTC (rev 2222)
@@ -2251,11 +2251,10 @@
 				else if ((ability.isMultiples() && ability.isStacks())
 					|| !ability.containsAssociated(appliedToKey))
 				{
-					final StringTokenizer sTok =
-						new StringTokenizer(appliedToKey, Constants.COMMA, false);
-					while (sTok.hasMoreTokens())
+					String[] assoc = appliedToKey.split(Constants.COMMA, -1);
+					for (String string : assoc)
 					{
-						ability.addAssociated(sTok.nextToken());
+						ability.addAssociated(string);
 					}
 				}
 			}


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