From: <jde...@us...> - 2007-10-09 02:06:09
|
Revision: 4245 http://pcgen.svn.sourceforge.net/pcgen/?rev=4245&view=rev Author: jdempsey Date: 2007-10-08 19:06:11 -0700 (Mon, 08 Oct 2007) Log Message: ----------- ADD:ABILITY - Not working with ABILITYCATEGORY, Just CATEGOR Issue#: 1800900 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java Trunk/pcgen/code/src/java/pcgen/core/Globals.java Modified: Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java 2007-10-09 01:38:44 UTC (rev 4244) +++ Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java 2007-10-09 02:06:11 UTC (rev 4245) @@ -1115,4 +1115,16 @@ return null; } + /** + * Convenience method to retrieve an <tt>AbilityCategory</tt> by + * its key name. + * + * @param aKey The key of the <tt>AbilityCategory</tt> to retrieve. + * @return The requested <tt>AbilityCategory</tt> or <tt>null</tt> if the + * category is not found in the current game mode. + */ + public static AbilityCategory getAbilityCategory(final String aKey) + { + return SettingsHandler.getGame().getAbilityCategory(aKey); + } } Modified: Trunk/pcgen/code/src/java/pcgen/core/Globals.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2007-10-09 01:38:44 UTC (rev 4244) +++ Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2007-10-09 02:06:11 UTC (rev 4245) @@ -967,7 +967,16 @@ */ public static Iterator<Categorisable> getAbilityKeyIterator (String aCategory) { - return abilityStore.getKeyIterator(aCategory); + String catKey = aCategory; + if (!aCategory.equals("ALL")) + { + AbilityCategory cat = AbilityUtilities.getAbilityCategory(aCategory); + if (cat != null) + { + catKey = cat.getAbilityCategory(); + } + } + return abilityStore.getKeyIterator(catKey); } /** @@ -979,7 +988,16 @@ */ public static Iterator<? extends Categorisable> getAbilityNameIterator (String aCategory) { - return abilityStore.getNameIterator(aCategory); + String catKey = aCategory; + if (!aCategory.equals("ALL")) + { + AbilityCategory cat = AbilityUtilities.getAbilityCategory(aCategory); + if (cat != null) + { + catKey = cat.getAbilityCategory(); + } + } + return abilityStore.getNameIterator(catKey); } /** @@ -1027,7 +1045,16 @@ */ public static List<? extends Categorisable> getUnmodifiableAbilityList(String aCategory) { - return abilityStore.getUnmodifiableList(aCategory); + String catKey = aCategory; + if (!aCategory.equals("ALL")) + { + AbilityCategory cat = AbilityUtilities.getAbilityCategory(aCategory); + if (cat != null) + { + catKey = cat.getAbilityCategory(); + } + } + return abilityStore.getUnmodifiableList(catKey); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |