From: <jde...@us...> - 2006-03-30 08:16:17
|
Revision: 519 Author: jdempsey Date: 2006-03-30 00:16:07 -0800 (Thu, 30 Mar 2006) ViewCVS: http://svn.sourceforge.net/pcgen/?rev=519&view=rev Log Message: ----------- [ 1460612 ] Equipment Name Tidy Code Uses Wrong Types Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java Modified: Trunk/pcgen/code/src/java/pcgen/core/Equipment.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2006-03-30 03:43:12 UTC (rev 518) +++ Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2006-03-30 08:16:07 UTC (rev 519) @@ -1913,7 +1913,8 @@ { final EquipmentModifier eqMod = (EquipmentModifier) e.next(); - if ("MASTERWORK".equalsIgnoreCase(eqMod.getName())) + if ("MASTERWORK".equalsIgnoreCase(eqMod.getName()) + || eqMod.isIType("Masterwork")) { eqMaster = eqMod.getName(); @@ -1921,14 +1922,17 @@ } } - final String magic1 = getMagicBonus(eqModifierList); + final EquipmentModifier magicMod1 = getMagicBonus(eqModifierList); + final String magic1 = (magicMod1 == null ? "" : magicMod1.getName()); final String desc1 = getNameFromModifiers(modList, magic1, ""); + EquipmentModifier magicMod2 = null; String magic2 = ""; String desc2 = ""; if (isDouble()) { - magic2 = getMagicBonus(altEqModifierList); + magicMod2 = getMagicBonus(altEqModifierList); + magic2 = (magicMod2 == null ? "" : magicMod2.getName()); desc2 = getNameFromModifiers(altModList, magic2, ""); } @@ -1960,7 +1964,7 @@ if (magic1.length() != 0) { - itemName.append(magic1); + itemName.append(magicMod1.getEquipNamePortion()); } else { @@ -1973,7 +1977,7 @@ if (magic2.length() != 0) { - itemName.append(magic2); + itemName.append(magicMod2.getEquipNamePortion()); } else { @@ -5704,19 +5708,21 @@ * @param eqModList Description of the Parameter * @return The magicBonus value */ - private static String getMagicBonus(final List eqModList) + private static EquipmentModifier getMagicBonus(final List eqModList) { for (Iterator e = eqModList.iterator(); e.hasNext();) { final EquipmentModifier eqMod = (EquipmentModifier) e.next(); - if (eqMod.isType("MagicalEnhancement")) + if (eqMod.isType("MagicalEnhancement") + || (eqMod.isType("Enhancement") && eqMod.isType("Magic")) + || (eqMod.isIType("Enhancement") && eqMod.isIType("Magic"))) { - return eqMod.getName(); + return eqMod; } } - return ""; + return null; } /** @@ -5754,7 +5760,7 @@ sMod.append('/'); } - sMod.append(eqMod.toString()); + sMod.append(eqMod.getEquipNamePortion()); } } Modified: Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java 2006-03-30 03:43:12 UTC (rev 518) +++ Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java 2006-03-30 08:16:07 UTC (rev 519) @@ -858,11 +858,23 @@ /** * Return a string representation of the EquipmentModifier - * + * TODO: This needs to call getEquipNamePortion until after 5.10, when it can be changed to a programmer useful string as per normal. + * * @return a String representation of the EquipmentModifier */ public String toString() { + return getEquipNamePortion(); + } + + /** + * Returns the name that should be added to the equipment item as + * a result of the presence of this equipment modifier. + * + * @return The text to be added to the equipment name. + */ + public String getEquipNamePortion() + { if (namingOption == NAMINGOPTION_NOTHING) { return ""; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |