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

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

Revision: 3573
          http://pcgen.svn.sourceforge.net/pcgen/?rev=3573&view=rev
Author:   thpr
Date:     2007-07-27 14:17:09 -0700 (Fri, 27 Jul 2007)

Log Message:
-----------
[ 1761563 ] CHOOSE:WEAPONPROF throws NPE rather than error message
Issue#: 1761563

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProfToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CCSkillListToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipTypeToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatAddToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatListToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/HPToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/LanguageToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NonClassSkillListToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ProficiencyToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/RaceToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProfToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCCSkillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCSkillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellLevelToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellListToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfsToken.java

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProfToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProfToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CCSkillListToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CCSkillListToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CCSkillListToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -26,6 +26,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf('|') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf('|') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipTypeToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipTypeToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipTypeToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -26,6 +26,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf('|') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatAddToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatAddToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatAddToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatListToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatListToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatListToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -26,6 +26,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/HPToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/HPToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/HPToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -26,6 +26,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf('|') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/LanguageToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/LanguageToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/LanguageToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NonClassSkillListToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NonClassSkillListToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NonClassSkillListToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -26,6 +26,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf('[') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ProficiencyToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ProficiencyToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ProficiencyToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/RaceToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/RaceToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/RaceToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProfToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProfToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCCSkillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCCSkillToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCCSkillToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCSkillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCSkillToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToCSkillToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillsNamedToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellLevelToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellLevelToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellLevelToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellListToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellListToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellListToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -26,6 +26,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -26,6 +26,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfsToken.java	2007-07-27 21:12:45 UTC (rev 3572)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProfsToken.java	2007-07-27 21:17:09 UTC (rev 3573)
@@ -29,6 +29,12 @@
 
 	public boolean parse(PObject po, String prefix, String value)
 	{
+		if (value == null)
+		{
+			Logging.errorPrint("CHOOSE:" + getTokenName()
+				+ " requires additional arguments");
+			return false;
+		}
 		if (value.indexOf(',') != -1)
 		{
 			Logging.errorPrint("CHOOSE:" + getTokenName()


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