[pcgen-commit-svn] SF.net SVN: pcgen:[12386] Trunk/pcgen/code/src/java/pcgen/gui/editor/ EditorMainForm.java

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

Revision: 12386
          http://pcgen.svn.sourceforge.net/pcgen/?rev=12386&view=rev
Author:   jdempsey
Date:     2010-06-30 11:13:59 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
Fix bug: Domain Editor: Spells lost on save

Issue#: CODE-140

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java	2010-06-30 03:49:01 UTC (rev 12385)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java	2010-06-30 11:13:59 UTC (rev 12386)
@@ -680,19 +680,24 @@
 
 			case EditorConstants.EDIT_DOMAIN:
 
-				//
-				// Save feats
-				//
+				// Clear old data 
 				thisPObject.removeAllFromList(Ability.FEATLIST);
+				EditorMainForm.clearSpellListInfo(thisPObject);
+				context.commit();
 				
+				// Save feats
 				sel = pnlFeats.getSelectedList();
-				aString = EditUtil.delimitArray(sel, '|');
-				context.unconditionallyProcess(thisPObject, "FEAT", aString);
+				if (sel.length>0)
+				{
+					aString = EditUtil.delimitArray(sel, '|');
+					context.unconditionallyProcess(thisPObject, "FEAT", aString);
+				}
 
 				sel = pnlQSpells.getSelectedList();
 				oldItems.add(thisPObject);
-				EditorMainForm.clearSpellListInfo(thisPObject);
 
+				context.ref.constructNowIfNecessary(
+					DomainSpellList.class, thisPObject.getKeyName());
 				for (int i = 0; i < sel.length; ++i)
 				{
 					aString = sel[i].toString();
@@ -1034,8 +1039,11 @@
 				}
 				selList.append((String) sel[i]);
 			}
-			context.unconditionallyProcess(thisPObject, "AUTO:WEAPONPROF",
-					selList.toString());
+			if (selList.length() > 0)
+			{
+				context.unconditionallyProcess(thisPObject, "AUTO:WEAPONPROF",
+						selList.toString());
+			}
 
 			sel = pnlWeapons.getSelectedList2();
 


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