From: <th...@us...> - 2008-08-04 21:15:08
|
Revision: 7333 http://pcgen.svn.sourceforge.net/pcgen/?rev=7333&view=rev Author: thpr Date: 2008-08-04 21:14:59 +0000 (Mon, 04 Aug 2008) Log Message: ----------- [ 2037511 ] [5.15.0] Races not editable/unable to add new Issue#: 2037511 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui/LstEditorMain.java Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java Trunk/pcgen/code/src/java/pcgen/gui/editor/TemplateBasePanel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui/LstEditorMain.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/LstEditorMain.java 2008-08-04 21:12:27 UTC (rev 7332) +++ Trunk/pcgen/code/src/java/pcgen/gui/LstEditorMain.java 2008-08-04 21:14:59 UTC (rev 7333) @@ -73,8 +73,6 @@ import pcgen.gui.editor.EditorConstants; import pcgen.gui.editor.EditorMainForm; import pcgen.gui.utils.IconUtilitities; -import pcgen.persistence.lst.PCClassLstToken; -import pcgen.persistence.lst.TokenStore; import pcgen.util.Logging; import pcgen.util.PropertyFactory; @@ -247,18 +245,8 @@ else if (originalItem instanceof PCClass) { PCClass copyClass = (PCClass) copyItem; - PCClassLstToken token = - (PCClassLstToken) TokenStore.inst().getTokenMap( - PCClassLstToken.class).get("SPELLLIST"); - if (token == null) - { - //TODO This is due to the change to CDOMPrimaryToken<PCClass> - need to know how these are stored and referenced - Logging.errorPrint("Failed to find SPELLLIST token class in map!"); - } - else - { - token.parse(copyClass, "1|" + originalItem.getKeyName(), -9); - } + Globals.getContext().unconditionallyProcess(copyClass, "SPELLLIST", + "1|" + originalItem.getKeyName()); } } Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java 2008-08-04 21:12:27 UTC (rev 7332) +++ Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java 2008-08-04 21:14:59 UTC (rev 7333) @@ -2468,7 +2468,7 @@ private static void moveGrantedTemplatesFromAvailableToSelected(PObject cdo, List<String> selectedList, List<String> selectedList2, List<String> availableList) { - for (CDOMReference<PCTemplate> ref : cdo.getListFor(ListKey.TEMPLATE)) + for (CDOMReference<PCTemplate> ref : cdo.getSafeListFor(ListKey.TEMPLATE)) { for (PCTemplate pct : ref.getContainedObjects()) { @@ -2478,7 +2478,7 @@ } } - for (CDOMReference<PCTemplate> ref : cdo.getListFor(ListKey.TEMPLATE_CHOOSE)) + for (CDOMReference<PCTemplate> ref : cdo.getSafeListFor(ListKey.TEMPLATE_CHOOSE)) { for (PCTemplate pct : ref.getContainedObjects()) { Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/TemplateBasePanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/editor/TemplateBasePanel.java 2008-08-04 21:12:27 UTC (rev 7332) +++ Trunk/pcgen/code/src/java/pcgen/gui/editor/TemplateBasePanel.java 2008-08-04 21:14:59 UTC (rev 7333) @@ -309,6 +309,10 @@ public void setTemplateSize(final Formula aString) { cmbSize.setSelectedIndex(0); + if (aString == null) + { + return; + } for (int index = 0; index < sizeAbbrev.length; index++) { @@ -505,7 +509,7 @@ setSubRegion(thisPCTemplate.getSubRegion()); setSubRace(thisPCTemplate.getSubRace()); setBonusSkillPoints(thisPCTemplate.getSafe(IntegerKey.BONUS_CLASS_SKILL_POINTS)); - setNonProficiencyPenalty(thisPCTemplate.get(IntegerKey.NONPP)); + setNonProficiencyPenalty(thisPCTemplate.getSafe(IntegerKey.NONPP)); setCR(thisPCTemplate.getCR(-1, -1)); setLevelAdjustment(thisPCTemplate.get(FormulaKey.LEVEL_ADJUSTMENT)); setTemplateSize(thisPCTemplate.get(FormulaKey.SIZE)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |