From: <jde...@us...> - 2012-02-12 11:35:59
|
Revision: 16176 http://pcgen.svn.sourceforge.net/pcgen/?rev=16176&view=rev Author: jdempsey Date: 2012-02-12 11:35:53 +0000 (Sun, 12 Feb 2012) Log Message: ----------- Spells Tab - Domain Spell Support Issue#: CODE-1225 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellFacadeImplem.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-02-12 08:10:35 UTC (rev 16175) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-02-12 11:35:53 UTC (rev 16176) @@ -1779,6 +1779,7 @@ remainingDomains.setReference(theCharacter.getMaxCharacterDomains() - theCharacter.getDomainCount()); updateDomainTodo(); + spellSupportFacade.refreshAvailableKnownSpells(); } /* (non-Javadoc) @@ -1799,6 +1800,7 @@ remainingDomains.setReference(theCharacter.getMaxCharacterDomains() - theCharacter.getDomainCount()); updateDomainTodo(); + spellSupportFacade.refreshAvailableKnownSpells(); } /** Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellFacadeImplem.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellFacadeImplem.java 2012-02-12 08:10:35 UTC (rev 16175) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellFacadeImplem.java 2012-02-12 11:35:53 UTC (rev 16176) @@ -26,6 +26,7 @@ import pcgen.cdom.enumeration.ListKey; import pcgen.cdom.enumeration.SourceFormat; +import pcgen.core.Domain; import pcgen.core.Globals; import pcgen.core.PlayerCharacter; import pcgen.core.character.CharacterSpell; @@ -168,6 +169,10 @@ { buff.append(charSpell.toString()); } + if (charSpell != null && charSpell.getOwner() instanceof Domain) + { + buff.append(" [").append(charSpell.getOwner().toString()).append("]"); + } if (spellInfo != null) { buff.append(spellInfo.toString()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-02-14 23:58:26
|
Revision: 16208 http://pcgen.svn.sourceforge.net/pcgen/?rev=16208&view=rev Author: jdempsey Date: 2012-02-14 23:58:19 +0000 (Tue, 14 Feb 2012) Log Message: ----------- Tidy up spells display for multiples of a single spell Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java 2012-02-14 23:11:42 UTC (rev 16207) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java 2012-02-14 23:58:19 UTC (rev 16208) @@ -1194,7 +1194,7 @@ int level = spellInfo.getActualLevel(); int count = spellCountMap.containsKey(level) ? spellCountMap.get(level) : 0; - count++; + count += spellInfo.getTimes(); spellCountMap.put(level, count); if (level > highestSpellLevel) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java 2012-02-14 23:11:42 UTC (rev 16207) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java 2012-02-14 23:58:19 UTC (rev 16208) @@ -1599,7 +1599,7 @@ String countStr = ""; if (count != 1) { - countStr = " (" + count + ")"; + countStr = " (x" + count + ")"; } if (spell != null) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2012-03-01 22:28:46
|
Revision: 16399 http://pcgen.svn.sourceforge.net/pcgen/?rev=16399&view=rev Author: thpr Date: 2012-03-01 22:28:38 +0000 (Thu, 01 Mar 2012) Log Message: ----------- Add @Override as appropriate Cleans up warnings by adding appropriate Generics items Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/DescriptionFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/DomainFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentListFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/GeneralChooserFacadeBase.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2CampaignInfoFactory.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/PartyFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellFacadeImplem.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/TodoFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -134,6 +134,7 @@ activeAbilityFacet.addDataFacetChangeListener(new DataFacetChangeListener<Ability>() { + @Override public void dataAdded(DataFacetChangeEvent<Ability> dfce) { if (dfce.getCharID() != charID) @@ -145,17 +146,18 @@ } Logging.debugPrint("Got active ability added of " + dfce.getCDOMObject()); Ability ability = dfce.getCDOMObject(); - if (dfce instanceof CategorizedDataFacetChangeEvent<?>) + if (dfce instanceof CategorizedDataFacetChangeEvent) { - CategorizedDataFacetChangeEvent categorizedEvent = - (CategorizedDataFacetChangeEvent) dfce; + CategorizedDataFacetChangeEvent<?> categorizedEvent = + (CategorizedDataFacetChangeEvent<?>) dfce; AbilityCategory cat = (AbilityCategory) categorizedEvent.getCategory(); Nature nature = categorizedEvent.getNature(); addAbilityToLists(cat, ability, nature); } } + @Override public void dataRemoved(DataFacetChangeEvent<Ability> dfce) { if (dfce.getCharID() != charID) @@ -169,11 +171,11 @@ } Logging.debugPrint("Got active ability removed of " + dfce.getCDOMObject()); Ability ability = dfce.getCDOMObject(); - if (dfce instanceof CategorizedDataFacetChangeEvent<?>) + if (dfce instanceof CategorizedDataFacetChangeEvent) { - CategorizedDataFacetChangeEvent categorizedEvent = - (CategorizedDataFacetChangeEvent) dfce; + CategorizedDataFacetChangeEvent<?> categorizedEvent = + (CategorizedDataFacetChangeEvent<?>) dfce; AbilityCategory cat = (AbilityCategory) categorizedEvent.getCategory(); Nature nature = categorizedEvent.getNature(); removeAbilityFromLists(cat, ability, nature); @@ -183,6 +185,7 @@ grantedAbilityFacet.addDataFacetChangeListener(new DataFacetChangeListener<Ability>() { + @Override public void dataAdded(DataFacetChangeEvent<Ability> dfce) { if (dfce.getCharID() != charID) @@ -197,6 +200,7 @@ rebuildAbilityLists(); } + @Override public void dataRemoved(DataFacetChangeEvent<Ability> dfce) { if (dfce.getCharID() != charID) @@ -216,6 +220,7 @@ directAbilityFacet.addDataFacetChangeListener(new DataFacetChangeListener<CategorizedAbilitySelection>() { + @Override public void dataAdded( DataFacetChangeEvent<CategorizedAbilitySelection> dfce) { @@ -235,6 +240,7 @@ updateAbilityCategoryLater(cas.getAbilityCategory()); } + @Override public void dataRemoved( DataFacetChangeEvent<CategorizedAbilitySelection> dfce) { @@ -842,6 +848,7 @@ { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { updateAbilityCategoryTodo(cat); @@ -860,6 +867,7 @@ { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { updateAbilityCategoryTodo(category); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -533,6 +533,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#addAbility(pcgen.core.facade.AbilityCategoryFacade, pcgen.core.facade.AbilityFacade) */ + @Override public void addAbility(AbilityCategoryFacade category, AbilityFacade ability) { characterAbilities.addAbility(category, ability); @@ -542,6 +543,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#removeAbility(pcgen.core.facade.AbilityCategoryFacade, pcgen.core.facade.AbilityFacade) */ + @Override public void removeAbility(AbilityCategoryFacade category, AbilityFacade ability) { @@ -552,6 +554,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getAbilities(pcgen.core.facade.AbilityCategoryFacade) */ + @Override public ListFacade<AbilityFacade> getAbilities( AbilityCategoryFacade category) { @@ -561,6 +564,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getActiveAbilityCategories() */ + @Override public ListFacade<AbilityCategoryFacade> getActiveAbilityCategories() { return characterAbilities.getActiveAbilityCategories(); @@ -569,6 +573,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getTotalSelections(pcgen.core.facade.AbilityCategoryFacade) */ + @Override public int getTotalSelections(AbilityCategoryFacade category) { return characterAbilities.getTotalSelections(category); @@ -577,6 +582,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getRemainingSelections(pcgen.core.facade.AbilityCategoryFacade) */ + @Override public int getRemainingSelections(AbilityCategoryFacade category) { return characterAbilities.getRemainingSelections(category); @@ -585,6 +591,7 @@ /** * {@inheritDoc} */ + @Override public void addAbilityCatSelectionListener(ChangeListener listener) { characterAbilities.addAbilityCatSelectionListener(listener); @@ -593,6 +600,7 @@ /** * {@inheritDoc} */ + @Override public void removeAbilityCatSelectionListener(ChangeListener listener) { characterAbilities.removeAbilityCatSelectionListener(listener); @@ -601,6 +609,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setRemainingSelection(pcgen.core.facade.AbilityCategoryFacade, int) */ + @Override public void setRemainingSelection(AbilityCategoryFacade category, int remaining) { @@ -610,6 +619,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#hasAbility(pcgen.core.facade.AbilityCategoryFacade, pcgen.core.facade.AbilityFacade) */ + @Override public boolean hasAbility(AbilityCategoryFacade category, AbilityFacade ability) { return characterAbilities.hasAbility(category, ability); @@ -618,6 +628,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getAbilityNature(pcgen.core.facade.AbilityFacade) */ + @Override public Nature getAbilityNature(AbilityFacade ability) { if (ability == null || !(ability instanceof Ability)) @@ -630,6 +641,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#addCharacterLevels(pcgen.core.facade.ClassFacade[]) */ + @Override public void addCharacterLevels(ClassFacade[] classes) { SettingsHandler.setShowHPDialogAtLevelUp(false); @@ -683,6 +695,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#removeCharacterLevels(int) */ + @Override public void removeCharacterLevels(int levels) { for (int i = levels; i > 0 && !pcClassLevels.isEmpty(); i--) @@ -739,6 +752,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getClassLevel(pcgen.core.facade.ClassFacade) */ + @Override public int getClassLevel(ClassFacade c) { int clsLevel = 0; @@ -755,6 +769,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getLevels() */ + @Override public ListFacade<CharacterLevelFacade> getLevels() { return pcClassLevels; @@ -1039,23 +1054,27 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getAvailableTempBonuses() */ + @Override public ListFacade<TempBonusFacade> getAvailableTempBonuses() { return availTempBonuses; } + @Override public void addTempBonus(TempBonusFacade bonus) { appliedTempBonuses.addElement(bonus); refreshLanguageList(); } + @Override public void removeTempBonus(TempBonusFacade bonus) { appliedTempBonuses.removeElement(bonus); refreshLanguageList(); } + @Override public ListFacade<TempBonusFacade> getTempBonuses() { return appliedTempBonuses; @@ -1064,6 +1083,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getAlignmentRef() */ + @Override public ReferenceFacade<AlignmentFacade> getAlignmentRef() { return alignment; @@ -1072,6 +1092,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setAlignment(pcgen.core.facade.AlignmentFacade) */ + @Override public void setAlignment(AlignmentFacade alignment) { if (!validateAlignmentChange(alignment)) @@ -1210,6 +1231,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getDataSet() */ + @Override public DataSetFacade getDataSet() { return dataSet; @@ -1218,6 +1240,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getEquipmentSets() */ + @Override public ListFacade<EquipmentSetFacade> getEquipmentSets() { return equipmentSets; @@ -1226,6 +1249,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getGenderRef() */ + @Override public ReferenceFacade<GenderFacade> getGenderRef() { return gender; @@ -1234,6 +1258,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setGender(pcgen.cdom.enumeration.Gender) */ + @Override public void setGender(GenderFacade gender) { this.selectedGender = gender.toString(); @@ -1242,6 +1267,7 @@ refreshLanguageList(); } + @Override public void setGender(String gender) { this.selectedGender = gender; @@ -1259,6 +1285,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getModTotal(pcgen.core.facade.StatFacade) */ + @Override public int getModTotal(StatFacade stat) { if (stat instanceof PCStat && !theCharacter.isNonAbility((PCStat) stat)) @@ -1272,6 +1299,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getScoreTotalRef(pcgen.core.facade.StatFacade) */ + @Override public ReferenceFacade<Integer> getScoreBaseRef(StatFacade stat) { DefaultReferenceFacade<Integer> score = statScoreMap.get(stat); @@ -1288,6 +1316,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getScoreBase(pcgen.core.facade.StatFacade) */ + @Override public int getScoreBase(StatFacade stat) { if (!(stat instanceof PCStat)) @@ -1300,6 +1329,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getScoreTotalString(pcgen.core.facade.StatFacade) */ + @Override public String getScoreTotalString(StatFacade stat) { if (!(stat instanceof PCStat)) @@ -1318,6 +1348,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getScoreRaceBonus(pcgen.core.facade.StatFacade) */ + @Override public int getScoreRaceBonus(StatFacade stat) { if (!(stat instanceof PCStat)) @@ -1341,6 +1372,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getScoreOtherBonus(pcgen.core.facade.StatFacade) */ + @Override public int getScoreOtherBonus(StatFacade stat) { if (!(stat instanceof PCStat)) @@ -1365,6 +1397,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setScoreBase(pcgen.core.facade.StatFacade, int) */ + @Override public void setScoreBase(StatFacade stat, int score) { DefaultReferenceFacade<Integer> facade = statScoreMap.get(stat); @@ -1508,6 +1541,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#rollStats() */ + @Override public void rollStats() { GameMode game = (GameMode) dataSet.getGameMode(); @@ -1540,6 +1574,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#isStatRollEnabled() */ + @Override public boolean isStatRollEnabled() { return (charLevelsFacade.getSize() == 0); @@ -1571,6 +1606,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getSkillModifier(pcgen.core.facade.SkillFacade) */ + @Override public int getSkillModifier(SkillFacade skill, CharacterLevelFacade level) { if (skill.getKeyStat() == null) @@ -1592,6 +1628,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getSkillRanks(pcgen.core.facade.SkillFacade) */ + @Override public float getSkillRanks(SkillFacade skill, CharacterLevelFacade finallevel) { return charLevelsFacade.getSkillRanks(finallevel, skill); @@ -1618,6 +1655,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getMaxRanks(pcgen.cdom.enumeration.SkillCost, pcgen.core.facade.CharacterLevelFacade) */ + @Override public float getMaxRanks(SkillCost cost, CharacterLevelFacade level) { if (cost == null || level == null || !pcClassLevels.containsElement(level)) @@ -1634,6 +1672,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getUndoManager() */ + @Override public UndoManager getUndoManager() { return undoManager; @@ -1642,6 +1681,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getRaceRef() */ + @Override public ReferenceFacade<RaceFacade> getRaceRef() { return race; @@ -1650,6 +1690,7 @@ /** * @return A reference to a list containing the character's race. */ + @Override public ListFacade<RaceFacade> getRaceAsList() { return raceList; @@ -1658,6 +1699,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setRace(pcgen.core.facade.RaceFacade) */ + @Override public void setRace(RaceFacade race) { // TODO: We don't have a HP dialog implemented yet, so don't try to show it @@ -1715,6 +1757,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getTabNameRef() */ + @Override public ReferenceFacade<String> getTabNameRef() { return tabName; @@ -1723,6 +1766,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setTabName(java.lang.String) */ + @Override public void setTabName(String name) { tabName.setReference(name); @@ -1732,6 +1776,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getNameRef() */ + @Override public ReferenceFacade<String> getNameRef() { return name; @@ -1740,6 +1785,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setName(java.lang.String) */ + @Override public void setName(String name) { this.name.setReference(name); @@ -1760,6 +1806,7 @@ * @param field The BiographyField to check export rules for. * @return true if the field should be output, false if it may not be. */ + @Override public boolean getExportBioField(BiographyField field) { return !theCharacter.getDisplay().getSuppressBioField(field); @@ -1770,6 +1817,7 @@ * @param field The BiographyField to set export rules for. * @param export Should the field be shown in output. */ + @Override public void setExportBioField(BiographyField field, boolean export) { theCharacter.setSuppressBioField(field, !export); @@ -1778,6 +1826,7 @@ /** * {@inheritDoc} */ + @Override public ReferenceFacade<String> getSkinColorRef() { return skinColor; @@ -1786,6 +1835,7 @@ /** * {@inheritDoc} */ + @Override public void setSkinColor(String color) { skinColor.setReference(color); @@ -1795,6 +1845,7 @@ /** * {@inheritDoc} */ + @Override public ReferenceFacade<String> getHairColorRef() { return hairColor; @@ -1803,6 +1854,7 @@ /** * {@inheritDoc} */ + @Override public void setHairColor(String color) { hairColor.setReference(color); @@ -1812,6 +1864,7 @@ /** * {@inheritDoc} */ + @Override public ReferenceFacade<String> getEyeColorRef() { return eyeColor; @@ -1820,6 +1873,7 @@ /** * {@inheritDoc} */ + @Override public void setEyeColor(String color) { eyeColor.setReference(color); @@ -1829,6 +1883,7 @@ /** * {@inheritDoc} */ + @Override public ReferenceFacade<Integer> getHeightRef() { return heightRef; @@ -1837,6 +1892,7 @@ /** * {@inheritDoc} */ + @Override public void setHeight(int height) { heightRef.setReference(height); @@ -1846,6 +1902,7 @@ /** * {@inheritDoc} */ + @Override public ReferenceFacade<Integer> getWeightRef() { return weightRef; @@ -1854,6 +1911,7 @@ /** * {@inheritDoc} */ + @Override public void setWeight(int weight) { weightRef.setReference(weight); @@ -1863,6 +1921,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getDeityRef() */ + @Override public ReferenceFacade<DeityFacade> getDeityRef() { return deity; @@ -1871,6 +1930,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setDeity(pcgen.core.facade.DeityFacade) */ + @Override public void setDeity(DeityFacade deity) { this.deity.setReference(deity); @@ -1886,6 +1946,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#addDomain(pcgen.core.facade.DomainFacade) */ + @Override public void addDomain(DomainFacade domainFacade) { if (!(domainFacade instanceof DomainFacadeImpl)) @@ -1931,6 +1992,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getDomains() */ + @Override public ListFacade<DomainFacade> getDomains() { return domains; @@ -1939,6 +2001,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#removeDomain(pcgen.core.facade.DomainFacade) */ + @Override public void removeDomain(DomainFacade domain) { domains.removeElement(domain); @@ -1976,6 +2039,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getMaxDomains() */ + @Override public ReferenceFacade<Integer> getMaxDomains() { return maxDomains; @@ -1984,6 +2048,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getRemainingDomainSelectionsRef() */ + @Override public ReferenceFacade<Integer> getRemainingDomainSelectionsRef() { return remainingDomains; @@ -1992,6 +2057,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getAvailableDomains() */ + @Override public ListFacade<DomainFacade> getAvailableDomains() { return availDomains; @@ -2150,6 +2216,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getEquipmentSetRef() */ + @Override public ReferenceFacade<EquipmentSetFacade> getEquipmentSetRef() { return equipSet; @@ -2158,6 +2225,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setEquipmentSet(pcgen.core.facade.EquipmentSetFacade) */ + @Override public void setEquipmentSet(EquipmentSetFacade set) { EquipmentSetFacade oldSet = equipSet.getReference(); @@ -2316,11 +2384,13 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getFileRef() */ + @Override public ReferenceFacade<File> getFileRef() { return file; } + @Override public void setFile(File file) { this.file.setReference(file); @@ -2330,6 +2400,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#export(pcgen.io.ExportHandler, java.io.BufferedWriter) */ + @Override public void export(ExportHandler theHandler, BufferedWriter buf) { final int maxRetries = 3; @@ -2362,6 +2433,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getHandedRef() */ + @Override public ReferenceFacade<SimpleFacade> getHandedRef() { return handedness; @@ -2370,6 +2442,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setHanded(java.lang.String) */ + @Override public void setHanded(SimpleFacade handedness) { this.handedness.setReference(handedness); @@ -2379,6 +2452,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getPlayersNameRef() */ + @Override public ReferenceFacade<String> getPlayersNameRef() { return playersName; @@ -2387,6 +2461,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setPlayersName(java.lang.String) */ + @Override public void setPlayersName(String name) { this.playersName.setReference(name); @@ -2396,6 +2471,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#isQualifiedFor(pcgen.core.facade.ClassFacade) */ + @Override public boolean isQualifiedFor(ClassFacade c) { if (c instanceof PCClass) @@ -2405,6 +2481,7 @@ return false; } + @Override public UIDelegate getUIDelegate() { return delegate; @@ -2429,6 +2506,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#isAutomatic(pcgen.core.facade.LanguageFacade) */ + @Override public boolean isAutomatic(LanguageFacade language) { if (autoLanguagesCache == null) @@ -2441,11 +2519,13 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getCharacterLevelsFacade() */ + @Override public CharacterLevelsFacade getCharacterLevelsFacade() { return charLevelsFacade; } + @Override public DescriptionFacade getDescriptionFacade() { return descriptionFacade; @@ -2454,6 +2534,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setXP(int) */ + @Override public void setXP(final int xp) { if (xp == currentXP.getReference()) @@ -2468,6 +2549,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getXPRef() */ + @Override public ReferenceFacade<Integer> getXPRef() { return currentXP; @@ -2476,6 +2558,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#adjustXP(int) */ + @Override public void adjustXP(final int xp) { int currVal = currentXP.getReference(); @@ -2487,16 +2570,19 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getXPForNextLevelRef() */ + @Override public ReferenceFacade<Integer> getXPForNextLevelRef() { return xpForNextlevel; } + @Override public ReferenceFacade<String> getXPTableNameRef() { return xpTableName; } + @Override public void setXPTable(String newTable) { xpTableName.setReference(newTable); @@ -2517,11 +2603,13 @@ updateLevelTodo(); } + @Override public ReferenceFacade<String> getCharacterTypeRef() { return characterType; } + @Override public void setCharacterType(String newType) { characterType.setReference(newType); @@ -2531,6 +2619,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setAge(int) */ + @Override public void setAge(final int age) { if (age == this.age.getReference()) @@ -2566,6 +2655,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getAgeRef() */ + @Override public ReferenceFacade<Integer> getAgeRef() { return age; @@ -2574,11 +2664,13 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getAgeCategories() */ + @Override public ListFacade<SimpleFacade> getAgeCategories() { return ageCategoryList; } + @Override public void setAgeCategory(final SimpleFacade ageCat) { if (ageCat == this.ageCategory.getReference()) @@ -2608,6 +2700,7 @@ } } + @Override public ReferenceFacade<SimpleFacade> getAgeCategoryRef() { return ageCategory; @@ -2746,6 +2839,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getStatTotalLabelTextRef() */ + @Override public ReferenceFacade<String> getStatTotalLabelTextRef() { return statTotalLabelText; @@ -2754,6 +2848,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getStatTotalTextRef() */ + @Override public ReferenceFacade<String> getStatTotalTextRef() { return statTotalText; @@ -2762,6 +2857,7 @@ /** * @return A reference to the label text for the character's modifier total */ + @Override public ReferenceFacade<String> getModTotalLabelTextRef() { return modTotalLabelText; @@ -2770,6 +2866,7 @@ /** * @return A reference to the text for the character's modifier total */ + @Override public ReferenceFacade<String> getModTotalTextRef() { return modTotalText; @@ -2778,6 +2875,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getTodoList() */ + @Override public ListFacade<TodoFacade> getTodoList() { return todoManager.getTodoList(); @@ -2791,16 +2889,19 @@ return theCharacter; } + @Override public ReferenceFacade<Integer> getTotalHPRef() { return hpRef; } + @Override public ReferenceFacade<Integer> getRollMethodRef() { return rollMethodRef; } + @Override public void refreshRollMethod() { if (!canChangePurchasePool()) @@ -2866,6 +2967,7 @@ /** * {@inheritDoc} */ + @Override public void adjustFunds(BigDecimal modVal) { BigDecimal currFunds = theCharacter.getGold(); @@ -2876,6 +2978,7 @@ /** * {@inheritDoc} */ + @Override public void setFunds(BigDecimal newVal) { theCharacter.setGold(newVal); @@ -2885,6 +2988,7 @@ /** * {@inheritDoc} */ + @Override public ReferenceFacade<BigDecimal> getFundsRef() { return fundsRef; @@ -2893,16 +2997,19 @@ /** * {@inheritDoc} */ + @Override public ReferenceFacade<BigDecimal> getWealthRef() { return wealthRef; } + @Override public ReferenceFacade<GearBuySellFacade> getGearBuySellRef() { return gearBuySellSchemeRef; } + @Override public void setGearBuySellRef(GearBuySellFacade gearBuySell) { gearBuySellSchemeRef.setReference(gearBuySell); @@ -2944,6 +3051,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getPurchasedEquipment() */ + @Override public EquipmentListFacade getPurchasedEquipment() { return purchasedEquip; @@ -2952,6 +3060,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#addPurchasedEquipment(pcgen.core.facade.EquipmentFacade, int) */ + @Override public void addPurchasedEquipment(EquipmentFacade equipment, int quantity, boolean customize) { if (equipment == null || quantity <= 0) @@ -3108,6 +3217,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#removePurchasedEquipment(pcgen.core.facade.EquipmentFacade, int) */ + @Override public void removePurchasedEquipment(EquipmentFacade equipment, int quantity) { if (equipment == null || quantity <= 0) @@ -3134,8 +3244,7 @@ updatedItem.setNumberCarried(new Float(0)); updatedItem.setLocation(EquipmentLocation.NOT_CARRIED); - final Equipment eqParent = - (Equipment) updatedItem.getParent(); + final Equipment eqParent = updatedItem.getParent(); if (eqParent != null) { @@ -3175,6 +3284,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#isQualifiedFor(pcgen.core.facade.EquipmentFacade) */ + @Override public boolean isQualifiedFor(EquipmentFacade equipment) { final Equipment equip = (Equipment) equipment; @@ -3193,6 +3303,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getEquipmentSizedForCharacter(pcgen.core.facade.EquipmentFacade) */ + @Override public EquipmentFacade getEquipmentSizedForCharacter(EquipmentFacade equipment) { final Equipment equip = (Equipment) equipment; @@ -3264,6 +3375,7 @@ * character's size. * @return true if equipment should be auto resize. */ + @Override public boolean isAutoResize() { return theCharacter.isAutoResize(); @@ -3275,6 +3387,7 @@ * * @param autoResize The new value for auto resize equipment option. */ + @Override public void setAutoResize(boolean autoResize) { theCharacter.setAutoResize(autoResize); @@ -3283,6 +3396,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#createEquipmentSet(java.lang.String) */ + @Override public EquipmentSetFacade createEquipmentSet(String name) { String id = EquipmentSetFacadeImpl.getNewIdPath(theCharacter, null); @@ -3298,6 +3412,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#deleteEquipmentSet(pcgen.core.facade.EquipmentSetFacade) */ + @Override public void deleteEquipmentSet(EquipmentSetFacade set) { if (set == null || !(set instanceof EquipmentSetFacadeImpl)) @@ -3311,16 +3426,19 @@ equipmentSets.removeElement(set); } + @Override public ReferenceFacade<String> getCarriedWeightRef() { return carriedWeightRef; } + @Override public ReferenceFacade<String> getLoadRef() { return loadRef; } + @Override public ReferenceFacade<String> getWeightLimitRef() { return weightLimitRef; @@ -3329,6 +3447,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.EquipmentListFacade.EquipmentListListener#quantityChanged(pcgen.core.facade.EquipmentListFacade.EquipmentListEvent) */ + @Override public void quantityChanged(EquipmentListEvent e) { refreshTotalWeight(); @@ -3337,6 +3456,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.event.ListListener#elementAdded(pcgen.core.facade.event.ListEvent) */ + @Override public void elementAdded(ListEvent<EquipmentFacade> e) { refreshTotalWeight(); @@ -3345,6 +3465,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.event.ListListener#elementRemoved(pcgen.core.facade.event.ListEvent) */ + @Override public void elementRemoved(ListEvent<EquipmentFacade> e) { refreshTotalWeight(); @@ -3353,6 +3474,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.event.ListListener#elementsChanged(pcgen.core.facade.event.ListEvent) */ + @Override public void elementsChanged(ListEvent<EquipmentFacade> e) { refreshTotalWeight(); @@ -3405,6 +3527,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade.HitPointListener#hitPointsChanged(pcgen.core.facade.CharacterLevelsFacade.CharacterLevelEvent) */ + @Override public void hitPointsChanged(CharacterLevelEvent e) { hpRef.setReference(theCharacter.hitPoints()); @@ -3413,6 +3536,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getInfoFactory() */ + @Override public InfoFactory getInfoFactory() { return infoFactory; @@ -3421,6 +3545,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#isQualifiedFor(pcgen.core.facade.InfoFacade) */ + @Override public boolean isQualifiedFor(InfoFacade infoFacade) { if (!(infoFacade instanceof PObject)) @@ -3439,6 +3564,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#isQualifiedFor(pcgen.core.facade.DomainFacade) */ + @Override public boolean isQualifiedFor(DomainFacade domainFacade) { if (!(domainFacade instanceof DomainFacadeImpl)) @@ -3460,6 +3586,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#addTemplate(pcgen.core.facade.TemplateFacade) */ + @Override public void addTemplate(TemplateFacade templateFacade) { if (templateFacade == null || !(templateFacade instanceof PCTemplate)) @@ -3489,6 +3616,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#removeTemplate(pcgen.core.facade.TemplateFacade) */ + @Override public void removeTemplate(TemplateFacade templateFacade) { if (templateFacade == null || !(templateFacade instanceof PCTemplate)) @@ -3513,17 +3641,20 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getTemplates() */ + @Override public ListFacade<TemplateFacade> getTemplates() { return templates; } + @Override public void addCharacterChangeListener(CharacterChangeListener listener) { //TODO: implement this } + @Override public void removeCharacterChangeListener(CharacterChangeListener listener) { //TODO: implement this @@ -3532,16 +3663,19 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getSpellSupport() */ + @Override public SpellSupportFacade getSpellSupport() { return spellSupportFacade; } + @Override public ReferenceFacade<File> getPortraitRef() { return portrait; } + @Override public void setPortrait(File file) { portrait.setReference(file); @@ -3549,11 +3683,13 @@ .getAbsolutePath()); } + @Override public ReferenceFacade<Rectangle> getThumbnailCropRef() { return cropRect; } + @Override public void setThumbnailCrop(Rectangle rect) { cropRect.setReference(rect); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -101,11 +101,13 @@ refreshClassList(); } + @Override public CharacterLevelFacade getElementAt(int index) { return charLevels.get(index); } + @Override public int getSize() { return charLevels.size(); @@ -174,6 +176,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getClassTaken(int) */ + @Override public ClassFacade getClassTaken(CharacterLevelFacade level) { if (level == null || !(level instanceof CharacterLevelFacadeImpl)) @@ -209,6 +212,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getHPGained(int) */ + @Override public int getHPGained(CharacterLevelFacade level) { int numHp = getHPRolled(level); @@ -227,6 +231,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getHPRolled(int) */ + @Override public int getHPRolled(CharacterLevelFacade level) { PCClassLevel classLevel = getClassLevel(level); @@ -241,6 +246,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#setHPRolled(int, int) */ + @Override public void setHPRolled(CharacterLevelFacade level, int hp) { PCClassLevel classLevel = getClassLevel(level); @@ -268,6 +274,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getGainedSkillPoints(int) */ + @Override public int getGainedSkillPoints(CharacterLevelFacade level) { PCLevelInfo classLevel = getLevelInfo(level); @@ -277,6 +284,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getMaxRanks(int, pcgen.cdom.enumeration.SkillCost) */ + @Override public float getMaxRanks(CharacterLevelFacade level, SkillCost cost) { if (cost == null || level == null @@ -313,6 +321,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getRankCost(int, pcgen.cdom.enumeration.SkillCost) */ + @Override public int getRankCost(CharacterLevelFacade level, SkillCost cost) { return cost.getCost(); @@ -321,6 +330,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getSkillCost(int, pcgen.core.facade.SkillFacade) */ + @Override public SkillCost getSkillCost(CharacterLevelFacade level, SkillFacade skill) { if (level != null && level instanceof CharacterLevelFacadeImpl) @@ -339,6 +349,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getSkillModifier(int, pcgen.core.facade.SkillFacade) */ + @Override public int getSkillModifier(CharacterLevelFacade level, SkillFacade skill) { if (skill instanceof Skill) @@ -351,6 +362,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getSkillRanks(int, pcgen.core.facade.SkillFacade) */ + @Override public float getSkillRanks(CharacterLevelFacade level, SkillFacade skill) { // TODO Ranks aren't stored by level - have compromised by returning the total. Further discussion needed @@ -364,6 +376,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getSkillTotal(int, pcgen.core.facade.SkillFacade) */ + @Override public int getSkillTotal(CharacterLevelFacade level, SkillFacade skill) { // TODO Ranks aren't stored by level - have compromised by returning the total. Further discussion needed @@ -380,6 +393,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getSpentSkillPoints(int) */ + @Override public int getSpentSkillPoints(CharacterLevelFacade level) { PCLevelInfo classLevel = getLevelInfo(level); @@ -390,6 +404,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#getRemainingSkillPoints(int) */ + @Override public int getRemainingSkillPoints(CharacterLevelFacade level) { PCLevelInfo classLevel = getLevelInfo(level); @@ -399,6 +414,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#investSkillPoints(int, pcgen.core.facade.SkillFacade, int) */ + @Override public boolean investSkillPoints(CharacterLevelFacade level, SkillFacade skill, int points) { if (points == 0 || level == null @@ -469,7 +485,7 @@ } final double cost = sc.getCost(); - double rank = (double)points / cost; + double rank = points / cost; Skill aSkill = (Skill) skill; @@ -486,7 +502,7 @@ if ("".equals(errMessage)) //$NON-NLS-1$ { - classLevel.setSkillPointsRemaining(skillPool - (int) points); + classLevel.setSkillPointsRemaining(skillPool - points); } // @@ -685,6 +701,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#setGainedSkillPoints(int, int) */ + @Override public void setGainedSkillPoints(CharacterLevelFacade level, int points) { int spentSkillPoints = getSpentSkillPoints(level); @@ -734,6 +751,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#addClasListener(pcgen.core.facade.CharacterLevelsFacade.ClassListener) */ + @Override public void addClassListener(ClassListener listener) { listenerList.add(ClassListener.class, listener); @@ -742,6 +760,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#addHitPointListener(pcgen.core.facade.CharacterLevelsFacade.HitPointListener) */ + @Override public void addHitPointListener(HitPointListener listener) { listenerList.add(HitPointListener.class, listener); @@ -750,6 +769,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#addSkillBonusListener(pcgen.core.facade.CharacterLevelsFacade.SkillBonusListener) */ + @Override public void addSkillBonusListener(SkillBonusListener listener) { listenerList.add(SkillBonusListener.class, listener); @@ -758,6 +778,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#addSkillPointListener(pcgen.core.facade.CharacterLevelsFacade.SkillPointListener) */ + @Override public void addSkillPointListener(SkillPointListener listener) { listenerList.add(SkillPointListener.class, listener); @@ -766,6 +787,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#removeClassListener(pcgen.core.facade.CharacterLevelsFacade.ClassListener) */ + @Override public void removeClassListener(ClassListener listener) { listenerList.remove(ClassListener.class, listener); @@ -774,6 +796,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#removeHitPointListener(pcgen.core.facade.CharacterLevelsFacade.HitPointListener) */ + @Override public void removeHitPointListener(HitPointListener listener) { listenerList.remove(HitPointListener.class, listener); @@ -782,6 +805,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#removeSkillBonusListener(pcgen.core.facade.CharacterLevelsFacade.SkillBonusListener) */ + @Override public void removeSkillBonusListener(SkillBonusListener listener) { listenerList.remove(SkillBonusListener.class, listener); @@ -790,6 +814,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterLevelsFacade#removeSkillPointListener(pcgen.core.facade.CharacterLevelsFacade.SkillPointListener) */ + @Override public void removeSkillPointListener(SkillPointListener listener) { listenerList.remove(SkillPointListener.class, listener); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/DescriptionFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/DescriptionFacadeImpl.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/DescriptionFacadeImpl.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -63,6 +63,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.DescriptionFacade#createChronicleEntry() */ + @Override public ChronicleEntryFacade createChronicleEntry() { ChronicleEntry chronicleEntry = new ChronicleEntry(); @@ -74,6 +75,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.DescriptionFacade#removeChronicleEntry(pcgen.core.ChronicleEntry) */ + @Override public void removeChronicleEntry(ChronicleEntryFacade chronicleEntry) { if (chronicleEntry instanceof ChronicleEntry) @@ -86,6 +88,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.DescriptionFacade#getChronicleEntries() */ + @Override public ListFacade<ChronicleEntryFacade> getChronicleEntries() { return chronicleEntries; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/DomainFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/DomainFacadeImpl.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/DomainFacadeImpl.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -78,6 +78,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFacade#getKeyName() */ + @Override public String getKeyName() { return getRawObject().getKeyName(); @@ -86,6 +87,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFacade#getSource() */ + @Override public String getSource() { return SourceFormat.getFormattedString(getRawObject(), Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentListFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentListFacadeImpl.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentListFacadeImpl.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -56,11 +56,13 @@ } } + @Override public void addEquipmentListListener(EquipmentListListener listener) { listenerList.add(EquipmentListListener.class, listener); } + @Override public void removeEquipmentListListener(EquipmentListListener listener) { listenerList.remove(EquipmentListListener.class, listener); @@ -102,6 +104,7 @@ } + @Override public int getQuantity(EquipmentFacade equipment) { if (quantityMap.containsKey(equipment)) @@ -117,11 +120,13 @@ fireQuantityChangedEvent(this, equipment, equipmentList.indexOf(equipment)); } + @Override public EquipmentFacade getElementAt(int index) { return equipmentList.get(index); } + @Override public int getSize() { return equipmentList.size(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -377,6 +377,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#addEquipment(pcgen.core.facade.EquipmentSetFacade.EquipNode, pcgen.core.facade.EquipmentFacade, int) */ + @Override public EquipmentFacade addEquipment(EquipNode node, EquipmentFacade equipment, int quantity) { @@ -491,6 +492,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#removeEquipment(pcgen.core.facade.EquipmentSetFacade.EquipNode, int) */ + @Override public EquipmentFacade removeEquipment(EquipNode node, int quantity) { if (!(node instanceof EquipNodeImpl) || node.getNodeType()!= NodeType.EQUIPMENT) @@ -518,7 +520,7 @@ // the container Equipment Object if (parentNode.getNodeType()==NodeType.EQUIPMENT) { - Equipment eqP = (Equipment) eqI.getParent(); + Equipment eqP = eqI.getParent(); if (eqP != null) { @@ -716,6 +718,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#isContainer(pcgen.core.facade.EquipmentFacade) */ + @Override public boolean isContainer(EquipmentFacade equipment) { if (!(equipment instanceof Equipment)) @@ -730,6 +733,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#setName(java.lang.String) */ + @Override public void setName(String name) { this.name.setReference(name); @@ -739,6 +743,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#addEquipmentTreeListener(pcgen.core.facade.EquipmentSetFacade.EquipmentTreeListener) */ + @Override public void addEquipmentTreeListener(EquipmentTreeListener listener) { listeners.add(listener); @@ -747,6 +752,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#removeEquipmentTreeListener(pcgen.core.facade.EquipmentSetFacade.EquipmentTreeListener) */ + @Override public void removeEquipmentTreeListener(EquipmentTreeListener listener) { listeners.remove(listener); @@ -755,11 +761,13 @@ /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#getNameRef() */ + @Override public ReferenceFacade<String> getNameRef() { return name; } + @Override public EquipmentListFacade getEquippedItems() { return equipmentList; @@ -768,6 +776,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#canEquip(pcgen.core.facade.EquipmentSetFacade.EquipNode, pcgen.core.facade.EquipmentFacade) */ + @Override public boolean canEquip(EquipNode node, EquipmentFacade equipment) { if (!(equipment instanceof Equipment) || node == null) @@ -863,6 +872,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#getPreferredLoc(pcgen.core.facade.EquipmentFacade) */ + @Override public String getPreferredLoc(EquipmentFacade equipment) { for (EquipNode node : equipSlotNodeMap.values()) @@ -914,6 +924,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#removeAllEquipment() */ + @Override public void removeAllEquipment() { List<EquipNode> equipToBeRemoved = new ArrayList<EquipNode>(nodeList.getSize()); @@ -976,6 +987,7 @@ /** * {@inheritDoc} */ + @Override public ListFacade<EquipNode> getNodes() { return nodeList; @@ -984,6 +996,7 @@ /** * {@inheritDoc} */ + @Override public int getQuantity(EquipNode equipNode) { EquipNodeImpl node = (EquipNodeImpl) equipNode; @@ -997,13 +1010,14 @@ default: EquipSet parentEs = theCharacter.getEquipSetByIdPath(node.getIdPath()); - return parentEs == null ? 0 : ((Float)parentEs.getQty()).intValue(); + return parentEs == null ? 0 : parentEs.getQty().intValue(); } } /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#getLocation(pcgen.core.facade.EquipmentSetFacade.EquipNode) */ + @Override public String getLocation(EquipNode equipNode) { EquipNodeImpl node = (EquipNodeImpl) equipNode; @@ -1094,6 +1108,7 @@ /** * {@inheritDoc} */ + @Override public BodyStructureFacade getBodyStructure() { return bodyStructure; @@ -1102,6 +1117,7 @@ /** * {@inheritDoc} */ + @Override public EquipmentFacade getEquipment() { return equipment; @@ -1110,6 +1126,7 @@ /** * {@inheritDoc} */ + @Override public NodeType getNodeType() { return nodeType; @@ -1118,6 +1135,7 @@ /** * {@inheritDoc} */ + @Override public EquipNode getParent() { return parent; @@ -1186,6 +1204,7 @@ /** * {@inheritDoc} */ + @Override public int compareTo(EquipNode o) { if (o instanceof EquipNodeImpl) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/GeneralChooserFacadeBase.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/GeneralChooserFacadeBase.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/GeneralChooserFacadeBase.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -203,26 +203,31 @@ return name; } + @Override public String getAvailableTableTitle() { return availableTableTitle; } + @Override public String getSelectedTableTitle() { return selectedTableTitle; } + @Override public String getAddButtonName() { return addButtonName; } + @Override public String getRemoveButtonName() { return removeButtonName; } + @Override public String getSelectionCountName() { return selectionCountName; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2CampaignInfoFactory.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2CampaignInfoFactory.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2CampaignInfoFactory.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -61,6 +61,7 @@ /** * {@inheritDoc} */ + @Override public String getHTMLInfo(CampaignFacade campaign, List<CampaignFacade> testList) { PersistenceManager pman = PersistenceManager.getInstance(); @@ -79,6 +80,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CampaignInfoFactory#getHTMLInfo(pcgen.core.facade.CampaignFacade) */ + @Override public String getHTMLInfo(CampaignFacade campaign) { if (campaign == null || !(campaign instanceof Campaign)) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -132,6 +132,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getFavoredClass(pcgen.core.facade.RaceFacade) */ + @Override public String getFavoredClass(RaceFacade race) { if (!(race instanceof Race)) @@ -145,6 +146,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getHTMLInfo(pcgen.core.facade.RaceFacade) */ + @Override public String getHTMLInfo(RaceFacade raceFacade) { if (!(raceFacade instanceof Race)) @@ -155,7 +157,7 @@ final HtmlInfoBuilder infoText = new HtmlInfoBuilder(); - if ((race != null) && !race.getKeyName().startsWith("<none")) + if (!race.getKeyName().startsWith("<none")) { infoText.appendTitleElement(OutputNameFormatting.piString(race, false)); @@ -200,10 +202,11 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getHTMLInfo(pcgen.core.facade.ClassFacade, pcgen.core.facade.ClassFacade) */ + @Override public String getHTMLInfo(ClassFacade classFacade, ClassFacade parentClassFacade) { - if (!(classFacade instanceof PCClass) || classFacade == null) + if (!(classFacade instanceof PCClass)) { return EMPTY_STRING; } @@ -307,9 +310,10 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getHTMLInfo(pcgen.core.facade.SkillFacade) */ + @Override public String getHTMLInfo(SkillFacade skillFacade) { - if (!(skillFacade instanceof Skill) || skillFacade == null) + if (!(skillFacade instanceof Skill)) { return EMPTY_STRING; } @@ -383,9 +387,10 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getHTMLInfo(pcgen.core.facade.AbilityFacade) */ + @Override public String getHTMLInfo(AbilityFacade abilityFacade) { - if (!(abilityFacade instanceof Ability) || abilityFacade == null) + if (!(abilityFacade instanceof Ability)) { return EMPTY_STRING; } @@ -465,6 +470,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getHTMLInfo(pcgen.core.facade.DeityFacade) */ + @Override public String getHTMLInfo(DeityFacade deityFacade) { if (!(deityFacade instanceof Deity)) @@ -553,6 +559,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getHTMLInfo(pcgen.core.facade.DomainFacade) */ + @Override public String getHTMLInfo(DomainFacade domainFacade) { if (!(domainFacade instanceof DomainFacadeImpl)) @@ -560,7 +567,7 @@ return EMPTY_STRING; } DomainFacadeImpl domainFI = (DomainFacadeImpl) domainFacade; - Domain aDomain = (Domain) domainFI.getRawObject(); + Domain aDomain = domainFI.getRawObject(); final HtmlInfoBuilder infoText = new HtmlInfoBuilder(); @@ -614,6 +621,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getHTMLInfo(pcgen.core.facade.EquipmentFacade) */ + @Override public String getHTMLInfo(EquipmentFacade equipFacade) { if (equipFacade == null || !(equipFacade instanceof Equipment)) @@ -882,10 +890,10 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getHTMLInfo(pcgen.core.facade.TemplateFacade) */ + @Override public String getHTMLInfo(TemplateFacade templateFacade) { - if (templateFacade == null - || !(templateFacade instanceof TemplateFacade)) + if (templateFacade == null) { return EMPTY_STRING; } @@ -951,7 +959,7 @@ @Override public String getHTMLInfo(KitFacade kitFacade) { - if (kitFacade == null || !(kitFacade instanceof KitFacade)) + if (kitFacade == null) { return EMPTY_STRING; } @@ -1007,6 +1015,7 @@ private static class ObjectTypeComparator implements Comparator<BaseKit> { + @Override public int compare(BaseKit bk1, BaseKit bk2) { String name1 = bk1.getObjectName(); @@ -1018,6 +1027,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getLevelAdjustment(pcgen.core.facade.RaceFacade) */ + @Override public String getLevelAdjustment(RaceFacade raceFacade) { if (!(raceFacade instanceof Race)) @@ -1032,6 +1042,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getPreReqHTML(pcgen.core.facade.RaceFacade) */ + @Override public String getPreReqHTML(RaceFacade race) { if (!(race instanceof Race)) @@ -1045,6 +1056,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getStatAdjustments(pcgen.core.facade.RaceFacade) */ + @Override public String getStatAdjustments(RaceFacade raceFacade) { if (!(raceFacade instanceof Race)) @@ -1086,6 +1098,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getVision(pcgen.core.facade.RaceFacade) */ + @Override public String getVision(RaceFacade race) { if (!(race instanceof Race)) @@ -1095,6 +1108,7 @@ return VisionDisplay.getVision(pc, (Race) race); } + @Override public float getCost(EquipmentFacade equipment) { if (equipment instanceof Equipment) @@ -1104,6 +1118,7 @@ return 0; } + @Override public float getWeight(EquipmentFacade equipment) { if (equipment instanceof Equipment) @@ -1116,6 +1131,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getLevelAdjustment(pcgen.core.facade.TemplateFacade) */ + @Override public String getLevelAdjustment(TemplateFacade templateFacade) { if (!(templateFacade instanceof PCTemplate)) @@ -1130,6 +1146,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getModifier(pcgen.core.facade.TemplateFacade) */ + @Override public String getModifier(TemplateFacade templateFacade) { if (!(templateFacade instanceof PCTemplate)) @@ -1143,6 +1160,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFactory#getPreReqHTML(pcgen.core.facade.TemplateFacade) */ + @Override public String getPreReqHTML(TemplateFacade template) { if (!(template instanceof PCTemplate)) @@ -1153,6 +1171,7 @@ ((PCTemplate) template).getPrerequisiteList(), true); } + @Override public String getHTMLInfo(SpellFacade spell) { if (spell == null || !(spell instanceof SpellFacadeImplem)) @@ -1401,6 +1420,7 @@ /** * {@inheritDoc} */ + @Override public String getDomains(DeityFacade deityFacade) { if (deityFacade == null || !(deityFacade instanceof Deity)) @@ -1424,6 +1444,7 @@ } + @Override public String getPantheons(DeityFacade deityFacade) { if (deityFacade == null || !(deityFacade instanceof Deity)) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -180,6 +180,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.LanguageChooserFacade#addSelected(pcgen.core.facade.LanguageFacade) */ + @Override public void addSelected(LanguageFacade language) { if (numSelectionsRemain.getReference() <= 0) @@ -194,6 +195,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.LanguageChooserFacade#removeSelected(pcgen.core.facade.LanguageFacade) */ + @Override public void removeSelected(LanguageFacade language) { selectedList.removeElement(language); @@ -204,6 +206,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.LanguageChooserFacade#getAvailableList() */ + @Override public ListFacade<LanguageFacade> getAvailableList() { buildLanguageList(); @@ -213,6 +216,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.LanguageChooserFacade#getName() */ + @Override public String getName() { return name; @@ -221,6 +225,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.LanguageChooserFacade#getRemainingSelections() */ + @Override public ReferenceFacade<Integer> getRemainingSelections() { return numSelectionsRemain; @@ -229,6 +234,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.LanguageChooserFacade#getSelectedList() */ + @Override public ListFacade<LanguageFacade> getSelectedList() { return selectedList; @@ -237,6 +243,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.LanguageChooserFacade#commit() */ + @Override @SuppressWarnings("unchecked") public void commit() { @@ -256,6 +263,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.LanguageChooserFacade#rollback() */ + @Override public void rollback() { buildLanguageList(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/PartyFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/PartyFacadeImpl.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/PartyFacadeImpl.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -43,6 +43,7 @@ private DefaultReferenceFacade<File> fileRef = new DefaultReferenceFacade<File>(); + @Override public void export(ExportHandler theHandler, BufferedWriter buf) { Collection<PlayerCharacter> characters = new ArrayList<PlayerCharacter>(); @@ -56,11 +57,13 @@ theHandler.write(characters, buf); } + @Override public ReferenceFacade<File> getFileRef() { return fileRef; } + @Override public void setFile(File file) { fileRef.setReference(file); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellFacadeImplem.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellFacadeImplem.java 2012-03-01 22:28:24 UTC (rev 16398) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellFacadeImplem.java 2012-03-01 22:28:38 UTC (rev 16399) @@ -63,6 +63,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFacade#getSource() */ + @Override public String getSource() { return SourceFormat.getFormattedString(spell, @@ -72,6 +73,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.InfoFacade#getKeyName() */ + @Override public String getKeyName() { return spell.getKeyName(); @@ -80,6 +82,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.SpellFacade#getSchool() */ + @Override public String getSc... [truncated message content] |
From: <jde...@us...> - 2012-03-21 11:17:27
|
Revision: 16588 http://pcgen.svn.sourceforge.net/pcgen/?rev=16588&view=rev Author: jdempsey Date: 2012-03-21 11:17:18 +0000 (Wed, 21 Mar 2012) Log Message: ----------- Implement Companions Tab * Add first cut of available companion list Issue#: CODE-1325 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java Added Paths: ----------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionStub.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-20 17:49:17 UTC (rev 16587) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-21 11:17:18 UTC (rev 16588) @@ -242,6 +242,7 @@ private CharacterAbilities characterAbilities; private DescriptionFacade descriptionFacade; private SpellSupportFacadeImpl spellSupportFacade; + private CompanionSupportFacadeImpl companionSupportFacade; private TodoManager todoManager; private boolean allowDebt; @@ -294,6 +295,7 @@ characterAbilities = new CharacterAbilities(pc, delegate, dataSet, todoManager); descriptionFacade = new DescriptionFacadeImpl(pc); spellSupportFacade = new SpellSupportFacadeImpl(pc, delegate, dataSet, todoManager); + companionSupportFacade = new CompanionSupportFacadeImpl(theCharacter); //TODO: Init appliedTempBonuses appliedTempBonuses = new DefaultListFacade<TempBonusFacade>(); @@ -3875,11 +3877,13 @@ return theCharacter.isDirty(); } + /** + * {@inheritDoc} + */ @Override public CompanionSupportFacade getCompanionSupport() { - //TODO: implement this - return null; + return companionSupportFacade; } @Override Added: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionStub.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionStub.java (rev 0) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionStub.java 2012-03-21 11:17:18 UTC (rev 16588) @@ -0,0 +1,87 @@ +/* + * CompanionStub.java + * Copyright James Dempsey, 2012 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Created on 21/03/2012 9:52:14 PM + * + * $Id$ + */ +package pcgen.gui2.facade; + +import pcgen.core.facade.CompanionStubFacade; +import pcgen.core.facade.DefaultReferenceFacade; +import pcgen.core.facade.RaceFacade; +import pcgen.core.facade.ReferenceFacade; + +/** + * The Class <code>CompanionStub</code> contains a definition of a possible + * companion (i.e. animal companion, familiar, follower etc) for a character. + * + * <br/> + * Last Editor: $Author$ + * Last Edited: $Date$ + * + * @author James Dempsey <jde...@us...> + * @version $Revision$ + */ + +public class CompanionStub implements CompanionStubFacade +{ + + private final DefaultReferenceFacade<RaceFacade> race; + private final String companionType; + + /** + * Create a new instance of CompanionStub + * @param race The race of the possible companion. + * @param companionType The type of companion. + */ + CompanionStub(RaceFacade race, String companionType) + { + this.race = new DefaultReferenceFacade<RaceFacade>(race); + this.companionType = companionType; + } + + /** + * {@inheritDoc} + */ + @Override + public ReferenceFacade<RaceFacade> getRaceRef() + { + return race; + } + + /** + * {@inheritDoc} + */ + @Override + public String getCompanionType() + { + return companionType; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() + { + return "CompanionStub [type=" + companionType + ", race=" + + race + "]"; + } + +} Property changes on: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionStub.java ___________________________________________________________________ Added: svn:keywords + Date Author Revision Id Added: svn:eol-style + native Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-03-20 17:49:17 UTC (rev 16587) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-03-21 11:17:18 UTC (rev 16588) @@ -21,6 +21,14 @@ package pcgen.gui2.facade; import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import pcgen.cdom.base.CDOMObject; +import pcgen.cdom.list.CompanionList; +import pcgen.core.FollowerOption; +import pcgen.core.Globals; import pcgen.core.PlayerCharacter; import pcgen.core.facade.CharacterFacade; import pcgen.core.facade.CompanionFacade; @@ -44,13 +52,39 @@ private DefaultListFacade<CompanionFacadeDelegate> companionList; private PlayerCharacter theCharacter; + private DefaultListFacade<CompanionStubFacade> availCompList; + /** + * Create a new instance of CompanionSupportFacadeImpl + * @param theCharacter The character to be represented. + */ public CompanionSupportFacadeImpl(PlayerCharacter theCharacter) { this.theCharacter = theCharacter; this.companionList = new DefaultListFacade<CompanionFacadeDelegate>(); + this.availCompList = new DefaultListFacade<CompanionStubFacade>(); + initCompData(); } + /** + * Initialisation of the character's companion data. + */ + private void initCompData() + { + List<CompanionStub> companions = new ArrayList<CompanionStub>(); + for (CompanionList compList : Globals.getContext().ref + .getConstructedCDOMObjects(CompanionList.class)) + { + Map<FollowerOption, CDOMObject> fMap = theCharacter.getAvailableFollowers(compList.getKeyName(), null); + for (FollowerOption followerOpt : fMap.keySet()) + { + companions.add(new CompanionStub(followerOpt.getRace(), compList.getKeyName())); + } + } + availCompList.setContents(companions); + //Logging.errorPrint("Available comps" + availCompList); + } + @Override public void addCompanion(CharacterFacade companion) { @@ -118,7 +152,7 @@ @Override public ListFacade<CompanionStubFacade> getAvailableCompanions() { - throw new UnsupportedOperationException("Not supported yet."); + return availCompList; } @Override This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-03-24 22:54:30
|
Revision: 16609 http://pcgen.svn.sourceforge.net/pcgen/?rev=16609&view=rev Author: jdempsey Date: 2012-03-24 22:54:24 +0000 (Sat, 24 Mar 2012) Log Message: ----------- Implement Companions Tab * Tidy up Issue#: CODE-1325 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionStub.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionStub.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionStub.java 2012-03-24 22:04:17 UTC (rev 16608) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionStub.java 2012-03-24 22:54:24 UTC (rev 16609) @@ -80,8 +80,7 @@ @Override public String toString() { - return "CompanionStub [type=" + companionType + ", race=" - + race + "]"; + return race.toString(); } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-03-24 22:04:17 UTC (rev 16608) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-03-24 22:54:24 UTC (rev 16609) @@ -85,7 +85,14 @@ companions.add(new CompanionStub(followerOpt.getRace(), compList.getKeyName())); } int maxVal = theCharacter.getMaxFollowers(compList); - maxCompanionsMap.putValue(compList.toString(), maxVal); + if (maxVal == 0) + { + maxCompanionsMap.removeKey(compList.toString()); + } + else + { + maxCompanionsMap.putValue(compList.toString(), maxVal); + } } availCompList.setContents(companions); Logging.debugPrint("Available comps " + availCompList); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-03-25 00:43:47
|
Revision: 16611 http://pcgen.svn.sourceforge.net/pcgen/?rev=16611&view=rev Author: jdempsey Date: 2012-03-25 00:43:40 +0000 (Sun, 25 Mar 2012) Log Message: ----------- Implement Companions Tab * Selected companions support - first pass Issue#: CODE-1325 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java Added Paths: ----------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionNotLoaded.java Added: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionNotLoaded.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionNotLoaded.java (rev 0) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionNotLoaded.java 2012-03-25 00:43:40 UTC (rev 16611) @@ -0,0 +1,102 @@ +/* + * CompanionNotLoaded.java + * Copyright James Dempsey, 2012 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Created on 25/03/2012 11:07:05 AM + * + * $Id$ + */ +package pcgen.gui2.facade; + +import java.io.File; + +import pcgen.core.facade.CompanionFacade; +import pcgen.core.facade.DefaultReferenceFacade; +import pcgen.core.facade.RaceFacade; +import pcgen.core.facade.ReferenceFacade; + +/** + * The Class <code>CompanionNotLoaded</code> represents a characters's companion + * (familiar, animal companion, mount etc) that is not currently loaded. + * + * <br/> + * Last Editor: $Author$ + * Last Edited: $Date$ + * + * @author James Dempsey <jde...@us...> + * @version $Revision$ + */ +public class CompanionNotLoaded implements CompanionFacade +{ + + private final DefaultReferenceFacade<String> nameRef; + private final DefaultReferenceFacade<File> fileRef; + private final DefaultReferenceFacade<RaceFacade> raceRef; + private final String companionType; + + /** + * Create a new instance of CompanionNotLoaded + * @param name the name of the companion. + * @param file The character file for the companion. + * @param race The race of the companion. + * @param compType The type of companion. + */ + public CompanionNotLoaded(String name, File file, RaceFacade race, String compType) + { + this.nameRef = new DefaultReferenceFacade<String>(name); + this.fileRef = new DefaultReferenceFacade<File>(file); + this.raceRef = new DefaultReferenceFacade<RaceFacade>(race); + this.companionType = compType; + } + + /** + * {@inheritDoc} + */ + @Override + public ReferenceFacade<String> getNameRef() + { + return nameRef; + } + + /** + * {@inheritDoc} + */ + @Override + public ReferenceFacade<File> getFileRef() + { + return fileRef; + } + + /** + * {@inheritDoc} + */ + @Override + public ReferenceFacade<RaceFacade> getRaceRef() + { + return raceRef; + } + + /** + * {@inheritDoc} + */ + @Override + public String getCompanionType() + { + return companionType; + } + +} Property changes on: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionNotLoaded.java ___________________________________________________________________ Added: svn:keywords + Date Author Revision Id Added: svn:eol-style + native Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-03-25 00:09:37 UTC (rev 16610) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-03-25 00:43:40 UTC (rev 16611) @@ -30,14 +30,19 @@ import pcgen.core.FollowerOption; import pcgen.core.Globals; import pcgen.core.PlayerCharacter; +import pcgen.core.character.Follower; import pcgen.core.facade.CharacterFacade; import pcgen.core.facade.CompanionFacade; import pcgen.core.facade.CompanionStubFacade; import pcgen.core.facade.CompanionSupportFacade; +import pcgen.core.facade.PartyFacade; +import pcgen.core.facade.event.ListEvent; +import pcgen.core.facade.event.ListListener; import pcgen.core.facade.util.DefaultListFacade; import pcgen.core.facade.util.DefaultMapFacade; import pcgen.core.facade.util.ListFacade; import pcgen.core.facade.util.MapFacade; +import pcgen.system.CharacterManager; import pcgen.util.Logging; /** @@ -49,7 +54,7 @@ * @see pcgen.gui2.facade.CharacterFacadeImpl * @author Connor Petty <cpm...@us...> */ -public class CompanionSupportFacadeImpl implements CompanionSupportFacade +public class CompanionSupportFacadeImpl implements CompanionSupportFacade, ListListener<CharacterFacade> { private DefaultListFacade<CompanionFacadeDelegate> companionList; @@ -68,6 +73,7 @@ this.availCompList = new DefaultListFacade<CompanionStubFacade>(); this.maxCompanionsMap = new DefaultMapFacade<String, Integer>(); initCompData(); + CharacterManager.getCharacters().addListListener(this); } /** @@ -95,8 +101,20 @@ } } availCompList.setContents(companions); - Logging.debugPrint("Available comps " + availCompList); - Logging.debugPrint("Max comps " + maxCompanionsMap); + Logging.errorPrint("Available comps " + availCompList); + //Logging.debugPrint("Max comps " + maxCompanionsMap); + + for (Follower follower : theCharacter.getFollowerList()) + { + CompanionFacade comp = + new CompanionNotLoaded(follower.getName(), new File( + follower.getFileName()), follower.getRace(), follower + .getType().toString()); + CompanionFacadeDelegate delegate = new CompanionFacadeDelegate(); + delegate.setCompanionFacade(comp); + companionList.addElement(delegate); + } + Logging.errorPrint("Companion list " + companionList); } @Override @@ -155,9 +173,12 @@ File file = delegate.getFileRef().getReference(); if (file.equals(character.getFileRef().getReference())) { - CompanionFacade dummy = null; - //TODO: create dummy CompanionFacade containing follower info from character - delegate.setCompanionFacade(dummy); + CompanionFacade comp = + new CompanionNotLoaded(character.getNameRef() + .getReference(), character.getFileRef() + .getReference(), character.getRaceRef() + .getReference(), delegate.getCompanionType()); + delegate.setCompanionFacade(comp); return; } } @@ -181,4 +202,45 @@ return companionList; } + /** + * {@inheritDoc} + */ + @Override + public void elementAdded(ListEvent<CharacterFacade> e) + { + linkCompanion(e.getElement()); + } + + /** + * {@inheritDoc} + */ + @Override + public void elementRemoved(ListEvent<CharacterFacade> e) + { + unlinkCompanion(e.getElement()); + } + + /** + * {@inheritDoc} + */ + @Override + public void elementsChanged(ListEvent<CharacterFacade> e) + { + PartyFacade characters = CharacterManager.getCharacters(); + for (CharacterFacade characterFacade : characters) + { + linkCompanion(characterFacade); + } + // TODO: Unlink characters no longer open + } + + /** + * {@inheritDoc} + */ + @Override + public void elementModified(ListEvent<CharacterFacade> e) + { + // Ignored. + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-04-07 23:06:59
|
Revision: 16647 http://pcgen.svn.sourceforge.net/pcgen/?rev=16647&view=rev Author: jdempsey Date: 2012-04-07 23:06:52 +0000 (Sat, 07 Apr 2012) Log Message: ----------- Implement Companions Tab * Further companion support Issue#: CODE-1325 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-04-06 20:16:22 UTC (rev 16646) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-04-07 23:06:52 UTC (rev 16647) @@ -91,6 +91,7 @@ import pcgen.core.bonus.BonusObj; import pcgen.core.character.CharacterSpell; import pcgen.core.character.EquipSet; +import pcgen.core.character.Follower; import pcgen.core.chooser.ChoiceManagerList; import pcgen.core.chooser.ChooserUtilities; import pcgen.core.facade.AbilityCategoryFacade; @@ -3887,18 +3888,37 @@ return companionSupportFacade; } + /** + * {@inheritDoc} + */ @Override public String getCompanionType() { - //TODO: implement this + Follower master = theCharacter.getMaster(); + if (master != null) + { + return master.getType().getKeyName(); + } return null; } + /** + * {@inheritDoc} + */ @Override public CharacterStubFacade getMaster() { - //TODO: implement this - return null; + Follower master = theCharacter.getMaster(); + if (master == null) + { + return null; + } + CompanionNotLoaded stub = + new CompanionNotLoaded(master.getName(), new File( + master.getFileName()), master.getRace(), master.getType() + .getKeyName()); + //TODO: match with loaded characters + return stub; } /** Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-04-06 20:16:22 UTC (rev 16646) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-04-07 23:06:52 UTC (rev 16647) @@ -125,6 +125,9 @@ //Logging.debugPrint("Companion list " + companionList); } + /** + * {@inheritDoc} + */ @Override public void addCompanion(CharacterFacade companion, String companionType) { @@ -172,6 +175,9 @@ companionList.addElement(delegate); } + /** + * {@inheritDoc} + */ @Override public void removeCompanion(CompanionFacade companion) { @@ -179,6 +185,17 @@ { return; } + + File compFile = companion.getFileRef().getReference(); + for (Follower follower : theCharacter.getFollowerList()) + { + File followerFile = new File(follower.getFileName()); + if (followerFile.equals(compFile)) + { + theCharacter.delFollower(follower); + break; + } + } companionList.removeElement((CompanionFacadeDelegate) companion); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-05-27 00:15:05
|
Revision: 16759 http://pcgen.svn.sourceforge.net/pcgen/?rev=16759&view=rev Author: jdempsey Date: 2012-05-27 00:14:59 +0000 (Sun, 27 May 2012) Log Message: ----------- Fix bug: Companion - No CompMod Is being applied. Issue#: CODE-1462 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-05-27 00:14:26 UTC (rev 16758) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-05-27 00:14:59 UTC (rev 16759) @@ -716,7 +716,7 @@ /** * Ensure any items that could be affected by the level up or down are refreshed. */ - private void postLevellingUpdates() + void postLevellingUpdates() { characterAbilities.rebuildAbilityLists(); refreshLanguageList(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-05-27 00:14:26 UTC (rev 16758) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-05-27 00:14:59 UTC (rev 16759) @@ -264,6 +264,7 @@ new Follower(theCharacter.getFileName(), theCharacter.getName(), compList); newMaster.setAdjustment(followerOpt.getAdjustment()); compFacadeImpl.getTheCharacter().setMaster(newMaster); + compFacadeImpl.postLevellingUpdates(); // Update the master with the new companion Follower follower = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-05-28 12:47:52
|
Revision: 16771 http://pcgen.svn.sourceforge.net/pcgen/?rev=16771&view=rev Author: jdempsey Date: 2012-05-28 12:47:43 +0000 (Mon, 28 May 2012) Log Message: ----------- Fix bug: Companion Tab - Selections not appearing for Choices (Familiar, Special Mount, etc.) Issue#: CODE-1470 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-05-28 09:54:10 UTC (rev 16770) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-05-28 12:47:43 UTC (rev 16771) @@ -557,6 +557,7 @@ refreshLanguageList(); refreshKitList(); refreshTemplates(); + companionSupportFacade.refreshCompanionData(); } /* (non-Javadoc) @@ -568,6 +569,7 @@ characterAbilities.removeAbility(category, ability); refreshLanguageList(); refreshKitList(); + companionSupportFacade.refreshCompanionData(); } /* (non-Javadoc) @@ -701,6 +703,7 @@ void postLevellingUpdates() { characterAbilities.rebuildAbilityLists(); + companionSupportFacade.refreshCompanionData(); refreshLanguageList(); refreshKitList(); refreshTemplates(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-05-28 09:54:10 UTC (rev 16770) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-05-28 12:47:43 UTC (rev 16771) @@ -87,7 +87,7 @@ this.availCompList = new DefaultListFacade<CompanionStubFacade>(); this.maxCompanionsMap = new DefaultMapFacade<String, Integer>(); this.keyToCompanionListMap = new HashMap<String, CompanionList>(); - initCompData(); + initCompData(true); CharacterManager.getCharacters().addListListener(this); addMasterListeners(nameRef, fileRef); } @@ -146,10 +146,20 @@ } /** - * Initialisation of the character's companion data. + * Refresh the character;s companion information, reflecting any changes in + * the character's qualification for companions. */ - private void initCompData() + void refreshCompanionData() { + initCompData(false); + } + + /** + * Initialisation of the character's companion data. + * @param rebuildCompanionList Should the list of the character;s companions be rebuilt? + */ + private void initCompData(boolean rebuildCompanionList) + { List<CompanionStub> companions = new ArrayList<CompanionStub>(); for (CompanionList compList : Globals.getContext().ref .getConstructedCDOMObjects(CompanionList.class)) @@ -177,15 +187,18 @@ //Logging.debugPrint("Available comps " + availCompList); //Logging.debugPrint("Max comps " + maxCompanionsMap); - for (Follower follower : theCharacter.getFollowerList()) + if (rebuildCompanionList) { - CompanionFacade comp = - new CompanionNotLoaded(follower.getName(), new File( - follower.getFileName()), follower.getRace(), follower - .getType().toString()); - CompanionFacadeDelegate delegate = new CompanionFacadeDelegate(); - delegate.setCompanionFacade(comp); - companionList.addElement(delegate); + for (Follower follower : theCharacter.getFollowerList()) + { + CompanionFacade comp = + new CompanionNotLoaded(follower.getName(), new File( + follower.getFileName()), follower.getRace(), follower + .getType().toString()); + CompanionFacadeDelegate delegate = new CompanionFacadeDelegate(); + delegate.setCompanionFacade(comp); + companionList.addElement(delegate); + } } //Logging.debugPrint("Companion list " + companionList); for (CompanionList compList : Globals.getContext().ref This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-07-13 01:19:17
|
Revision: 16921 http://pcgen.svn.sourceforge.net/pcgen/?rev=16921&view=rev Author: jdempsey Date: 2012-07-13 01:19:10 +0000 (Fri, 13 Jul 2012) Log Message: ----------- Fix bug: Wrong skill points for Pathfinder Eidolon Issue#: CODE-1525 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java 2012-07-13 00:15:48 UTC (rev 16920) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java 2012-07-13 01:19:10 UTC (rev 16921) @@ -922,6 +922,10 @@ protected void refreshChoices(Category<Ability> category) { DefaultListFacade<AbilityFacade> listFacade = abilityListMap.get(category); + if (listFacade == null) + { + return; + } for (AbilityFacade abilityFacade : listFacade) { Ability ability = (Ability) abilityFacade; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-07-13 00:15:48 UTC (rev 16920) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-07-13 01:19:10 UTC (rev 16921) @@ -1309,7 +1309,7 @@ return true; } - private void refreshClassLevelModel() + void refreshClassLevelModel() { List<CharacterLevelFacade> newlevels = new ArrayList<CharacterLevelFacade>(); List<PCClass> newClasses = theCharacter.getClassList(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-07-13 00:15:48 UTC (rev 16920) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-07-13 01:19:10 UTC (rev 16921) @@ -276,10 +276,14 @@ } // Update the companion with the master details + Logging.log(Logging.INFO, + "Setting master to " + theCharacter.getName() //$NON-NLS-1$ + + " for character " + compFacadeImpl); //$NON-NLS-1$ final Follower newMaster = new Follower(theCharacter.getFileName(), theCharacter.getName(), compList); newMaster.setAdjustment(followerOpt.getAdjustment()); compFacadeImpl.getTheCharacter().setMaster(newMaster); + compFacadeImpl.refreshClassLevelModel(); compFacadeImpl.postLevellingUpdates(); // Update the master with the new companion This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-07-13 02:24:42
|
Revision: 16922 http://pcgen.svn.sourceforge.net/pcgen/?rev=16922&view=rev Author: jdempsey Date: 2012-07-13 02:24:35 +0000 (Fri, 13 Jul 2012) Log Message: ----------- Fix bug: Companions not getting abilities added correctly * Added refresh of companion UI info after master levels up. Issue#: CODE-1509 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionFacadeDelegate.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionFacadeDelegate.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionFacadeDelegate.java 2012-07-13 01:19:10 UTC (rev 16921) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionFacadeDelegate.java 2012-07-13 02:24:35 UTC (rev 16922) @@ -61,6 +61,14 @@ raceDelegate.setDelegate(companionFacade.getRaceRef()); } + /** + * @return The CompanionFacade backing this CompanionFacadeDelegate + */ + CompanionFacade getDelegate() + { + return delegate; + } + @Override public ReferenceFacade<String> getNameRef() { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-07-13 01:19:10 UTC (rev 16921) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CompanionSupportFacadeImpl.java 2012-07-13 02:24:35 UTC (rev 16922) @@ -149,12 +149,22 @@ } /** - * Refresh the character;s companion information, reflecting any changes in + * Refresh the character's companion information, reflecting any changes in * the character's qualification for companions. */ void refreshCompanionData() { initCompData(false); + for (CompanionFacadeDelegate delegate : companionList) + { + CompanionFacade compFacade = delegate.getDelegate(); + if (compFacade instanceof CharacterFacadeImpl) + { + CharacterFacadeImpl compFacadeImpl = (CharacterFacadeImpl) compFacade; + compFacadeImpl.refreshClassLevelModel(); + compFacadeImpl.postLevellingUpdates(); + } + } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-08-31 22:42:21
|
Revision: 17093 http://pcgen.svn.sourceforge.net/pcgen/?rev=17093&view=rev Author: jdempsey Date: 2012-08-31 22:42:14 +0000 (Fri, 31 Aug 2012) Log Message: ----------- Auto manage output order of weapons Issue#: CODE-1475 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-08-30 17:42:03 UTC (rev 17092) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-08-31 22:42:14 UTC (rev 17093) @@ -2364,6 +2364,10 @@ oldSet.getEquippedItems().removeListListener(this); oldSet.getEquippedItems().removeEquipmentListListener(this); } + if (set instanceof EquipmentSetFacadeImpl) + { + ((EquipmentSetFacadeImpl)set).activateEquipSet(); + } equipSet.setReference(set); set.getEquippedItems().addListListener(this); set.getEquippedItems().addEquipmentListListener(this); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java 2012-08-30 17:42:03 UTC (rev 17092) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java 2012-08-31 22:42:14 UTC (rev 17093) @@ -328,6 +328,19 @@ } /** + * Make this equipment set the active one. + */ + protected void activateEquipSet() + { + theCharacter.setCalcEquipSetId(eqSet.getIdPath()); + theCharacter.setCalcEquipmentList(); + updateOutputOrder(); + theCharacter.setUseTempMods(eqSet.getUseTempMods()); + theCharacter.calcActiveBonuses(); + theCharacter.setDirty(true); + } + + /** * Add the weight for the item to the total for the set. * * @param equip The equipment item being added @@ -502,10 +515,44 @@ updateTotalWeight(newItem, quantity, parent.getBodyStructure()); updateTotalQuantity(newItem, quantity); updateNaturalWeaponSlots(); + updateOutputOrder(); return newItem; } + /** + * Reorder the equipment for output to cater for any changes in the + * equipment list. Note this assumes this equipment set is the active one + * as it updates the character's master equipment list. + */ + private void updateOutputOrder() + { + List<EquipNode> orderedEquipNodes = + new ArrayList<EquipmentSetFacade.EquipNode>( + nodeList.getContents()); + Collections.sort(orderedEquipNodes); + List<Equipment> processed = + new ArrayList<Equipment>(orderedEquipNodes.size()); + + int outputIndex = 1; + for (EquipNode equipNode : orderedEquipNodes) + { + if (equipNode.getEquipment() != null) + { + Equipment equip = + theCharacter.getEquipmentNamed(equipNode.getEquipment() + .toString()); + // If an item is split in multiple places, don't overwrite its order + if (equip != null && !processed.contains(equip)) + { + equip.setOutputIndex(outputIndex++); + processed.add(equip); + } + } + } + + } + /* (non-Javadoc) * @see pcgen.core.facade.EquipmentSetFacade#removeEquipment(pcgen.core.facade.EquipmentSetFacade.EquipNode, int) */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-10-08 04:59:56
|
Revision: 17675 http://pcgen.svn.sourceforge.net/pcgen/?rev=17675&view=rev Author: jdempsey Date: 2012-10-08 04:59:49 +0000 (Mon, 08 Oct 2012) Log Message: ----------- Fix bug: BONUS:SKILLRANK does not appear to be populating the RANKS box Issue#: CODE-1328 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-08 02:41:40 UTC (rev 17674) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-08 04:59:49 UTC (rev 17675) @@ -392,16 +392,23 @@ GameMode game = (GameMode) dataSet.getGameMode(); rollMethodRef = new DefaultReferenceFacade<Integer>(game.getRollMethod()); - charLevelsFacade = new CharacterLevelsFacadeImpl(theCharacter, delegate, todoManager); + charLevelsFacade = + new CharacterLevelsFacadeImpl(theCharacter, delegate, + todoManager, dataSet); pcClasses = new ArrayList<ClassFacade>(); pcClassLevels = new DefaultListFacade<CharacterLevelFacade>(); refreshClassLevelModel(); charLevelsFacade.addHitPointListener(this); - deity = new DefaultReferenceFacade<DeityFacade>(theCharacter.getDeity()); + deity = + new DefaultReferenceFacade<DeityFacade>(theCharacter.getDeity()); domains = new DefaultListFacade<DomainFacade>(); - maxDomains = new DefaultReferenceFacade<Integer>(theCharacter.getMaxCharacterDomains()); - remainingDomains = new DefaultReferenceFacade<Integer>(theCharacter.getMaxCharacterDomains() - domains.getSize()); + maxDomains = + new DefaultReferenceFacade<Integer>( + theCharacter.getMaxCharacterDomains()); + remainingDomains = + new DefaultReferenceFacade<Integer>( + theCharacter.getMaxCharacterDomains() - domains.getSize()); availDomains = new DefaultListFacade<DomainFacade>(); buildAvailableDomainsList(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2012-10-08 02:41:40 UTC (rev 17674) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2012-10-08 04:59:49 UTC (rev 17675) @@ -36,6 +36,9 @@ import pcgen.cdom.enumeration.CharID; import pcgen.cdom.enumeration.ObjectKey; import pcgen.cdom.enumeration.SkillCost; +import pcgen.cdom.facet.BonusChangeFacet; +import pcgen.cdom.facet.BonusChangeFacet.BonusChangeEvent; +import pcgen.cdom.facet.BonusChangeFacet.BonusChangeListener; import pcgen.cdom.facet.DataFacetChangeEvent; import pcgen.cdom.facet.DataFacetChangeListener; import pcgen.cdom.facet.FacetLibrary; @@ -52,6 +55,7 @@ import pcgen.core.facade.CharacterLevelFacade; import pcgen.core.facade.CharacterLevelsFacade; import pcgen.core.facade.ClassFacade; +import pcgen.core.facade.DataSetFacade; import pcgen.core.facade.SkillFacade; import pcgen.core.facade.TodoFacade.CharacterTab; import pcgen.core.facade.UIDelegate; @@ -76,7 +80,7 @@ */ public class CharacterLevelsFacadeImpl extends AbstractListFacade<CharacterLevelFacade> implements - CharacterLevelsFacade, DataFacetChangeListener<Skill> + CharacterLevelsFacade, DataFacetChangeListener<Skill>, BonusChangeListener { private PlayerCharacter theCharacter; private UIDelegate delegate; @@ -85,17 +89,22 @@ private List<CharacterLevelFacade> charLevels; private final TodoManager todoManager; private CharID charID; + private final DataSetFacade dataSetFacade; /** * Create a new CharacterLevelsFacadeImpl instance for a character. * @param pc The character we are creating the instance for - * @param delegate + * @param delegate The user interface delegate that can do dialogs and choosers for us. + * @param todoManager The user tasks tracker. + * @param dataSetFacade The datasets that the character is using. */ - CharacterLevelsFacadeImpl(PlayerCharacter pc, UIDelegate delegate, TodoManager todoManager) + CharacterLevelsFacadeImpl(PlayerCharacter pc, UIDelegate delegate, + TodoManager todoManager, DataSetFacade dataSetFacade) { this.theCharacter = pc; this.delegate = delegate; this.todoManager = todoManager; + this.dataSetFacade = dataSetFacade; initForCharacter(); } @@ -106,6 +115,12 @@ { SkillFacet skillFacet = FacetLibrary.getFacet(SkillFacet.class); skillFacet.removeDataFacetChangeListener(this); + BonusChangeFacet bcf = FacetLibrary.getFacet(BonusChangeFacet.class); + for (SkillFacade skillFacade : dataSetFacade.getSkills()) + { + bcf.removeBonusChangeListener(this, "SKILLRANK", skillFacade + .getKeyName().toUpperCase()); + } } /** @@ -120,6 +135,13 @@ charID = theCharacter.getCharID(); SkillFacet skillFacet = FacetLibrary.getFacet(SkillFacet.class); skillFacet.addDataFacetChangeListener(this); + BonusChangeFacet bcf = FacetLibrary.getFacet(BonusChangeFacet.class); + for (SkillFacade skillFacade : dataSetFacade.getSkills()) + { + bcf.addBonusChangeListener(this, "SKILLRANK", skillFacade + .getKeyName().toUpperCase()); + } + } @Override @@ -598,7 +620,7 @@ CharacterLevelFacade baseLevel, float newRank) { Skill aSkill = (Skill) skill; - float testRank = theCharacter.getSkillRank(aSkill); + float testRank = SkillRankControl.getTotalRank(theCharacter, aSkill); if (newRank < testRank) { // Removing ranks, so just pass back the top level @@ -1008,4 +1030,17 @@ fireSkillBonusEvent(this, 0, true); } + /** + * {@inheritDoc} + */ + @Override + public void bonusChange(BonusChangeEvent bce) + { + if (bce.getCharID() != charID || bce.getOldVal() == null) + { + return; + } + fireSkillBonusEvent(this, 0, true); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-10-30 08:30:24
|
Revision: 18080 http://pcgen.svn.sourceforge.net/pcgen/?rev=18080&view=rev Author: jdempsey Date: 2012-10-30 08:30:11 +0000 (Tue, 30 Oct 2012) Log Message: ----------- Fix bug: Class specific bonuses to BASESPELLSTAT and BASESPELLKNOWNSTAT ignored * Update bonuses after stats adjustments and equipment add/remove to ensure bonuses from stats are up to date. Issue#: CODE-1813 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-30 03:45:01 UTC (rev 18079) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-30 08:30:11 UTC (rev 18080) @@ -1667,6 +1667,7 @@ theCharacter.setAssoc(pcStat, AssociationKey.STAT_SCORE, score); facade.setReference(score); theCharacter.saveStatIncrease(pcStat, score - baseScore, false); + theCharacter.calcActiveBonuses(); hpRef.setReference(theCharacter.hitPoints()); updateScorePurchasePool(true); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java 2012-10-30 03:45:01 UTC (rev 18079) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java 2012-10-30 08:30:11 UTC (rev 18080) @@ -527,6 +527,7 @@ updateTotalQuantity(newItem, quantity); updateNaturalWeaponSlots(); updateOutputOrder(); + theCharacter.calcActiveBonuses(); return newItem; } @@ -626,6 +627,7 @@ updateTotalWeight(eqI, quantity*-1, targetNode.getBodyStructure()); updateTotalQuantity(eqI, quantity*-1); updateNaturalWeaponSlots(); + theCharacter.calcActiveBonuses(); return eqI; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2013-08-04 22:05:30
|
Revision: 21044 http://sourceforge.net/p/pcgen/code/21044 Author: jdempsey Date: 2013-08-04 22:05:24 +0000 (Sun, 04 Aug 2013) Log Message: ----------- Fix bug: The ability scores are not updated on age category change Issue#: CODE-2225 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2013-08-04 21:42:54 UTC (rev 21043) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2013-08-04 22:05:24 UTC (rev 21044) @@ -1759,6 +1759,7 @@ if (charLevelsFacade != null) { charLevelsFacade.fireSkillBonusEvent(this, 0, true); + charLevelsFacade.updateSkillsTodo(); } } @@ -2984,6 +2985,8 @@ theCharacter.setAge(age); this.age.setReference(age); updateAgeCategoryForAge(); + refreshStatScores(); + refreshLanguageList(); } /** @@ -3047,6 +3050,8 @@ Globals.getBioSet().randomize("AGECAT" + Integer.toString(idx), theCharacter); age.setReference(charDisplay.getAge()); ageCategory.setReference(ageCat); + refreshStatScores(); + refreshLanguageList(); } } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2013-08-04 21:42:54 UTC (rev 21043) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2013-08-04 22:05:24 UTC (rev 21044) @@ -677,7 +677,7 @@ return (rank != null) && (rank > 0.0d); } - private void updateSkillsTodo() + protected void updateSkillsTodo() { if (theCharacter.getSkillPoints() < 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2013-11-29 22:53:37
|
Revision: 22436 http://sourceforge.net/p/pcgen/code/22436 Author: jdempsey Date: 2013-11-29 22:53:34 +0000 (Fri, 29 Nov 2013) Log Message: ----------- Fix bug: Temporary Bonus Panel doesn't update spells available till level up or reload Issue#: CODE-2023 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2013-11-29 21:55:07 UTC (rev 22435) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2013-11-29 22:53:34 UTC (rev 22436) @@ -1054,7 +1054,7 @@ return 0; } - private void refreshAvailableTempBonuses() + void refreshAvailableTempBonuses() { List<TempBonusFacadeImpl> tempBonuses = new ArrayList<TempBonusFacadeImpl>(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java 2013-11-29 21:55:07 UTC (rev 22435) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java 2013-11-29 22:53:34 UTC (rev 22436) @@ -134,7 +134,7 @@ private DefaultListFacade<String> spellBookNames; private DefaultReferenceFacade<String> defaultSpellBook; private TodoManager todoManager; - private CharacterFacade pcFacade; + private CharacterFacadeImpl pcFacade; private final InfoFactory infoFactory; @@ -150,7 +150,7 @@ */ public SpellSupportFacadeImpl(PlayerCharacter pc, UIDelegate delegate, DataSetFacade dataSet, TodoManager todoManager, - CharacterFacade pcFacade) + CharacterFacadeImpl pcFacade) { this.pc = pc; this.infoFactory = pcFacade.getInfoFactory(); @@ -241,6 +241,7 @@ } updateSpellsTodo(); + pcFacade.refreshAvailableTempBonuses(); } /* (non-Javadoc) @@ -256,6 +257,7 @@ knownSpellNodes.removeElement(spell); } updateSpellsTodo(); + pcFacade.refreshAvailableTempBonuses(); } /* (non-Javadoc) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2013-12-09 08:37:56
|
Revision: 22570 http://sourceforge.net/p/pcgen/code/22570 Author: jdempsey Date: 2013-12-09 08:37:52 +0000 (Mon, 09 Dec 2013) Log Message: ----------- Fix bug: Vars or direct bonuses tied to SKILLINFO fail to appear in the ABILITYPOOL's and TO DO summary Issue#: CODE-2407 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2013-12-09 06:33:05 UTC (rev 22569) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2013-12-09 08:37:52 UTC (rev 22570) @@ -413,7 +413,7 @@ charLevelsFacade = new CharacterLevelsFacadeImpl(theCharacter, delegate, - todoManager, dataSet); + todoManager, dataSet, this); pcClasses = new ArrayList<ClassFacade>(); pcClassLevels = new DefaultListFacade<CharacterLevelFacade>(); refreshClassLevelModel(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2013-12-09 06:33:05 UTC (rev 22569) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2013-12-09 08:37:52 UTC (rev 22570) @@ -47,6 +47,7 @@ import pcgen.core.Skill; import pcgen.core.SkillComparator; import pcgen.core.SkillUtilities; +import pcgen.core.analysis.ChooseActivation; import pcgen.core.analysis.SkillModifier; import pcgen.core.analysis.SkillRankControl; import pcgen.core.display.CharacterDisplay; @@ -89,6 +90,7 @@ private final TodoManager todoManager; private CharID charID; private final DataSetFacade dataSetFacade; + private CharacterFacadeImpl characterFacadeImpl; /** * Create a new CharacterLevelsFacadeImpl instance for a character. @@ -96,11 +98,13 @@ * @param delegate The user interface delegate that can do dialogs and choosers for us. * @param todoManager The user tasks tracker. * @param dataSetFacade The datasets that the character is using. + * @param characterFacadeImpl The facade managing the character. */ CharacterLevelsFacadeImpl(PlayerCharacter pc, UIDelegate delegate, - TodoManager todoManager, DataSetFacade dataSetFacade) + TodoManager todoManager, DataSetFacade dataSetFacade, CharacterFacadeImpl characterFacadeImpl) { this.theCharacter = pc; + this.characterFacadeImpl = characterFacadeImpl; this.charDisplay = pc.getDisplay(); this.delegate = delegate; this.todoManager = todoManager; @@ -595,6 +599,12 @@ { theCharacter.removeSkill(aSkill); } + + if (ChooseActivation.hasChooseToken(aSkill) + && characterFacadeImpl != null) + { + characterFacadeImpl.postLevellingUpdates(); + } if (errMessage.length() > 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |