|
From: <nu...@us...> - 2006-03-22 00:57:52
|
Revision: 363 Author: nuance Date: 2006-03-21 16:57:42 -0800 (Tue, 21 Mar 2006) ViewCVS: http://svn.sourceforge.net/pcgen/?rev=363&view=rev Log Message: ----------- Renamed addNewCategory since it wasn't adding a new Category. Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/AbilityStore.java Trunk/pcgen/code/src/java/pcgen/core/CategorisableStore.java Trunk/pcgen/code/src/java/pcgen/core/Globals.java Trunk/pcgen/code/src/java/pcgen/core/chooser/WeaponProfChoiceManager.java Modified: Trunk/pcgen/code/src/java/pcgen/core/AbilityStore.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/AbilityStore.java 2006-03-22 00:25:03 UTC (rev 362) +++ Trunk/pcgen/code/src/java/pcgen/core/AbilityStore.java 2006-03-22 00:57:42 UTC (rev 363) @@ -146,7 +146,7 @@ } else { - if (!this.addNewCategory(toAdd)) + if (!this.addCategorisable(toAdd)) { String error = (getAbility) ? "Ability object" : "AbilityInfo object"; Logging.errorPrint("problem adding " + error); Modified: Trunk/pcgen/code/src/java/pcgen/core/CategorisableStore.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/CategorisableStore.java 2006-03-22 00:25:03 UTC (rev 362) +++ Trunk/pcgen/code/src/java/pcgen/core/CategorisableStore.java 2006-03-22 00:57:42 UTC (rev 363) @@ -69,7 +69,7 @@ * @return true if the object was added correctly */ - public boolean addNewCategory(final Categorisable aCatObj) + public boolean addCategorisable(final Categorisable aCatObj) { Map objMap = (HashMap) categoryMap.get(aCatObj.getCategory()); @@ -118,7 +118,7 @@ while (it.hasNext()) { final Categorisable ab = (Categorisable) it.next(); - clone.addNewCategory(ab); + clone.addCategorisable(ab); } return clone; Modified: Trunk/pcgen/code/src/java/pcgen/core/Globals.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2006-03-22 00:25:03 UTC (rev 362) +++ Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2006-03-22 00:57:42 UTC (rev 363) @@ -777,7 +777,7 @@ */ public static boolean addAbility (final Ability anAbility) { - return abilityStore.addNewCategory(anAbility); + return abilityStore.addCategorisable(anAbility); } /** Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/WeaponProfChoiceManager.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/chooser/WeaponProfChoiceManager.java 2006-03-22 00:25:03 UTC (rev 362) +++ Trunk/pcgen/code/src/java/pcgen/core/chooser/WeaponProfChoiceManager.java 2006-03-22 00:57:42 UTC (rev 363) @@ -133,7 +133,7 @@ while (profTok.hasMoreTokens()) { - weaponToProfMap.addNewCategory( + weaponToProfMap.addCategorisable( new weaponToProf(profString, profTok.nextToken())); } @@ -201,7 +201,7 @@ while (cTok.hasMoreTokens()) { - weaponToProfMap.addNewCategory(new weaponToProf(bString, cTok.nextToken())); + weaponToProfMap.addCategorisable(new weaponToProf(bString, cTok.nextToken())); } } } @@ -352,7 +352,7 @@ while (cTok.hasMoreTokens()) { - weaponToProfMap.addNewCategory(new weaponToProf(bString, cTok.nextToken())); + weaponToProfMap.addCategorisable(new weaponToProf(bString, cTok.nextToken())); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |