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

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

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

Log Message:
-----------
Fix bug: Template Editor: Errors in console on save

Issue#: CODE-145

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 11:13:59 UTC (rev 12386)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java	2010-06-30 11:24:22 UTC (rev 12387)
@@ -884,9 +884,12 @@
 
 				PCTemplate thisPCTemplate = (PCTemplate) thisPObject;
 				thisPCTemplate.removeListFor(ListKey.MOVEMENT);
-				Movement cmv = Movement.getMovementFrom(pnlMovement.getMoveValues());
-				cmv.setMoveRatesFlag(pnlMovement.getMoveRateType());
-				thisPCTemplate.addToListFor(ListKey.MOVEMENT, cmv);
+				if (pnlMovement.getMoveValues().length() > 0)
+				{
+					Movement cmv = Movement.getMovementFrom(pnlMovement.getMoveValues());
+					cmv.setMoveRatesFlag(pnlMovement.getMoveRateType());
+					thisPCTemplate.addToListFor(ListKey.MOVEMENT, cmv);
+				}
 
 				thisPCTemplate.removeAllFromList(Vision.VISIONLIST);
 				List<Vision> tplVisionList = pnlVision.getVision();
@@ -926,32 +929,44 @@
 				// Save favoured classes
 				//
 				sel = pnlClasses.getSelectedList();
-				aString = EditUtil.delimitArray(sel, '|');
-				context.unconditionallyProcess(thisPCTemplate, "FAVOREDCLASS", aString);
+				if (sel.length > 0)
+				{
+					aString = EditUtil.delimitArray(sel, '|');
+					context.unconditionallyProcess(thisPCTemplate, "FAVOREDCLASS", aString);
+				}
 
 				//
 				// Save choice of auto languages
 				//
 				sel = pnlLanguages.getSelectedList2();
-				aString = EditUtil.delimitArray(sel, '|');
-				context.unconditionallyProcess(thisPCTemplate, "CHOOSE", "LANGAUTO|"
-					+ aString);
+				if (sel.length > 0)
+				{
+					aString = EditUtil.delimitArray(sel, '|');
+					context.unconditionallyProcess(thisPCTemplate, "CHOOSE", "LANGAUTO|"
+						+ aString);
+				}
 
 				//
 				// Save feats
 				//
 				thisPCTemplate.removeListFor(ListKey.FEAT_TOKEN_LIST);
 				sel = pnlFeats.getSelectedList();
-				aString = EditUtil.delimitArray(sel, '|');
-				context.unconditionallyProcess(thisPCTemplate, "FEAT", aString);
+				if (sel.length > 0)
+				{
+					aString = EditUtil.delimitArray(sel, '|');
+					context.unconditionallyProcess(thisPCTemplate, "FEAT", aString);
+				}
 
 				//
 				// Save bonus languages
 				//
 				thisPCTemplate.removeAllFromList(Language.STARTING_LIST);
 				sel = pnlBonusLang.getSelectedList();
-				aString = EditUtil.delimitArray(sel, ',');
-				context.unconditionallyProcess(thisPCTemplate, "LANGBONUS", aString);
+				if (sel.length > 0)
+				{
+					aString = EditUtil.delimitArray(sel, ',');
+					context.unconditionallyProcess(thisPCTemplate, "LANGBONUS", aString);
+				}
 
 				//
 				// Save level and hit dice abilities


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