From: <hae...@us...> - 2007-05-17 19:33:52
|
Revision: 2932 http://svn.sourceforge.net/pcgen/?rev=2932&view=rev Author: haelduksf Date: 2007-05-17 12:33:43 -0700 (Thu, 17 May 2007) Log Message: ----------- Fixed bug "OUTPUTNAME in Skills and Deity has different behavior". Changed skill sorting to match new OutputName behaviour. Issue#: 1678700 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Trunk/pcgen/code/src/java/pcgen/core/Skill.java Trunk/pcgen/code/src/java/pcgen/core/SkillComparator.java Trunk/pcgen/code/src/java/plugin/charactersheet/gui/DetailsPane.java Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2007-05-17 13:02:33 UTC (rev 2931) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2007-05-17 19:33:43 UTC (rev 2932) @@ -2889,8 +2889,8 @@ } else { - return skill1.getDisplayName().compareToIgnoreCase( - skill2.getDisplayName()); + return skill1.getOutputName().compareToIgnoreCase( + skill2.getOutputName()); } } }); Modified: Trunk/pcgen/code/src/java/pcgen/core/Skill.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Skill.java 2007-05-17 13:02:33 UTC (rev 2931) +++ Trunk/pcgen/code/src/java/pcgen/core/Skill.java 2007-05-17 19:33:43 UTC (rev 2932) @@ -1277,11 +1277,11 @@ { if (getAssociatedCount() == 0) { - return displayName; + return this.getOutputName(); } final StringBuffer buffer = new StringBuffer(getAssociatedCount() * 20); - buffer.append(displayName).append("("); + buffer.append(this.getOutputName()).append("("); for (int i = 0; i < getAssociatedCount(); i++) { Modified: Trunk/pcgen/code/src/java/pcgen/core/SkillComparator.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/SkillComparator.java 2007-05-17 13:02:33 UTC (rev 2931) +++ Trunk/pcgen/code/src/java/pcgen/core/SkillComparator.java 2007-05-17 19:33:43 UTC (rev 2932) @@ -76,11 +76,11 @@ } else { - return s1.getDisplayName().compareToIgnoreCase(s2.getDisplayName()); + return s1.getOutputName().compareToIgnoreCase(s2.getOutputName()); } case RESORT_NAME:default: - return s1.getDisplayName().compareToIgnoreCase(s2.getDisplayName()); + return s1.getOutputName().compareToIgnoreCase(s2.getOutputName()); } } } Modified: Trunk/pcgen/code/src/java/plugin/charactersheet/gui/DetailsPane.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/charactersheet/gui/DetailsPane.java 2007-05-17 13:02:33 UTC (rev 2931) +++ Trunk/pcgen/code/src/java/plugin/charactersheet/gui/DetailsPane.java 2007-05-17 19:33:43 UTC (rev 2932) @@ -873,7 +873,7 @@ if (pc.getDeity() != null) { - deity.setText(pc.getDeity().getDisplayName() + ' '); + deity.setText(pc.getDeity().getOutputName() + ' '); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |