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

[<th...@us...>]

Revision: 8760
          http://pcgen.svn.sourceforge.net/pcgen/?rev=8760&view=rev
Author:   thpr
Date:     2008-12-31 19:43:22 +0000 (Wed, 31 Dec 2008)

Log Message:
-----------
additional fixes

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/plugin/lsttokens/QualifyToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/ServesAsToken.java

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/QualifyToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/QualifyToken.java	2008-12-31 19:40:49 UTC (rev 8759)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/QualifyToken.java	2008-12-31 19:43:22 UTC (rev 8760)
@@ -77,7 +77,8 @@
 	{
 		if (!getLegalTypes().contains(obj.getClass()))
 		{
-			Logging.log(Logging.LST_ERROR, "Cannot use QUALIFY on a " + obj.getClass());
+			Logging.log(Logging.LST_ERROR, "Cannot use QUALIFY on a "
+					+ obj.getClass());
 			return false;
 		}
 		if (isEmpty(value) || hasIllegalSeparator('|', value))
@@ -118,6 +119,12 @@
 			categoryName = firstToken.substring(equalLoc + 1);
 		}
 		Class<? extends CDOMObject> c = StringPClassUtil.getClassFor(className);
+		if (c == null)
+		{
+			Logging.log(Logging.LST_ERROR, getTokenName()
+					+ " does not understand object type: " + className);
+			return false;
+		}
 		ReferenceManufacturer<? extends CDOMObject, ?> rm;
 		if (CategorizedCDOMObject.class.isAssignableFrom(c))
 		{

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/ServesAsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/ServesAsToken.java	2008-12-31 19:40:49 UTC (rev 8759)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/ServesAsToken.java	2008-12-31 19:43:22 UTC (rev 8760)
@@ -108,6 +108,13 @@
 						+ " expecting a POBJECT Type, found: " + key);
 				return false;
 			}
+			if (!servingClass.equals(obj.getClass()))
+			{
+				Logging.log(Logging.LST_ERROR, getTokenName()
+						+ " expecting a POBJECT Type valid for "
+						+ obj.getClass().getSimpleName() + ", found: " + key);
+				return false;
+			}
 			mfg = context.ref.getManufacturer(servingClass);
 		}
 		else
@@ -122,6 +129,13 @@
 			key = key.substring(0, equalLoc);
 			AbilityCategory cat = SettingsHandler.getGame().getAbilityCategory(
 					category);
+			if (cat == null)
+			{
+				Logging.log(Logging.LST_ERROR,
+						"Could not find AbilityCategory " + category + " in "
+								+ getTokenName());
+				return false;
+			}
 			mfg = context.ref.getManufacturer(Ability.class, cat);
 		}
 		if (!st.hasMoreTokens())


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