From: <th...@us...> - 2008-05-04 21:48:38
|
Revision: 6193 http://pcgen.svn.sourceforge.net/pcgen/?rev=6193&view=rev Author: thpr Date: 2008-05-04 14:48:44 -0700 (Sun, 04 May 2008) Log Message: ----------- Remove More tokens & associated code Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java Trunk/pcgen/code/src/java/pcgen/core/Race.java Trunk/pcgen/code/src/java/pcgen/core/Skill.java Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java Removed Paths: ------------- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LongnameToken.java Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/NameLst.java Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RaceAcToken.java Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RacenameToken.java Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RootToken.java Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SourceLst.java Modified: Trunk/pcgen/code/src/java/pcgen/core/Equipment.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2008-05-04 21:38:06 UTC (rev 6192) +++ Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2008-05-04 21:48:44 UTC (rev 6193) @@ -215,8 +215,6 @@ private String indexedUnderType = ""; - private String longName = ""; - private String wholeItemName = ""; private String modifiedName = ""; @@ -1496,16 +1494,6 @@ } /** - * Sets the longName attribute of the Equipment object - * - * @param aString - * The new longName value - */ - public void setLongName(final String aString) { - longName = aString; - } - - /** * Get maximum charges * * @return maximum charges @@ -3454,11 +3442,7 @@ * @return Description of the Return Value */ public String longName() { - if (longName.length() == 0) { - return toString(); - } - - return longName; + return toString(true); } /** Modified: Trunk/pcgen/code/src/java/pcgen/core/Race.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Race.java 2008-05-04 21:38:06 UTC (rev 6192) +++ Trunk/pcgen/code/src/java/pcgen/core/Race.java 2008-05-04 21:48:44 UTC (rev 6193) @@ -52,7 +52,6 @@ // TODO - Why do we need a hit point map in the race? private Map<String, Integer> hitPointMap = new HashMap<String, Integer>(); private Integer initMod = Integer.valueOf(0); - private Integer startingAC = Integer.valueOf(10); private String hitDieLock = Constants.EMPTY_STRING; private String ageString = Constants.EMPTY_STRING; @@ -856,21 +855,6 @@ txt.append(retString); } - if (startingAC.intValue() != 10) - { - txt.append("\tAC:").append(startingAC.toString()); - } - - /* - if (ageString != null && !Constants.s_NONE.equals(ageString) && ageString.length() > 0) - { - txt.append("\tAGE:").append(ageString); - } - if (BAB != 0) - { - txt.append("\tBAB:").append(BAB); - } - */ if (CoreUtility.doublesEqual(face.getY(), 0.0)) { txt.append("\tFACE:").append(face.getX() + " ft."); @@ -941,11 +925,6 @@ return size; } - public void setStartingAC(final Integer anInt) - { - startingAC = anInt; - } - @Override public Race clone() { Modified: Trunk/pcgen/code/src/java/pcgen/core/Skill.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Skill.java 2008-05-04 21:38:06 UTC (rev 6192) +++ Trunk/pcgen/code/src/java/pcgen/core/Skill.java 2008-05-04 21:48:44 UTC (rev 6193) @@ -501,15 +501,6 @@ required = argRequired; } - /** - * Set root name - * @param aString - */ - public void setRootName(final String aString) - { - rootName = aString; - } - /** * Get the type of cost for a skill * @param aClass @@ -900,7 +891,6 @@ { newSkill = (Skill) super.clone(); newSkill.required = required; - newSkill.setRootName(rootName); newSkill.setKeyStat(getKeyStat()); newSkill.setIsExclusive(isExclusive()); newSkill.rankList = new ArrayList<String>(rankList); @@ -1328,15 +1318,6 @@ return required; } - /** - * Get the root name - * @return root name - */ - public String getRootName() - { - return rootName; - } - /** * return of 0 means exclusive, 1=class-skill, 2=cross-class skill * @param aPCClassList Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java 2008-05-04 21:38:06 UTC (rev 6192) +++ Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java 2008-05-04 21:48:44 UTC (rev 6193) @@ -23,7 +23,6 @@ */ package pcgen.core.chooser; -import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; @@ -40,8 +39,6 @@ public class SkillListChoiceManager extends AbstractBasicStringChoiceManager { - protected List<String> rootArrayList = new ArrayList<String>(); - /** * Make a new Skill List chooser. * @@ -91,26 +88,7 @@ { for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) { - final String rootName = skill.getRootName(); - final int rootNameLength = rootName.length(); - - //all skills have ROOTs now, so go ahead and add it if the name and root are identical - if ((rootNameLength == 0) || rootName.equals(skill.getKeyName())) - { - availableList.add(skill.getKeyName()); - } - - final boolean rootArrayContainsRootName = rootArrayList.contains(rootName); - - if ((rootNameLength > 0) && !rootArrayContainsRootName) - { - rootArrayList.add(skill.getRootName()); - } - - if ((rootNameLength > 0) && rootArrayContainsRootName) - { - availableList.add(skill.getKeyName()); - } + availableList.add(skill.getKeyName()); } } @@ -133,20 +111,7 @@ if (pobject != null && pobject instanceof Ability) { Ability ability = (Ability) pobject; - if (rootArrayList.contains(item)) - { - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) - { - if (skill.getRootName().equalsIgnoreCase(item)) - { - addSkillToAbility( ability, skill.getKeyName() ); - } - } - } - else - { - addSkillToAbility( ability, item ); - } + addSkillToAbility( ability, item ); } } Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java 2008-05-04 21:38:06 UTC (rev 6192) +++ Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java 2008-05-04 21:48:44 UTC (rev 6193) @@ -87,26 +87,7 @@ continue; // builds a list of Cross class skills } - final String rootName = skill.getRootName(); - final int rootNameLength = rootName.length(); - - //all skills have ROOTs now, so go ahead and add it if the name and root are identical - if ((rootNameLength == 0) || rootName.equals(skill.getKeyName())) - { - availableList.add(skill.getKeyName()); - } - - final boolean rootArrayContainsRootName = rootArrayList.contains(rootName); - - if ((rootNameLength > 0) && !rootArrayContainsRootName) - { - rootArrayList.add(rootName); - } - - if ((rootNameLength > 0) && rootArrayContainsRootName) - { - availableList.add(skill.getKeyName()); - } + availableList.add(skill.getKeyName()); } } Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LongnameToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LongnameToken.java 2008-05-04 21:38:06 UTC (rev 6192) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LongnameToken.java 2008-05-04 21:48:44 UTC (rev 6193) @@ -1,29 +0,0 @@ -package plugin.lsttokens.deprecated; - -import pcgen.core.Equipment; -import pcgen.core.PObject; -import pcgen.persistence.lst.DeprecatedToken; -import pcgen.persistence.lst.EquipmentLstToken; - -/** - * Deals with LONGNAME token - */ -public class LongnameToken implements EquipmentLstToken, DeprecatedToken -{ - - public String getTokenName() - { - return "LONGNAME"; - } - - public boolean parse(Equipment eq, String value) - { - eq.setLongName(value); - return true; - } - - public String getMessage(PObject obj, String value) - { - return "Use OUTPUTNAME: instead."; - } -} Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/NameLst.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/NameLst.java 2008-05-04 21:38:06 UTC (rev 6192) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/NameLst.java 2008-05-04 21:48:44 UTC (rev 6193) @@ -1,35 +0,0 @@ -/* - * Created on Sep 2, 2005 - * - */ -package plugin.lsttokens.deprecated; - -import pcgen.core.PObject; -import pcgen.persistence.lst.DeprecatedToken; -import pcgen.persistence.lst.GlobalLstToken; -import pcgen.util.Logging; - -/** - * @author djones4 - * - */ -public class NameLst implements GlobalLstToken, DeprecatedToken -{ - - public String getTokenName() - { - return "NAME"; - } - - public boolean parse(PObject obj, String value, int anInt) - { - Logging.errorPrint("You are performing a dangerous action: " - + "You should not use the NAME Token"); - obj.setName(value); - return true; - } - - public String getMessage(PObject obj, String value) { - return "You are performing a dangerous action: You should not use the NAME Token"; - } -} Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RaceAcToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RaceAcToken.java 2008-05-04 21:38:06 UTC (rev 6192) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RaceAcToken.java 2008-05-04 21:48:44 UTC (rev 6193) @@ -1,36 +0,0 @@ -package plugin.lsttokens.deprecated; - -import pcgen.core.PObject; -import pcgen.core.Race; -import pcgen.persistence.lst.DeprecatedToken; -import pcgen.persistence.lst.RaceLstToken; - -/** - * Class deals with AC Token - */ -public class RaceAcToken implements RaceLstToken, DeprecatedToken -{ - - public String getTokenName() - { - return "AC"; - } - - public boolean parse(Race race, String value) - { - try - { - race.setStartingAC(Integer.valueOf(value)); - return true; - } - catch (NumberFormatException nfe) - { - return false; - } - } - - public String getMessage(PObject obj, String value) - { - return "AC in Race is a non-functioning Token"; - } -} Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RacenameToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RacenameToken.java 2008-05-04 21:38:06 UTC (rev 6192) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RacenameToken.java 2008-05-04 21:48:44 UTC (rev 6193) @@ -1,29 +0,0 @@ -package plugin.lsttokens.deprecated; - -import pcgen.core.PObject; -import pcgen.core.Race; -import pcgen.persistence.lst.DeprecatedToken; -import pcgen.persistence.lst.RaceLstToken; - -/** - * Class deals with RACENAME Token - */ -public class RacenameToken implements RaceLstToken, DeprecatedToken -{ - - public String getTokenName() - { - return "RACENAME"; - } - - public boolean parse(Race race, String value) - { - race.setName(value); - return true; - } - - public String getMessage(PObject obj, String value) - { - return "This was a PCGen 2.X Tag. Use OUTPUTNAME instead"; - } -} Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RootToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RootToken.java 2008-05-04 21:38:06 UTC (rev 6192) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/RootToken.java 2008-05-04 21:48:44 UTC (rev 6193) @@ -1,29 +0,0 @@ -package plugin.lsttokens.deprecated; - -import pcgen.core.PObject; -import pcgen.core.Skill; -import pcgen.persistence.lst.DeprecatedToken; -import pcgen.persistence.lst.SkillLstToken; - -/** - * Class deals with ROOT Token - */ -public class RootToken implements SkillLstToken, DeprecatedToken -{ - - public String getTokenName() - { - return "ROOT"; - } - - public boolean parse(Skill skill, String value) - { - skill.setRootName(value); - return true; - } - - public String getMessage(PObject obj, String value) - { - return "ROOT is a non-functioning Token - predates COST, TYPE breakdowns for Skills"; - } -} Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SourceLst.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SourceLst.java 2008-05-04 21:38:06 UTC (rev 6192) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SourceLst.java 2008-05-04 21:48:44 UTC (rev 6193) @@ -1,50 +0,0 @@ -/* - * Created on Sep 2, 2005 - * - */ -package plugin.lsttokens.deprecated; - -import java.util.Map; - -import pcgen.core.PObject; -import pcgen.persistence.lst.GlobalLstToken; -import pcgen.persistence.lst.SourceLoader; -import pcgen.persistence.lst.SourceLstToken; -import pcgen.persistence.lst.DeprecatedToken; -import pcgen.util.PropertyFactory; - -/** - * @author djones4 - * - * DeprecatedToken. Seems to be used as a SOURCEPAGE tag. - * - */ -public class SourceLst implements GlobalLstToken, SourceLstToken, - DeprecatedToken -{ - - public String getTokenName() - { - return "SOURCE"; - } - - public boolean parse(PObject obj, String value, int anInt) - { - obj.getSourceEntry().getSourceBook().setLongName(value); - return true; - } - - public boolean parse(Map<String, String> sourceMap, String value) - { - sourceMap.putAll(SourceLoader.parseSource("SOURCEPAGE:" + value)); - return true; - } - - /** - * @see pcgen.persistence.lst.DeprecatedToken#getMessage(pcgen.core.PObject, java.lang.String) - */ - public String getMessage(PObject anObj, String anValue) - { - return PropertyFactory.getString("DeprecatedToken.SourceLst.Message"); //$NON-NLS-1$ - } -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |