[pcgen-commit-svn] SF.net SVN: pcgen:[17662] Trunk/pcgen/code/src/java/pcgen/core/kit/ KitTemplate.java

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

Revision: 17662
          http://pcgen.svn.sourceforge.net/pcgen/?rev=17662&view=rev
Author:   jdempsey
Date:     2012-10-07 12:00:52 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
Fix bug: PF Mode: Raven language selection is unavailable
Issue#: CODE-1555

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitTemplate.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitTemplate.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitTemplate.java	2012-10-07 03:46:24 UTC (rev 17661)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitTemplate.java	2012-10-07 12:00:52 UTC (rev 17662)
@@ -52,7 +52,7 @@
 	public void apply(PlayerCharacter aPC)
 	{
 		HashMapToList<PCTemplate, PCTemplate> selectedMap =
-			buildSelectedTemplateMap(aPC);
+			buildSelectedTemplateMap(aPC, true);
 
 		boolean tempShowHP = SettingsHandler.getShowHPDialogAtLevelUp();
 		SettingsHandler.setShowHPDialogAtLevelUp(false);
@@ -85,7 +85,7 @@
 		List<String> warnings)
 	{
 		HashMapToList<PCTemplate, PCTemplate> selectedMap =
-				buildSelectedTemplateMap(aPC);
+				buildSelectedTemplateMap(aPC, false);
 
 		if (selectedMap.size() > 0)
 		{
@@ -97,16 +97,20 @@
 	/**
 	 * Extract the templates to be applied and their choices
 	 * @param aPC The PC the kit is being applied to.
+	 * @param apply Is this a real application, false if a test run. 
 	 * @return The map of templates and child templates to be added
 	 */
 	private HashMapToList<PCTemplate, PCTemplate> buildSelectedTemplateMap(
-		PlayerCharacter aPC)
+		PlayerCharacter aPC, boolean apply)
 	{
 		boolean tempShowHP = SettingsHandler.getShowHPDialogAtLevelUp();
 		SettingsHandler.setShowHPDialogAtLevelUp(false);
 		final String oldChooser = ChooserFactory.getInterfaceClassname();
-		ChooserFactory.setInterfaceClassname(
-			"pcgen.util.chooser.RandomChooser"); //$NON-NLS-1$
+		if (!apply)
+		{
+			ChooserFactory.setInterfaceClassname(
+				"pcgen.util.chooser.RandomChooser"); //$NON-NLS-1$
+		}
 		HashMapToList<PCTemplate, PCTemplate> selectedMap =
 			new HashMapToList<PCTemplate, PCTemplate>();
 
@@ -131,7 +135,10 @@
 			selectedMap.addAllToListFor(templateToAdd, subAdded);
 		}
 
-		ChooserFactory.setInterfaceClassname(oldChooser);
+		if (!apply)
+		{
+			ChooserFactory.setInterfaceClassname(oldChooser);
+		}
 		SettingsHandler.setShowHPDialogAtLevelUp(tempShowHP);
 		return selectedMap;
 	}

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