From: <nu...@us...> - 2006-03-15 15:24:34
|
Revision: 252 Author: nuance Date: 2006-03-15 07:24:26 -0800 (Wed, 15 Mar 2006) ViewCVS: http://svn.sourceforge.net/pcgen/?rev=252&view=rev Log Message: ----------- Moved some static methods for maipulating the names of things into Equipment Utilities. Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java Trunk/pcgen/code/src/java/pcgen/core/CategorisableStore.java Trunk/pcgen/code/src/java/pcgen/core/EquipmentUtilities.java Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacterUtilities.java Modified: Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java 2006-03-15 15:10:12 UTC (rev 251) +++ Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java 2006-03-15 15:24:26 UTC (rev 252) @@ -132,21 +132,6 @@ } /** - * Extracts the choiceless form of a name, for example, with all choices removed - * - * @param aName - * - * @return the name with choices stripped - */ - public static String removeChoicesFromName(String aName) - { - final int anInt = aName.indexOf('('); - - return (anInt >= 0) ? aName.substring(0, anInt).trim() : aName; - } - - - /** * This method attempts to get an Ability Object from the Global Store keyed * by token. If this fails, it checks if token has info in parenthesis * appended to it. If it does, it strips this and attempts to get an @@ -167,7 +152,7 @@ return ab; } - String stripped = removeChoicesFromName(token); + String stripped = EquipmentUtilities.removeChoicesFromName(token); ab = Globals.getAbilityKeyed(cat, stripped); if (ab != null) Modified: Trunk/pcgen/code/src/java/pcgen/core/CategorisableStore.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/CategorisableStore.java 2006-03-15 15:10:12 UTC (rev 251) +++ Trunk/pcgen/code/src/java/pcgen/core/CategorisableStore.java 2006-03-15 15:24:26 UTC (rev 252) @@ -188,7 +188,7 @@ return null; } - String strippedName = AbilityUtilities.removeChoicesFromName(aName); + String strippedName = EquipmentUtilities.removeChoicesFromName(aName); while (it.hasNext()) { @@ -388,7 +388,7 @@ return false; } - String strippedName = AbilityUtilities.removeChoicesFromName(aName); + String strippedName = EquipmentUtilities.removeChoicesFromName(aName); while (it.hasNext()) { Modified: Trunk/pcgen/code/src/java/pcgen/core/EquipmentUtilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/EquipmentUtilities.java 2006-03-15 15:10:12 UTC (rev 251) +++ Trunk/pcgen/code/src/java/pcgen/core/EquipmentUtilities.java 2006-03-15 15:24:26 UTC (rev 252) @@ -291,4 +291,47 @@ return aArrayList; } + + /** + * Adds a String to a name, for example, adding "Longsword" to "Weapon + * Specialisation" gives "Weapon Specialisation (Longsword)" + * + * @param aName The Name to add to + * @param aString The string to add + * + * @return The modified name + */ + static String appendToName(final String aName, final String aString) + { + final StringBuffer aBuf = new StringBuffer(aName); + final int iLen = aBuf.length() - 1; + + if (aBuf.charAt(iLen) == ')') + { + aBuf.setCharAt(iLen, '/'); + } + else + { + aBuf.append(" ("); + } + + aBuf.append(aString); + aBuf.append(')'); + + return aBuf.toString(); + } + + /** + * Extracts the choiceless form of a name, for example, with all choices removed + * + * @param aName + * + * @return the name with choices stripped + */ + public static String removeChoicesFromName(String aName) + { + final int anInt = aName.indexOf('('); + + return (anInt >= 0) ? aName.substring(0, anInt).trim() : aName; + } } Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2006-03-15 15:10:12 UTC (rev 251) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2006-03-15 15:24:26 UTC (rev 252) @@ -4966,12 +4966,12 @@ // Add "Head 1 only" to the name of the weapon eqm.setWholeItemName(eqm.getName()); - eqm.setName(PlayerCharacterUtilities.appendToName(eqm.getName(), "Head 1 only")); + eqm.setName(EquipmentUtilities.appendToName(eqm.getName(), "Head 1 only")); if (eqm.getOutputName().indexOf("Head 1 only") < 0) { eqm.setOutputName( - PlayerCharacterUtilities.appendToName(eqm.getOutputName(), "Head 1 only")); + EquipmentUtilities.appendToName(eqm.getOutputName(), "Head 1 only")); } PlayerCharacterUtilities.setProf(equip, eqm); @@ -4996,11 +4996,11 @@ // Add "Head 2 only" to the name of the weapon eqm.setWholeItemName(eqm.getName()); - eqm.setName(PlayerCharacterUtilities.appendToName(eqm.getName(), "Head 2 only")); + eqm.setName(EquipmentUtilities.appendToName(eqm.getName(), "Head 2 only")); if (eqm.getOutputName().indexOf("Head 2 only") < 0) { - eqm.setOutputName(PlayerCharacterUtilities.appendToName(eqm.getOutputName(), "Head 2 only")); + eqm.setOutputName(EquipmentUtilities.appendToName(eqm.getOutputName(), "Head 2 only")); } PlayerCharacterUtilities.setProf(equip, eqm); @@ -5070,11 +5070,11 @@ eqm.removeType("Melee"); // Add "Thrown" to the name of the weapon - eqm.setName(PlayerCharacterUtilities.appendToName(eqm.getName(), "Thrown")); + eqm.setName(EquipmentUtilities.appendToName(eqm.getName(), "Thrown")); if (eqm.getOutputName().indexOf("Thrown") < 0) { - eqm.setOutputName(PlayerCharacterUtilities.appendToName(eqm.getOutputName(), "Thrown")); + eqm.setOutputName(EquipmentUtilities.appendToName(eqm.getOutputName(), "Thrown")); } PlayerCharacterUtilities.setProf(equip, eqm); Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacterUtilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacterUtilities.java 2006-03-15 15:10:12 UTC (rev 251) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacterUtilities.java 2006-03-15 15:24:26 UTC (rev 252) @@ -35,35 +35,6 @@ public class PlayerCharacterUtilities { /** - * Adds a String to a name, for example, adding "Longsword" to "Weapon - * Specialisation" gives "Weapon Specialisation (Longsword)" - * - * @param aName The Name to add to - * @param aString The string to add - * - * @return The modified name - */ - static String appendToName(final String aName, final String aString) - { - final StringBuffer aBuf = new StringBuffer(aName); - final int iLen = aBuf.length() - 1; - - if (aBuf.charAt(iLen) == ')') - { - aBuf.setCharAt(iLen, '/'); - } - else - { - aBuf.append(" ("); - } - - aBuf.append(aString); - aBuf.append(')'); - - return aBuf.toString(); - } - - /** * Bryan wanted this to be optional, but if you can reassign racial auto * feats, when you reopen the character, you get the feats that were * exchanged back This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |