|
From: <jde...@us...> - 2010-06-30 12:09:06
|
Revision: 12391
http://pcgen.svn.sourceforge.net/pcgen/?rev=12391&view=rev
Author: jdempsey
Date: 2010-06-30 11:44:18 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
Fix bug: Race Editor: Errors in console on save
Issue#: CODE-142
Modified Paths:
--------------
Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java
Trunk/pcgen/code/src/java/pcgen/gui/editor/RaceBasePanel.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:31:54 UTC (rev 12390)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java 2010-06-30 11:44:18 UTC (rev 12391)
@@ -773,16 +773,22 @@
// Save favoured classes
//
sel = pnlClasses.getSelectedList();
- aString = EditUtil.delimitArray(sel, '|');
- context.unconditionallyProcess(thisRace, "FAVCLASS", aString);
+ if (sel.length > 0)
+ {
+ aString = EditUtil.delimitArray(sel, '|');
+ context.unconditionallyProcess(thisRace, "FAVCLASS", aString);
+ }
//
// Save choice of auto languages
//
sel = pnlLanguages.getSelectedList2();
- aString = EditUtil.delimitArray(sel, '|');
- context.unconditionallyProcess(thisRace, "CHOOSE", "LANGAUTO|"
- + aString);
+ if (sel.length > 0)
+ {
+ aString = EditUtil.delimitArray(sel, '|');
+ context.unconditionallyProcess(thisRace, "CHOOSE", "LANGAUTO|"
+ + aString);
+ }
//
// Save feats
@@ -798,8 +804,11 @@
//
thisRace.removeAllFromList(Language.STARTING_LIST);
sel = pnlBonusLang.getSelectedList();
- aString = EditUtil.delimitArray(sel, ',');
- context.unconditionallyProcess(thisRace, "LANGBONUS", aString);
+ if (sel.length > 0)
+ {
+ aString = EditUtil.delimitArray(sel, ',');
+ context.unconditionallyProcess(thisRace, "LANGBONUS", aString);
+ }
break;
@@ -1068,8 +1077,11 @@
|| editType == EditorConstants.EDIT_RACE)
{
thisPObject.removeAllFromList(WeaponProf.STARTING_LIST);
- context.unconditionallyProcess(thisPObject, "WEAPONBONUS",
- EditUtil.delimitArray(sel, ','));
+ if (sel.length > 0)
+ {
+ context.unconditionallyProcess(thisPObject, "WEAPONBONUS",
+ EditUtil.delimitArray(sel, ','));
+ }
}
}
}
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/RaceBasePanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/RaceBasePanel.java 2010-06-30 11:31:54 UTC (rev 12390)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/RaceBasePanel.java 2010-06-30 11:44:18 UTC (rev 12391)
@@ -352,7 +352,14 @@
final BonusObj bon = Bonus.newBonus(sb.toString());
thisRace.addToListFor(ListKey.BONUS, bon);
- thisRace.put(IntegerKey.SKILL_POINTS_PER_LEVEL, getBonusSkillPoints());
+ if (getBonusSkillPoints() > 0)
+ {
+ thisRace.put(IntegerKey.SKILL_POINTS_PER_LEVEL, getBonusSkillPoints());
+ }
+ else
+ {
+ thisRace.remove(IntegerKey.SKILL_POINTS_PER_LEVEL);
+ }
thisRace.put(ObjectKey.CHALLENGE_RATING, getCR());
if (getDisplayName() != null && getDisplayName().trim().length() > 0)
{
@@ -360,7 +367,10 @@
}
thisRace.put(IntegerKey.CREATURE_HANDS, getHands());
LoadContext context = Globals.getContext();
- context.unconditionallyProcess(thisRace, "HITDICEADVANCEMENT", txtHitDiceAdvancement.getText());
+ if (txtHitDiceAdvancement.getText().trim().length() > 0)
+ {
+ context.unconditionallyProcess(thisRace, "HITDICEADVANCEMENT", txtHitDiceAdvancement.getText());
+ }
thisRace.put(IntegerKey.LEGS, getLegs());
thisRace.put(FormulaKey.LEVEL_ADJUSTMENT, getLevelAdjustment());
String monsterClass = getMonsterClass();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|