From: <th...@us...> - 2006-11-05 01:02:38
|
Revision: 1587 http://svn.sourceforge.net/pcgen/?rev=1587&view=rev Author: thpr Date: 2006-11-04 17:02:21 -0800 (Sat, 04 Nov 2006) Log Message: ----------- PCClass: Eliminate SUBCLASS and SUBSTITUTIONCLASS Tags and associated code (all unused) Note SUBCLASS and SUBSTITUTIONCLASS processing in PCClassLoader is unchanged. Modified Paths: -------------- Trunk/pcgen/code/pluginbuild.xml Trunk/pcgen/code/src/java/pcgen/core/PCClass.java Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java Added Paths: ----------- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SubclassToken.java Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SubstitutionclassToken.java Removed Paths: ------------- Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/SubclassToken.java Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/SubstitutionclassToken.java Modified: Trunk/pcgen/code/pluginbuild.xml =================================================================== --- Trunk/pcgen/code/pluginbuild.xml 2006-11-05 00:23:31 UTC (rev 1586) +++ Trunk/pcgen/code/pluginbuild.xml 2006-11-05 01:02:21 UTC (rev 1587) @@ -2770,20 +2770,6 @@ </patternset> </fileset> </jar> - <jar jarfile="${lstplugins.dir}/ClassLstToken-SUBCLASS.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> - <fileset dir="${build.classes.dir}"> - <patternset> - <include name="plugin/lsttokens/pcclass/SubclassToken.class" /> - </patternset> - </fileset> - </jar> - <jar jarfile="${lstplugins.dir}/ClassLstToken-SUBSTITUTIONCLASS.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> - <fileset dir="${build.classes.dir}"> - <patternset> - <include name="plugin/lsttokens/pcclass/SubstitutionclassToken.class" /> - </patternset> - </fileset> - </jar> <jar jarfile="${lstplugins.dir}/ClassLstToken-TEMPLATE.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> <fileset dir="${build.classes.dir}"> <patternset> @@ -5857,6 +5843,20 @@ </patternset> </fileset> </jar> + <jar jarfile="${lstplugins.dir}/ClassLstToken-DEPRECATED-SUBCLASS.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> + <fileset dir="${build.classes.dir}"> + <patternset> + <include name="plugin/lsttokens/deprecateds/SubclassToken.class" /> + </patternset> + </fileset> + </jar> + <jar jarfile="${lstplugins.dir}/ClassLstToken-DEPRECATED-SUBSTITUTIONCLASS.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> + <fileset dir="${build.classes.dir}"> + <patternset> + <include name="plugin/lsttokens/deprecated/SubstitutionclassToken.class" /> + </patternset> + </fileset> + </jar> </target> <target name="manifest" description="Write the Java manifest"> Modified: Trunk/pcgen/code/src/java/pcgen/core/PCClass.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2006-11-05 00:23:31 UTC (rev 1586) +++ Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2006-11-05 01:02:21 UTC (rev 1587) @@ -583,22 +583,12 @@ private String subClassKey = Constants.s_NONE; /* - * DELETEVARIABLE from ancient code - can delete - */ - private String subClassString = Constants.s_NONE; - - /* * ALLCLASSLEVELS This goes into each PCClassLevel from PCClass in order to * store what the substitution level actually is. This is NOT set by a tag, so it is * PCCLASSLEVELONLY */ private Map<Integer, String> substitutionClassKey = null; - /* - * DELETEVARIABLE Unused variable - */ - private String substitutionClassString = Constants.s_NONE; - // private TreeSet<Language> languageBonus = new TreeSet<Language>(); /* @@ -2876,20 +2866,6 @@ } /* - * DELETEMETHOD - unused variable - */ - public final void setSubClassString(final String aString) { - subClassString = aString; - } - - /* - * DELETEMETHOD Per Tir, this is from the 3.0/4.0 cleanup and is unused code. - */ - public final String getSubClassString() { - return subClassString; - } - - /* * PCCLASSONLY This is really an item that the PCClass knows, and then the * selected substitutionClass, if any, is structured into the PCClassLevel * during the construction of the PCClassLevel @@ -2911,20 +2887,6 @@ } /* - * DELETEMETHOD - variable is unused - */ - public final void setSubstitutionClassString(final String aString) { - substitutionClassString = aString; - } - - /* - * DELETEMETHOD unused method - */ - public final String getSubstitutionClassString() { - return substitutionClassString; - } - - /* * Note: Since this is local access, it does not need to override * getTemplateList from PObject (although it is probably confusing that it * doesn't). The key point is ensuring that getTemplates(final boolean flag, Modified: Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java 2006-11-05 00:23:31 UTC (rev 1586) +++ Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java 2006-11-05 01:02:21 UTC (rev 1587) @@ -27,7 +27,6 @@ import pcgen.core.*; import pcgen.core.spell.Spell; -import pcgen.core.utils.CoreUtility; import pcgen.core.utils.MessageType; import pcgen.core.utils.ShowMessageDelegate; import pcgen.gui.utils.IconUtilitities; @@ -83,7 +82,6 @@ private List<Spell> classSpells = null; private List<String> levelList = null; private List<String> subTypeList = new ArrayList<String>(); - private Map<String, List<String>> specialists = null; private PObject castingClass = null; private Spell theSpell = null; private String choiceString = ""; @@ -240,94 +238,6 @@ } } - private void getSpecialists() - { - specialists = new HashMap<String, List<String>>(); - - for (PCClass aClass : Globals.getClassList()) - { - final List<String> subClasses = CoreUtility.split(aClass.getSubClassString(), '|'); - - if (subClasses.size() > 1) - { - subClasses.remove(0); // level - } - - for (int idx = 0; idx < subClasses.size(); idx++) - { - String fileName = subClasses.get(idx); - int i = fileName.indexOf('('); - - if (i >= 0) - { - fileName = fileName.substring(0, i); - } - - if (fileName.startsWith("FILE=")) - { - CoreUtility.fixFilenamePath(fileName); - i = 5; - - if (fileName.charAt(6) == File.separatorChar) - { - i = 6; - } - - fileName = fileName.substring(i); - fileName = SettingsHandler.getPccFilesLocation() + File.separator + fileName; - - File aFile = new File(fileName); - - try - { - BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(aFile), - "UTF-8")); - - String line = reader.readLine(); - - while (line != null) - { - if (!((line.length() > 0) && (line.charAt(0) == '#'))) - { - final StringTokenizer aTok = new StringTokenizer(line.trim(), "\t"); - - if (aTok.countTokens() > 2) - { - final String specialty = aTok.nextToken(); - final String cost = aTok.nextToken(); - final String className = aTok.nextToken(); - List<String> aList = new ArrayList<String>(5); - aList.add(aClass.getKeyName()); - aList.add(specialty); - aList.add(cost); - - //specialists.put(className, aClass.getName() + "\t" + specialty + "\t" + cost); - specialists.put(className, aList); - } - } - - line = reader.readLine(); - } - - reader.close(); - } - catch (FileNotFoundException exception) - { - //TODO: Should we really ignore this? - } - catch (UnsupportedEncodingException exception) - { - //TODO: Should we really ignore this? - } - catch (IOException exception) - { - //TODO: Should we really ignore this? - } - } - } - } - } - private boolean isSpellOfSubType(Spell aSpell) { if (subTypeList.size() == 0) @@ -1195,8 +1105,6 @@ if (unfoundItems.size() > 0) { - specialists = null; - for (String eMsg : unfoundItems) { String bMsg = null; @@ -1209,37 +1117,7 @@ switch (eMsg.charAt(0)) { case 'C': - - // - // Get a list of all possible specialists - // - if (specialists == null) - { - getSpecialists(); - } - - final String sub = eMsg.substring(1); - final List<String> specInfo = specialists.get(sub); - - if (specInfo == null) - { - bMsg = "Class"; - } - else - { - // - // hack: specialists used to appear in in PObjects somehow, make it look similar - // - PObject pobj = new PObject(); - pobj.setName(sub); - pobj.addAllToAssociated(specInfo); - - if (!classWithSpell.contains(pobj)) - { - classWithSpell.add(pobj); - } - } - + bMsg = "Class"; break; case 'D': Copied: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SubclassToken.java (from rev 1579, Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/SubclassToken.java) =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SubclassToken.java (rev 0) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SubclassToken.java 2006-11-05 01:02:21 UTC (rev 1587) @@ -0,0 +1,27 @@ +package plugin.lsttokens.deprecated; + +import pcgen.core.PCClass; +import pcgen.core.PObject; +import pcgen.persistence.lst.DeprecatedToken; +import pcgen.persistence.lst.PCClassLstToken; +import pcgen.util.Logging; + +/** + * Class deals with SUBCLASS Token + */ +public class SubclassToken implements PCClassLstToken, DeprecatedToken { + + public String getTokenName() { + return "SUBCLASS"; + } + + public boolean parse(PCClass pcclass, String value, int level) { + Logging.errorPrint("You have used a Tag (SUBCLASS) which was never processed in PCGen - it has been removed"); + return false; + } + + public String getMessage(PObject obj, String value) { + return "You have used a Tag (SUBCLASS) NOT at the start of a line..." + + "this was never processed in PCGen - it has been removed"; + } +} Copied: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SubstitutionclassToken.java (from rev 1579, Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/SubstitutionclassToken.java) =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SubstitutionclassToken.java (rev 0) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/SubstitutionclassToken.java 2006-11-05 01:02:21 UTC (rev 1587) @@ -0,0 +1,27 @@ +package plugin.lsttokens.deprecated; + +import pcgen.core.PCClass; +import pcgen.core.PObject; +import pcgen.persistence.lst.DeprecatedToken; +import pcgen.persistence.lst.PCClassLstToken; +import pcgen.util.Logging; + +/** + * Class deals with SUBSTITUTIONCLASS Token + */ +public class SubstitutionclassToken implements PCClassLstToken, DeprecatedToken { + + public String getTokenName() { + return "SUBSTITUTIONCLASS"; + } + + public boolean parse(PCClass pcclass, String value, int level) { + Logging.errorPrint("You have used a Tag (SUBSTITUTIONCLASS) which was never processed in PCGen - it has been removed"); + return false; + } + + public String getMessage(PObject obj, String value) { + return "You have used a Tag (SUBSTITUTIONCLASS) NOT at the start of a line..." + + "this was never processed in PCGen - it has been removed"; + } +} Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/SubclassToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/SubclassToken.java 2006-11-05 00:23:31 UTC (rev 1586) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/SubclassToken.java 2006-11-05 01:02:21 UTC (rev 1587) @@ -1,20 +0,0 @@ -package plugin.lsttokens.pcclass; - -import pcgen.core.PCClass; -import pcgen.persistence.lst.PCClassLoader; -import pcgen.persistence.lst.PCClassLstToken; - -/** - * Class deals with SUBCLASS Token - */ -public class SubclassToken implements PCClassLstToken { - - public String getTokenName() { - return "SUBCLASS"; - } - - public boolean parse(PCClass pcclass, String value, int level) { - pcclass.setSubClassString(PCClassLoader.fixParameter(level, value)); - return true; - } -} Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/SubstitutionclassToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/SubstitutionclassToken.java 2006-11-05 00:23:31 UTC (rev 1586) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/SubstitutionclassToken.java 2006-11-05 01:02:21 UTC (rev 1587) @@ -1,20 +0,0 @@ -package plugin.lsttokens.pcclass; - -import pcgen.core.PCClass; -import pcgen.persistence.lst.PCClassLoader; -import pcgen.persistence.lst.PCClassLstToken; - -/** - * Class deals with SUBSTITUTIONCLASS Token - */ -public class SubstitutionclassToken implements PCClassLstToken { - - public String getTokenName() { - return "SUBSTITUTIONCLASS"; - } - - public boolean parse(PCClass pcclass, String value, int level) { - pcclass.setSubstitutionClassString(PCClassLoader.fixParameter(level, value)); - return true; - } -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |