From: <th...@us...> - 2012-12-13 02:58:16
|
Revision: 18654 http://sourceforge.net/p/pcgen/code/18654 Author: thpr Date: 2012-12-13 02:58:13 +0000 (Thu, 13 Dec 2012) Log Message: ----------- Move HeightToken to plugins.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/HeightToken.java Removed Paths: ------------- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/HeightToken.java Modified: Trunk/pcgen/code/pluginbuild.xml =================================================================== --- Trunk/pcgen/code/pluginbuild.xml 2012-12-13 02:52:29 UTC (rev 18653) +++ Trunk/pcgen/code/pluginbuild.xml 2012-12-13 02:58:13 UTC (rev 18654) @@ -485,6 +485,13 @@ </patternset> </fileset> </jar> + <jar jarfile="${outputplugins.dir}/ExportToken-HEIGHT.jar" manifest="${src.java.dir}/plugin/exporttokens/manifest.mf"> + <fileset dir="${build.classes.dir}"> + <patternset> + <include name="plugin/exporttokens/HeightToken.class" /> + </patternset> + </fileset> + </jar> <jar jarfile="${outputplugins.dir}/ExportToken-HITDICE.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 02:52:29 UTC (rev 18653) +++ Trunk/pcgen/code/src/java/pcgen/core/display/CharacterDisplay.java 2012-12-13 02:58:13 UTC (rev 18654) @@ -1602,4 +1602,34 @@ } return 0.0; } + + public String getCharacterHeightInchPart() + { + return Integer.toString(getHeight() % 12); + } + + public String getCharacterHeightFootPart() + { + return Integer.toString(getHeight() / 12); + } + + public String getHeightString() + { + String retString; + + if ("ftin".equals(Globals.getGameModeUnitSet().getHeightUnit())) + { + retString = + getCharacterHeightFootPart() + "' " + getCharacterHeightInchPart() + "\""; + } + else + { + retString = + Globals.getGameModeUnitSet().displayHeightInUnitSet( + getHeight()) + + " " + Globals.getGameModeUnitSet().getHeightUnit(); + } + + return retString; + } } Modified: Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java 2012-12-13 02:52:29 UTC (rev 18653) +++ Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java 2012-12-13 02:58:13 UTC (rev 18654) @@ -68,7 +68,6 @@ import pcgen.io.exporttoken.EqToken; import pcgen.io.exporttoken.EqTypeToken; import pcgen.io.exporttoken.GameModeToken; -import pcgen.io.exporttoken.HeightToken; import pcgen.io.exporttoken.InitiativeMiscToken; import pcgen.io.exporttoken.MovementToken; import pcgen.io.exporttoken.SRToken; @@ -1734,7 +1733,6 @@ addToTokenMap(new EqToken()); addToTokenMap(new EqTypeToken()); addToTokenMap(new GameModeToken()); - addToTokenMap(new HeightToken()); addToTokenMap(new InitiativeMiscToken()); addToTokenMap(new MovementToken()); addToTokenMap(new SkillToken()); Deleted: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/HeightToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/HeightToken.java 2012-12-13 02:52:29 UTC (rev 18653) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/HeightToken.java 2012-12-13 02:58:13 UTC (rev 18654) @@ -1,123 +0,0 @@ -/* - * HeightToken.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.display.CharacterDisplay; -import pcgen.io.ExportHandler; - -/** - * Deals with Tokens: - * - * HEIGHT - * HEIGHT.FOOTPART - * HEIGHT.INCHPART - */ -public class HeightToken extends AbstractExportToken -{ - /** - * @see pcgen.io.exporttoken.Token#getTokenName() - */ - @Override - public String getTokenName() - { - return "HEIGHT"; - } - - /** - * @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.HEIGHT)) - { - if ("HEIGHT".equals(tokenSource)) - { - retString = getHeightToken(display); - } - else if ("HEIGHT.FOOTPART".equals(tokenSource)) - { - retString = getFootPartToken(display); - } - else if ("HEIGHT.INCHPART".equals(tokenSource)) - { - retString = getInchPartToken(display); - } - } - - return retString; - } - - /** - * Get the HEIGHT token - * @param pc - * @return the HEIGHT token - */ - public static String getHeightToken(CharacterDisplay display) - { - String retString = ""; - - if ("ftin".equals(Globals.getGameModeUnitSet().getHeightUnit())) - { - retString = - getFootPartToken(display) + "' " + getInchPartToken(display) + "\""; - } - else - { - retString = - Globals.getGameModeUnitSet().displayHeightInUnitSet( - display.getHeight()) - + " " + Globals.getGameModeUnitSet().getHeightUnit(); - } - - return retString; - } - - /** - * Get the HEIGHT.FOOTPART token - * @param pc - * @return the HEIGHT.FOOTPART token - */ - public static String getFootPartToken(CharacterDisplay display) - { - return Integer.toString(display.getHeight() / 12); - } - - /** - * Get the HEIGHT.INCHPART token - * @param pc - * @return the HEIGHT.INCHPART token - */ - public static String getInchPartToken(CharacterDisplay display) - { - return Integer.toString(display.getHeight() % 12); - } -} Modified: Trunk/pcgen/code/src/java/plugin/charactersheet/gui/DetailsPane.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/charactersheet/gui/DetailsPane.java 2012-12-13 02:52:29 UTC (rev 18653) +++ Trunk/pcgen/code/src/java/plugin/charactersheet/gui/DetailsPane.java 2012-12-13 02:58:13 UTC (rev 18654) @@ -15,7 +15,6 @@ import pcgen.core.display.CharacterDisplay; import pcgen.core.display.VisionDisplay; import pcgen.io.exporttoken.AlignmentToken; -import pcgen.io.exporttoken.HeightToken; /** * Confirmed no memory Leaks Dec 10, 2004 @@ -883,7 +882,7 @@ { deity.setText(" "); } - height.setText(HeightToken.getHeightToken(display) + ' '); + height.setText(display.getHeightString() + ' '); eyes.setText(display.getEyeColor() + ' '); weight.setText(display.getWeightToken() + ' '); hair.setText(display.getHairColor() + ' '); Copied: Trunk/pcgen/code/src/java/plugin/exporttokens/HeightToken.java (from rev 18644, Trunk/pcgen/code/src/java/pcgen/io/exporttoken/HeightToken.java) =================================================================== --- Trunk/pcgen/code/src/java/plugin/exporttokens/HeightToken.java (rev 0) +++ Trunk/pcgen/code/src/java/plugin/exporttokens/HeightToken.java 2012-12-13 02:58:13 UTC (rev 18654) @@ -0,0 +1,78 @@ +/* + * HeightToken.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.display.CharacterDisplay; +import pcgen.io.ExportHandler; +import pcgen.io.exporttoken.AbstractExportToken; + +/** + * Deals with Tokens: + * + * HEIGHT + * HEIGHT.FOOTPART + * HEIGHT.INCHPART + */ +public class HeightToken extends AbstractExportToken +{ + /** + * @see pcgen.io.exporttoken.Token#getTokenName() + */ + @Override + public String getTokenName() + { + return "HEIGHT"; + } + + /** + * @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.HEIGHT)) + { + if ("HEIGHT".equals(tokenSource)) + { + retString = display.getHeightString(); + } + else if ("HEIGHT.FOOTPART".equals(tokenSource)) + { + retString = display.getCharacterHeightFootPart(); + } + else if ("HEIGHT.INCHPART".equals(tokenSource)) + { + retString = display.getCharacterHeightInchPart(); + } + } + + return retString; + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |