From: <cpm...@us...> - 2011-02-09 11:53:18
|
Revision: 14534 http://pcgen.svn.sourceforge.net/pcgen/?rev=14534&view=rev Author: cpmeister Date: 2011-02-09 11:53:11 +0000 (Wed, 09 Feb 2011) Log Message: ----------- Finished RaceInfoTab Modified Paths: -------------- sandbox/cdomui/code/src/java/pcgen/core/Race.java sandbox/cdomui/code/src/java/pcgen/gui2/tabs/RaceInfoTab.java Modified: sandbox/cdomui/code/src/java/pcgen/core/Race.java =================================================================== --- sandbox/cdomui/code/src/java/pcgen/core/Race.java 2011-02-09 11:51:23 UTC (rev 14533) +++ sandbox/cdomui/code/src/java/pcgen/core/Race.java 2011-02-09 11:53:11 UTC (rev 14534) @@ -26,6 +26,7 @@ import java.math.BigDecimal; import java.util.List; +import pcgen.base.formula.Formula; import pcgen.cdom.enumeration.FormulaKey; import pcgen.cdom.enumeration.Gender; import pcgen.cdom.enumeration.ListKey; @@ -179,7 +180,12 @@ public String getSize() { - return get(FormulaKey.SIZE).toString(); + Formula formula = get(FormulaKey.SIZE); + if (formula != null) + { + return formula.toString(); + } + return null; } public String getMovement() Modified: sandbox/cdomui/code/src/java/pcgen/gui2/tabs/RaceInfoTab.java =================================================================== --- sandbox/cdomui/code/src/java/pcgen/gui2/tabs/RaceInfoTab.java 2011-02-09 11:51:23 UTC (rev 14533) +++ sandbox/cdomui/code/src/java/pcgen/gui2/tabs/RaceInfoTab.java 2011-02-09 11:53:11 UTC (rev 14534) @@ -118,7 +118,7 @@ Hashtable<Object, Object> state = new Hashtable<Object, Object>(); state.put(RaceLabelHandler.class, new RaceLabelHandler(character, selectedRaceLabel)); state.put(SelectRaceAction.class, new SelectRaceAction(character)); - //state.put(RaceTreeViewModel.class, new RaceTreeViewModel(character)); + state.put(RaceTreeViewModel.class, new RaceTreeViewModel(character)); state.put(InfoHandler.class, new InfoHandler(character)); return state; } @@ -126,15 +126,15 @@ public void restoreModels(Hashtable<?, ?> state) { ((RaceLabelHandler) state.get(RaceLabelHandler.class)).install(); - //((InfoHandler) state.get(InfoHandler.class)).install(); - //raceTable.setTreeViewModel((RaceTreeViewModel) state.get(RaceTreeViewModel.class)); + ((InfoHandler) state.get(InfoHandler.class)).install(); + raceTable.setTreeViewModel((RaceTreeViewModel) state.get(RaceTreeViewModel.class)); selectRaceButton.setAction((SelectRaceAction) state.get(SelectRaceAction.class)); } public void storeModels(Hashtable<Object, Object> state) { ((RaceLabelHandler) state.get(RaceLabelHandler.class)).uninstall(); - //((InfoHandler) state.get(InfoHandler.class)).uninstall(); + ((InfoHandler) state.get(InfoHandler.class)).uninstall(); } public TabTitle getTabTitle() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |