From: <th...@us...> - 2012-01-17 00:52:48
|
Revision: 15835 http://pcgen.svn.sourceforge.net/pcgen/?rev=15835&view=rev Author: thpr Date: 2012-01-17 00:52:41 +0000 (Tue, 17 Jan 2012) Log Message: ----------- No more getPObjectList() - all CDOMObjects now Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Trunk/pcgen/code/src/java/pcgen/core/analysis/SpellLevel.java Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2012-01-17 00:20:18 UTC (rev 15834) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2012-01-17 00:52:41 UTC (rev 15835) @@ -8173,133 +8173,100 @@ List<? extends CDOMObject> getCDOMObjectList() { List<CDOMObject> list = new ArrayList<CDOMObject>(); - for (CDOMObject po : getPObjectList()) - { - if (po != null) - { - list.add(po); - } - } - for (PCClass cl : getClassSet()) - { - for (int i = 1; i <= getLevel(cl); i++) - { - PCClassLevel classLevel = getActiveClassLevel(cl, i); - list.add(classLevel); - } - } - list.addAll(getConditionalTemplateObjects()); - return list; - } - private Collection<PCTemplate> getConditionalTemplateObjects() - { - return conditionalTemplateFacet.getSet(id); - } - - private List<? extends PObject> getPObjectList() - { - // Possible object types include: - // Campaigns - // Alignment (PCAlignment) - // BioSet (ageSet) - // Check (PObject) - // Class (PCClass) - // CompanionMod - // Deity - // Domain (CharacterDomain) - // Equipment (includes EqMods) - // Feat (virtual feats, auto feats) - // Race - // SizeAdjustment - // Skill - // Stat (PCStat) - // Template (PCTemplate) - // - - final ArrayList<PObject> results = new ArrayList<PObject>(); - // Loaded campaigns - results.addAll(expandedCampaignFacet.getSet(id)); - + list.addAll(expandedCampaignFacet.getSet(id)); + // Alignment PCAlignment align = alignmentFacet.get(id); if (align != null) { - results.add(align); + list.add(align); } - + // armorProfList is still just a list of Strings // results.addAll(getArmorProfList()); // BioSet - results.add(bioSetFacet.get(id)); - - results.addAll(checkFacet.getSet(id)); - + list.add(bioSetFacet.get(id)); + + list.addAll(checkFacet.getSet(id)); + // Class - results.addAll(classFacet.getClassSet(id)); - + list.addAll(classFacet.getClassSet(id)); + // CompanionMod - results.addAll(companionModFacet.getSet(id)); - + list.addAll(companionModFacet.getSet(id)); + // Deity Deity deity = deityFacet.get(id); if (deity != null) { - results.add(deity); + list.add(deity); } - + // Domain - results.addAll(domainFacet.getSet(id)); - + list.addAll(domainFacet.getSet(id)); + // Equipment for (Equipment eq : activeEquipmentFacet.getSet(id)) { - results.add(eq); - + list.add(eq); + for (EquipmentModifier eqMod : eq.getEqModifierList(true)) { - results.add(eqMod); + list.add(eqMod); } - + for (EquipmentModifier eqMod : eq.getEqModifierList(false)) { - results.add(eqMod); + list.add(eqMod); } } - + // Feats and abilities (virtual feats, auto feats) List<Ability> abilities = getFullAbilityList(); - results.addAll(abilities); - + list.addAll(abilities); + // Race Race race = raceFacet.get(id); if (race != null) { - results.add(race); + list.add(race); } - + // SizeAdjustment SizeAdjustment sa = sizeFacet.getSizeAdjustment(id); if (sa != null) { - results.add(sa); + list.add(sa); } - + // Skill - results.addAll(skillFacet.getSet(id)); - + list.addAll(skillFacet.getSet(id)); + // Stat (PCStat) - results.addAll(statFacet.getSet(id)); - + list.addAll(statFacet.getSet(id)); + // Template (PCTemplate) - results.addAll(templateFacet.getSet(id)); + list.addAll(templateFacet.getSet(id)); - // weaponProfList is still just a list of Strings - // results.addAll(getWeaponProfList()); - return results; + for (PCClass cl : getClassSet()) + { + for (int i = 1; i <= getLevel(cl); i++) + { + PCClassLevel classLevel = getActiveClassLevel(cl, i); + list.add(classLevel); + } + } + list.addAll(getConditionalTemplateObjects()); + return list; } + private Collection<PCTemplate> getConditionalTemplateObjects() + { + return conditionalTemplateFacet.getSet(id); + } + /** * @param level */ @@ -10977,7 +10944,7 @@ public boolean hasSpellInSpellbook(Spell spell, String spellbookname) { - for (PObject po : getPObjectList()) + for (CDOMObject po : getCDOMObjectList()) { List<CharacterSpell> csl = getCharacterSpells(po, spell, spellbookname, -1); @@ -11499,7 +11466,7 @@ * @return list of CharacterSpells from the character spell list */ public final List<CharacterSpell> getCharacterSpells( - PObject spellSource, + CDOMObject spellSource, final Spell aSpell, final String book, final int level) Modified: Trunk/pcgen/code/src/java/pcgen/core/analysis/SpellLevel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/analysis/SpellLevel.java 2012-01-17 00:20:18 UTC (rev 15834) +++ Trunk/pcgen/code/src/java/pcgen/core/analysis/SpellLevel.java 2012-01-17 00:52:41 UTC (rev 15835) @@ -10,6 +10,7 @@ import pcgen.base.util.HashMapToList; import pcgen.cdom.base.AssociatedPrereqObject; import pcgen.cdom.base.CDOMList; +import pcgen.cdom.base.CDOMObject; import pcgen.cdom.base.CDOMReference; import pcgen.cdom.base.MasterListInterface; import pcgen.cdom.enumeration.AssociationKey; @@ -21,7 +22,6 @@ import pcgen.core.Domain; import pcgen.core.Globals; import pcgen.core.PCClass; -import pcgen.core.PObject; import pcgen.core.PlayerCharacter; import pcgen.core.character.CharacterSpell; import pcgen.core.prereq.PrereqHandler; @@ -226,7 +226,7 @@ * @param cSpells * The list to be populated with the spells */ - public static void addBonusKnowSpellsToList(PlayerCharacter pc, PObject aClass, + public static void addBonusKnowSpellsToList(PlayerCharacter pc, CDOMObject aClass, List<CharacterSpell> cSpells) { if (!(aClass instanceof PCClass)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |