[pcgen-commit-svn] SF.net SVN: pcgen: [471] Trunk/pcgen/code/src/test/pcgen/core/chooser

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

Revision: 471
Author:   nuance
Date:     2006-03-25 23:00:03 -0800 (Sat, 25 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/pcgen/?rev=471&view=rev

Log Message:
-----------
fix bug

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/chooser/MiscChoiceManager.java
    Trunk/pcgen/code/src/test/pcgen/core/chooser/MiscChoiceManagerTest.java
Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/MiscChoiceManager.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/chooser/MiscChoiceManager.java	2006-03-26 06:57:10 UTC (rev 470)
+++ Trunk/pcgen/code/src/java/pcgen/core/chooser/MiscChoiceManager.java	2006-03-26 07:00:03 UTC (rev 471)
@@ -53,7 +53,8 @@
 		super(aPObject, choiceString, aPC);
 		chooserHandled = "MISC";
 		
-		if (((String) choices.get(0)).equals(chooserHandled)) {
+		if (choices != null && choices.size() > 0 &&
+				((String) choices.get(0)).equals(chooserHandled)) {
 			choices.remove(0);
 		}
 	}

Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/MiscChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/MiscChoiceManagerTest.java	2006-03-26 06:57:10 UTC (rev 470)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/MiscChoiceManagerTest.java	2006-03-26 07:00:03 UTC (rev 471)
@@ -91,6 +91,7 @@
 			
 			aField  = (Field) TestHelper.findField(cMClass, "choices");
 			List choices = (List) aField.get(choiceManager);
+			is (new Integer (choices.size()), eq(3));
 			is (choices.get(0), strEq("Foo"));
 			is (choices.get(1), strEq("Bar"));
 			is (choices.get(2), strEq("Baz"));


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