From: <jde...@us...> - 2012-03-03 22:07:49
|
Revision: 16424 http://pcgen.svn.sourceforge.net/pcgen/?rev=16424&view=rev Author: jdempsey Date: 2012-03-03 22:07:42 +0000 (Sat, 03 Mar 2012) Log Message: ----------- Fix bug: TEMPLATE - Selected / Granted Pane not displaying Templates granted by other objects Issue#: CODE-1327 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-03 12:46:58 UTC (rev 16423) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-03 22:07:42 UTC (rev 16424) @@ -556,6 +556,7 @@ characterAbilities.addAbility(category, ability); refreshLanguageList(); refreshKitList(); + refreshTemplates(); } /* (non-Javadoc) @@ -698,6 +699,7 @@ characterAbilities.rebuildAbilityLists(); refreshLanguageList(); refreshKitList(); + refreshTemplates(); currentXP.setReference(theCharacter.getXP()); xpForNextlevel.setReference(theCharacter.minXPForNextECL()); xpTableName.setReference(theCharacter.getXPTableName()); @@ -1793,6 +1795,7 @@ xpForNextlevel.setReference(theCharacter.minXPForNextECL()); xpTableName.setReference(theCharacter.getXPTableName()); hpRef.setReference(theCharacter.hitPoints()); + refreshTemplates(); updateLevelTodo(); buildAvailableDomainsList(); @@ -3700,6 +3703,26 @@ } } + private void refreshTemplates() + { + Collection<PCTemplate> pcTemplates = theCharacter.getTemplateSet(); + for (PCTemplate template : pcTemplates) + { + if (!templates.containsElement(template)) + { + templates.addElement(template); + } + } + for (Iterator<TemplateFacade> iterator = templates.iterator(); iterator.hasNext();) + { + PCTemplate pcTemplate = (PCTemplate) iterator.next(); + if (!pcTemplates.contains(pcTemplate)) + { + iterator.remove(); + } + } + } + /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getTemplates() */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |