From: <th...@us...> - 2008-10-05 19:58:12
|
Revision: 7953 http://pcgen.svn.sourceforge.net/pcgen/?rev=7953&view=rev Author: thpr Date: 2008-10-05 19:58:04 +0000 (Sun, 05 Oct 2008) Log Message: ----------- eliminate redundant code Modified Paths: -------------- Trunk/pcgen/code/src/java/gmgen/plugin/PcgCombatant.java Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Trunk/pcgen/code/src/java/pcgen/core/VariableProcessorPC.java Modified: Trunk/pcgen/code/src/java/gmgen/plugin/PcgCombatant.java =================================================================== --- Trunk/pcgen/code/src/java/gmgen/plugin/PcgCombatant.java 2008-10-05 19:54:40 UTC (rev 7952) +++ Trunk/pcgen/code/src/java/gmgen/plugin/PcgCombatant.java 2008-10-05 19:58:04 UTC (rev 7953) @@ -803,7 +803,7 @@ includeSkills = SettingsHandler.getSkillsTab_IncludeSkills(); } - ArrayList<Skill> skillList = + List<Skill> skillList = pc.getSkillListInOutputOrder(pc .getPartialSkillList(Visibility.OUTPUT_ONLY)); boolean firstLine = true; Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2008-10-05 19:54:40 UTC (rev 7952) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2008-10-05 19:58:04 UTC (rev 7953) @@ -502,23 +502,10 @@ * @return A list of the character's skills matching the visibility * criteria. */ - public ArrayList<Skill> getPartialSkillList(Visibility vis) + public List<Skill> getPartialSkillList(Visibility vis) { // Now select the required set of skills, based on their visibility. - ArrayList<Skill> aList = new ArrayList<Skill>(); - - for (Skill aSkill : skillList) - { - final Visibility skillVis = aSkill.getSafe(ObjectKey.VISIBILITY); - - if ((vis == Visibility.DEFAULT) || (skillVis == Visibility.DEFAULT) - || (skillVis == vis)) - { - aList.add(aSkill); - } - - } - return aList; + return Globals.getObjectsOfVisibility(skillList, vis); } /** @@ -2969,7 +2956,7 @@ * * @return An ArrayList of the skill objects in output order. */ - public ArrayList<Skill> getSkillListInOutputOrder() + public List<Skill> getSkillListInOutputOrder() { return getSkillListInOutputOrder(new ArrayList<Skill>(getSkillList())); } @@ -2986,8 +2973,8 @@ * * @return An ArrayList of the skill objects in output order. */ - public ArrayList<Skill> getSkillListInOutputOrder( - final ArrayList<Skill> sortedList) + public List<Skill> getSkillListInOutputOrder( + final List<Skill> sortedList) { final PlayerCharacter pc = this; Collections.sort(sortedList, new Comparator<Skill>() Modified: Trunk/pcgen/code/src/java/pcgen/core/VariableProcessorPC.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/VariableProcessorPC.java 2008-10-05 19:54:40 UTC (rev 7952) +++ Trunk/pcgen/code/src/java/pcgen/core/VariableProcessorPC.java 2008-10-05 19:58:04 UTC (rev 7953) @@ -785,8 +785,7 @@ { // We use the list in output order to ensure the size // does not include hidden skills - final ArrayList<Skill> skillList = getPc().getSkillListInOutputOrder(); - skillList.trimToSize(); + final List<Skill> skillList = getPc().getSkillListInOutputOrder(); valString = Integer.toString(skillList.size()); } else if (valString.startsWith("COUNT[SKILLTYPE=") || valString.startsWith("COUNT[SKILLTYPE.")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |