From: <th...@us...> - 2012-12-13 03:13:19
|
Revision: 18656 http://sourceforge.net/p/pcgen/code/18656 Author: thpr Date: 2012-12-13 03:13:16 +0000 (Thu, 13 Dec 2012) Log Message: ----------- Move AlignmentToken to plugin.exporttokens Issue#: CODE-1909 Modified Paths: -------------- Trunk/pcgen/code/pluginbuild.xml Trunk/pcgen/code/src/java/pcgen/core/display/CharacterDisplay.java Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java Trunk/pcgen/code/src/java/plugin/charactersheet/gui/DetailsPane.java Added Paths: ----------- Trunk/pcgen/code/src/java/plugin/exporttokens/AlignmentToken.java Removed Paths: ------------- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AlignmentToken.java Modified: Trunk/pcgen/code/pluginbuild.xml =================================================================== --- Trunk/pcgen/code/pluginbuild.xml 2012-12-13 03:08:03 UTC (rev 18655) +++ Trunk/pcgen/code/pluginbuild.xml 2012-12-13 03:13:16 UTC (rev 18656) @@ -163,6 +163,13 @@ </patternset> </fileset> </jar> + <jar jarfile="${outputplugins.dir}/ExportToken-ALIGNMENT.jar" manifest="${src.java.dir}/plugin/exporttokens/manifest.mf"> + <fileset dir="${build.classes.dir}"> + <patternset> + <include name="plugin/exporttokens/AlignmentToken.class" /> + </patternset> + </fileset> + </jar> <jar jarfile="${outputplugins.dir}/ExportToken-ALTHP.jar" manifest="${src.java.dir}/plugin/exporttokens/manifest.mf"> <fileset dir="${build.classes.dir}"> <patternset> Modified: Trunk/pcgen/code/src/java/pcgen/core/display/CharacterDisplay.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/display/CharacterDisplay.java 2012-12-13 03:08:03 UTC (rev 18655) +++ Trunk/pcgen/code/src/java/pcgen/core/display/CharacterDisplay.java 2012-12-13 03:13:16 UTC (rev 18656) @@ -1611,4 +1611,14 @@ return retString; } + + public String getAlignmentDisplayString() + { + if (Globals.getGameModeAlignmentText().length() == 0) + { + return ""; + } + final PCAlignment alignment = getPCAlignment(); + return alignment == null ? "None" : alignment.getDisplayName(); + } } Modified: Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java 2012-12-13 03:08:03 UTC (rev 18655) +++ Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java 2012-12-13 03:13:16 UTC (rev 18656) @@ -60,7 +60,6 @@ import pcgen.core.utils.CoreUtility; import pcgen.io.exporttoken.AbilityListToken; import pcgen.io.exporttoken.AbilityToken; -import pcgen.io.exporttoken.AlignmentToken; import pcgen.io.exporttoken.AttackToken; import pcgen.io.exporttoken.BonusToken; import pcgen.io.exporttoken.CheckToken; @@ -1724,7 +1723,6 @@ addToTokenMap(new AbilityToken()); addToTokenMap(new AbilityListToken()); addToTokenMap(new ACCheckToken()); - addToTokenMap(new AlignmentToken()); addToTokenMap(new AttackToken()); addToTokenMap(new BonusToken()); addToTokenMap(new CheckToken()); Deleted: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AlignmentToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AlignmentToken.java 2012-12-13 03:08:03 UTC (rev 18655) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AlignmentToken.java 2012-12-13 03:13:16 UTC (rev 18656) @@ -1,102 +0,0 @@ -/* - * AlignmentToken.java - * Copyright 2003 (C) Devon Jones <sou...@ev...> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Created on December 15, 2003, 12:21 PM - * - * Current Ver: $Revision$ - * Last Editor: $Author$ - * Last Edited: $Date$ - * - */ -package pcgen.io.exporttoken; - -import pcgen.cdom.enumeration.BiographyField; -import pcgen.core.Globals; -import pcgen.core.PCAlignment; -import pcgen.core.display.CharacterDisplay; -import pcgen.io.ExportHandler; - -/** - * Class deals with ALIGNMENT and ALIGNMENT.SHORT Token - */ -public class AlignmentToken extends AbstractExportToken -{ - /** - * @see pcgen.io.exporttoken.Token#getTokenName() - */ - @Override - public String getTokenName() - { - return "ALIGNMENT"; - } - - /** - * @see pcgen.io.exporttoken.Token#getToken(java.lang.String, pcgen.core.PlayerCharacter, pcgen.io.ExportHandler) - */ - @Override - public String getToken(String tokenSource, CharacterDisplay display, - ExportHandler eh) - { - String retString = ""; - - if (!display.getSuppressBioField(BiographyField.ALIGNMENT)) - { - if ("ALIGNMENT".equals(tokenSource)) - { - retString = getAlignmentToken(display); - } - else if ("ALIGNMENT.SHORT".equals(tokenSource)) - { - retString = getShortToken(display); - } - } - - return retString; - } - - /** - * Get the Alignment Token - * @param pc - * @return Alignment Token - */ - public static String getAlignmentToken(CharacterDisplay display) - { - if (Globals.getGameModeAlignmentText().length() == 0) - { - return ""; - } - final PCAlignment alignment = display.getPCAlignment(); - return alignment==null?"None":alignment.getDisplayName(); - } - - /** - * Get Alignment Short Token - * @param pc - * @return Alignment Short Token - */ - public static String getShortToken(CharacterDisplay display) - { - if (Globals.getGameModeAlignmentText().length() == 0) - { - return ""; - } - - final PCAlignment alignment = display.getPCAlignment(); - return alignment==null?"None":alignment.getAbb(); - } -} Modified: Trunk/pcgen/code/src/java/plugin/charactersheet/gui/DetailsPane.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/charactersheet/gui/DetailsPane.java 2012-12-13 03:08:03 UTC (rev 18655) +++ Trunk/pcgen/code/src/java/plugin/charactersheet/gui/DetailsPane.java 2012-12-13 03:13:16 UTC (rev 18656) @@ -14,7 +14,6 @@ import pcgen.core.analysis.OutputNameFormatting; import pcgen.core.display.CharacterDisplay; import pcgen.core.display.VisionDisplay; -import pcgen.io.exporttoken.AlignmentToken; /** * Confirmed no memory Leaks Dec 10, 2004 @@ -887,7 +886,7 @@ weight.setText(display.getWeightToken() + ' '); hair.setText(display.getHairColor() + ' '); - alignment.setText(AlignmentToken.getAlignmentToken(display) + ' '); + alignment.setText(display.getAlignmentDisplayString() + ' '); vision.setText(VisionDisplay.getVision(display) + ' '); points.setText(pc.getCostPool() + SPACE); } Copied: Trunk/pcgen/code/src/java/plugin/exporttokens/AlignmentToken.java (from rev 18644, Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AlignmentToken.java) =================================================================== --- Trunk/pcgen/code/src/java/plugin/exporttokens/AlignmentToken.java (rev 0) +++ Trunk/pcgen/code/src/java/plugin/exporttokens/AlignmentToken.java 2012-12-13 03:13:16 UTC (rev 18656) @@ -0,0 +1,88 @@ +/* + * AlignmentToken.java + * Copyright 2003 (C) Devon Jones <sou...@ev...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Created on December 15, 2003, 12:21 PM + * + * Current Ver: $Revision$ + * Last Editor: $Author$ + * Last Edited: $Date$ + * + */ +package plugin.exporttokens; + +import pcgen.cdom.enumeration.BiographyField; +import pcgen.core.Globals; +import pcgen.core.PCAlignment; +import pcgen.core.display.CharacterDisplay; +import pcgen.io.ExportHandler; +import pcgen.io.exporttoken.AbstractExportToken; + +/** + * Class deals with ALIGNMENT and ALIGNMENT.SHORT Token + */ +public class AlignmentToken extends AbstractExportToken +{ + /** + * @see pcgen.io.exporttoken.Token#getTokenName() + */ + @Override + public String getTokenName() + { + return "ALIGNMENT"; + } + + /** + * @see pcgen.io.exporttoken.Token#getToken(java.lang.String, pcgen.core.PlayerCharacter, pcgen.io.ExportHandler) + */ + @Override + public String getToken(String tokenSource, CharacterDisplay display, + ExportHandler eh) + { + String retString = ""; + + if (!display.getSuppressBioField(BiographyField.ALIGNMENT)) + { + if ("ALIGNMENT".equals(tokenSource)) + { + retString = display.getAlignmentDisplayString(); + } + else if ("ALIGNMENT.SHORT".equals(tokenSource)) + { + retString = getShortToken(display); + } + } + + return retString; + } + + /** + * Get Alignment Short Token + * @param pc + * @return Alignment Short Token + */ + public static String getShortToken(CharacterDisplay display) + { + if (Globals.getGameModeAlignmentText().length() == 0) + { + return ""; + } + + final PCAlignment alignment = display.getPCAlignment(); + return alignment==null?"None":alignment.getAbb(); + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |