From: <jde...@us...> - 2010-07-05 21:08:33
|
Revision: 12455 http://pcgen.svn.sourceforge.net/pcgen/?rev=12455&view=rev Author: jdempsey Date: 2010-07-05 21:08:27 +0000 (Mon, 05 Jul 2010) Log Message: ----------- New Summary Tab - Fix level up to work with new structure Modified Paths: -------------- sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterLevelFacadeImpl.java sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java Modified: sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2010-07-05 19:08:56 UTC (rev 12454) +++ sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2010-07-05 21:08:27 UTC (rev 12455) @@ -401,9 +401,9 @@ { pcClasses.add(classFacade); } - CharacterLevelMock cl = new CharacterLevelMock(classFacade, theCharacter); + CharacterLevelFacadeImpl cl = new CharacterLevelFacadeImpl(classFacade, theCharacter); pcClassLevels.addElement(cl); - charLevelsFacade.addLevelOfClass(classFacade); + charLevelsFacade.addLevelOfClass(cl); } refreshLanguageList(); currentXP.setReference(theCharacter.getXP()); Modified: sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterLevelFacadeImpl.java =================================================================== --- sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterLevelFacadeImpl.java 2010-07-05 19:08:56 UTC (rev 12454) +++ sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterLevelFacadeImpl.java 2010-07-05 21:08:27 UTC (rev 12455) @@ -23,6 +23,7 @@ package pcgen.gui2.facade; import pcgen.cdom.enumeration.SkillCost; +import pcgen.core.PlayerCharacter; import pcgen.core.facade.CharacterLevelFacade; import pcgen.core.facade.ClassFacade; import pcgen.core.facade.SkillFacade; @@ -43,7 +44,16 @@ { private int characterLevel; + private ClassFacade classFacade; + private PlayerCharacter theCharacter; + public CharacterLevelFacadeImpl(ClassFacade classFacade, + PlayerCharacter theCharacter) + { + this.classFacade = classFacade; + this.theCharacter = theCharacter; + } + /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelFacade#getGainedSkillPoints() */ @@ -85,8 +95,7 @@ */ public ClassFacade getSelectedClass() { - // TODO Auto-generated method stub - return null; + return classFacade; } /* (non-Javadoc) Modified: sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java =================================================================== --- sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2010-07-05 19:08:56 UTC (rev 12454) +++ sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2010-07-05 21:08:27 UTC (rev 12455) @@ -134,7 +134,7 @@ classLevels.add(currClass); - CharacterLevelFacadeImpl levelFI = new CharacterLevelFacadeImpl(); + CharacterLevelFacadeImpl levelFI = new CharacterLevelFacadeImpl(currClass, theCharacter); levelFI.setCharacterLevel(currLevel++); addElement(levelFI); //PCClassLevel classLevel = currClass.getClassLevel(clsLvlNum); @@ -597,10 +597,12 @@ * will be updated by our caller. * @param theClass The class the level is in. */ - void addLevelOfClass(ClassFacade theClass) + void addLevelOfClass(CharacterLevelFacadeImpl theClassLevel) { + ClassFacade theClass = theClassLevel.getSelectedClass(); classLevels.add(theClass); totalLevels.setReference(classLevels.size()); + addElement(theClassLevel); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |