From: <th...@us...> - 2009-07-12 22:18:15
|
Revision: 10075 http://pcgen.svn.sourceforge.net/pcgen/?rev=10075&view=rev Author: thpr Date: 2009-07-12 22:18:10 +0000 (Sun, 12 Jul 2009) Log Message: ----------- update to use getAbb for Alignments Modified Paths: -------------- Trunk/pcgen/code/src/java/gmgen/plugin/PlayerCharacterOutput.java Trunk/pcgen/code/src/java/pcgen/gui/converter/LSTConverter.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java Trunk/pcgen/code/src/java/pcgen/gui/utils/InfoViewModelBuilder.java Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AlignmentToken.java Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java Trunk/pcgen/code/src/java/plugin/exporttokens/DeityToken.java Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAlignParser.java Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityAlignParser.java Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAlignTester.java Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java Modified: Trunk/pcgen/code/src/java/gmgen/plugin/PlayerCharacterOutput.java =================================================================== --- Trunk/pcgen/code/src/java/gmgen/plugin/PlayerCharacterOutput.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/gmgen/plugin/PlayerCharacterOutput.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -58,7 +58,7 @@ public String getAlignmentShort() { - return pc.getPCAlignment().getKeyName(); + return pc.getPCAlignment().getAbb(); } public String getBAB() Modified: Trunk/pcgen/code/src/java/pcgen/gui/converter/LSTConverter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/converter/LSTConverter.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/pcgen/gui/converter/LSTConverter.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -331,7 +331,7 @@ for (PCAlignment al : context.ref.getOrderSortedCDOMObjects(PCAlignment.class)) { - context.ref.registerAbbreviation(al, al.getKeyName()); + context.ref.registerAbbreviation(al, al.getAbb()); } for (SizeAdjustment sz : gamemode.getUnmodifiableSizeAdjustmentList()) { Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -2002,7 +2002,7 @@ { Deity aDeity = (Deity) fn.getItem(); PCAlignment al = aDeity.get(ObjectKey.ALIGNMENT); - return al == null ? "" : al.getKeyName(); + return al == null ? "" : al.getAbb(); } return null; } Modified: Trunk/pcgen/code/src/java/pcgen/gui/utils/InfoViewModelBuilder.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/utils/InfoViewModelBuilder.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/pcgen/gui/utils/InfoViewModelBuilder.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -68,7 +68,7 @@ PObjectNode node = nodeMap.get(al); if (node == null) { - node = new PObjectNode(al.getKeyName()); + node = new PObjectNode(al.getAbb()); nodeMap.put(al, node); root.addChild(node); } Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -588,7 +588,7 @@ if (Globals.getGameModeAlignmentText().length() != 0) { buffer.append(TAG_ALIGNMENT).append(':'); - buffer.append(thePC.getPCAlignment().getKeyName()); + buffer.append(thePC.getPCAlignment().getAbb()); buffer.append(LINE_SEP); } } Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AlignmentToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AlignmentToken.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AlignmentToken.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -83,6 +83,6 @@ */ public static String getShortToken(PlayerCharacter pc) { - return pc.getPCAlignment().getKeyName(); + return pc.getPCAlignment().getAbb(); } } Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -525,7 +525,7 @@ for (PCAlignment al : context.ref .getConstructedCDOMObjects(PCAlignment.class)) { - context.ref.registerAbbreviation(al, al.getKeyName()); + context.ref.registerAbbreviation(al, al.getAbb()); } for (SizeAdjustment sz : gamemode .getUnmodifiableSizeAdjustmentList()) Modified: Trunk/pcgen/code/src/java/plugin/exporttokens/DeityToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/exporttokens/DeityToken.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/plugin/exporttokens/DeityToken.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -118,7 +118,7 @@ else if ("ALIGNMENT".equals(subTag)) { PCAlignment al = deity.get(ObjectKey.ALIGNMENT); - retString = al == null ? "" : al.getKeyName(); + retString = al == null ? "" : al.getAbb(); } else if ("APPEARANCE".equals(subTag)) { Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAlignParser.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAlignParser.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAlignParser.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -82,7 +82,7 @@ { if (alignments.length == 1) { - prereq.setKey(getPCAlignment(formula).getKeyName()); + prereq.setKey(getPCAlignment(formula).getAbb()); prereq.setOperator(PrerequisiteOperator.EQ); } else @@ -95,7 +95,7 @@ { Prerequisite subreq = new Prerequisite(); subreq.setKind("align"); - subreq.setKey(getPCAlignment(alignments[i]).getKeyName()); + subreq.setKey(getPCAlignment(alignments[i]).getAbb()); subreq.setOperator(PrerequisiteOperator.EQ); prereq.addPrerequisite(subreq); } Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityAlignParser.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityAlignParser.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityAlignParser.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -74,7 +74,7 @@ String token = inputTokenizer.nextToken(); - subprereq.setOperand(getPCAlignment(token).getKeyName()); + subprereq.setOperand(getPCAlignment(token).getAbb()); } if ((prereq.getPrerequisites().size() == 1) Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAlignTester.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAlignTester.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAlignTester.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -114,7 +114,7 @@ PCAlignment al = getPCAlignment(alignment); return PropertyFactory .getFormattedString( - "PreAlign.toHtml", prereq.getOperator().toDisplayString(), al.getKeyName()); //$NON-NLS-1$ + "PreAlign.toHtml", prereq.getOperator().toDisplayString(), al.getAbb()); //$NON-NLS-1$ } private PCAlignment getPCAlignment(String desiredAlignIdentifier) Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java 2009-07-12 22:02:34 UTC (rev 10074) +++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java 2009-07-12 22:18:10 UTC (rev 10075) @@ -85,7 +85,7 @@ { return PropertyFactory .getFormattedString( - "PreDeityAlign.toHtml", prereq.getOperator().toDisplayString(), getPCAlignment(prereq.getOperand()).getKeyName()); //$NON-NLS-1$ + "PreDeityAlign.toHtml", prereq.getOperator().toDisplayString(), getPCAlignment(prereq.getOperand()).getAbb()); //$NON-NLS-1$ } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |