[pcgen-commit-svn] SF.net SVN: pcgen:[25805] branches/6.04.x/code/src/java/pcgen

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

Revision: 25805
          http://sourceforge.net/p/pcgen/code/25805
Author:   jdempsey
Date:     2014-12-16 22:08:58 +0000 (Tue, 16 Dec 2014)
Log Message:
-----------
Fix bug: [Pathfinder] 0 level wizard spells lost on save
 - Backport to 6.4 branch
Issue#: CODE-2785

Modified Paths:
--------------
    branches/6.04.x/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java
    branches/6.04.x/code/src/java/pcgen/io/PCGVer2Creator.java

Modified: branches/6.04.x/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java
===================================================================
--- branches/6.04.x/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java	2014-12-16 22:03:18 UTC (rev 25804)
+++ branches/6.04.x/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java	2014-12-16 22:08:58 UTC (rev 25805)
@@ -96,6 +96,9 @@
 import pcgen.core.display.SkillCostDisplay;
 import pcgen.core.display.TemplateModifier;
 import pcgen.core.display.VisionDisplay;
+import pcgen.core.kit.BaseKit;
+import pcgen.core.prereq.PrerequisiteUtilities;
+import pcgen.core.spell.Spell;
 import pcgen.facade.core.AbilityFacade;
 import pcgen.facade.core.ClassFacade;
 import pcgen.facade.core.DeityFacade;
@@ -110,9 +113,6 @@
 import pcgen.facade.core.SpellFacade;
 import pcgen.facade.core.TempBonusFacade;
 import pcgen.facade.core.TemplateFacade;
-import pcgen.core.kit.BaseKit;
-import pcgen.core.prereq.PrerequisiteUtilities;
-import pcgen.core.spell.Spell;
 import pcgen.gui2.util.HtmlInfoBuilder;
 import pcgen.system.LanguageBundle;
 import pcgen.system.PCGenSettings;
@@ -1824,7 +1824,11 @@
 		{
 			Map<Integer, Integer> spellCountMap = new TreeMap<Integer, Integer>();
 			int highestSpellLevel = -1;
-			for (CharacterSpell charSpell : charDisplay.getCharacterSpells(pcClass))
+			Collection<? extends CharacterSpell> sp = charDisplay.getCharacterSpells(pcClass);
+			List<CharacterSpell> classSpells = new ArrayList<CharacterSpell>(sp);
+			// Add in the spells granted by objects
+			pc.addBonusKnownSpellsToList(pcClass, classSpells);
+			for (CharacterSpell charSpell : classSpells)
 			{
 				for (SpellInfo spellInfo : charSpell.getInfoList())
 				{

Modified: branches/6.04.x/code/src/java/pcgen/io/PCGVer2Creator.java
===================================================================
--- branches/6.04.x/code/src/java/pcgen/io/PCGVer2Creator.java	2014-12-16 22:03:18 UTC (rev 25804)
+++ branches/6.04.x/code/src/java/pcgen/io/PCGVer2Creator.java	2014-12-16 22:08:58 UTC (rev 25805)
@@ -2135,7 +2135,13 @@
 
 		for (PCClass pcClass : charDisplay.getClassSet())
 		{
-			for (CharacterSpell cSpell : charDisplay.getCharacterSpells(pcClass))
+			Collection<? extends CharacterSpell> sp = charDisplay.getCharacterSpells(pcClass);
+			List<CharacterSpell> classSpells = new ArrayList<CharacterSpell>(sp);
+			// Add in the spells granted by objects
+			thePC.addBonusKnownSpellsToList(pcClass, classSpells);
+			Collections.sort(classSpells);
+			
+			for (CharacterSpell cSpell : classSpells)
 			{
 				for (SpellInfo spellInfo : cSpell.getInfoList())
 				{

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