[pcgen-commit-svn] SF.net SVN: pcgen: [115] Trunk/pcgen

[<sou...@us...>]

Revision: 115
Author:   soulcatcher
Date:     2006-03-06 16:31:08 -0800 (Mon, 06 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/pcgen/?rev=115&view=rev

Log Message:
-----------
Deprecated the old form of SOURCExxx.  Split out every token type to it's own target in pluginbuild.xml

Modified Paths:
--------------
    Trunk/pcgen/build.xml
    Trunk/pcgen/code/pluginbuild.xml
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/PObjectLoader.java
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/TokenStore.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/kit/ability/FreeToken.java

Added Paths:
-----------
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/SourceLoader.java
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/SourceLstToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/SourceLst.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/SourcelongLst.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/SourcepageLst.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/SourceshortLst.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/SourcewebLst.java
Modified: Trunk/pcgen/build.xml
===================================================================
--- Trunk/pcgen/build.xml	2006-03-07 00:10:39 UTC (rev 114)
+++ Trunk/pcgen/build.xml	2006-03-07 00:31:08 UTC (rev 115)
@@ -787,7 +787,7 @@
 
 	<target name="test.compile" depends="jar, jar-all-plugins">
 		<mkdir dir="${build.testclasses.dir}" />
-		<javac srcdir="${src.test.java.dir}" destdir="${build.testclasses.dir}" deprecation="true" includes="**/*.java" memoryInitialSize="128m" memoryMaximumSize="512m">
+		<javac srcdir="${src.test.java.dir}" destdir="${build.testclasses.dir}" deprecation="true" includes="**/*.java" memoryInitialSize="128m" memoryMaximumSize="512m" fork="true">
 			<classpath refid="test.project.classpath" />
 		</javac>
 	</target>

Modified: Trunk/pcgen/code/pluginbuild.xml
===================================================================
--- Trunk/pcgen/code/pluginbuild.xml	2006-03-07 00:10:39 UTC (rev 114)
+++ Trunk/pcgen/code/pluginbuild.xml	2006-03-07 00:31:08 UTC (rev 115)
@@ -1744,7 +1744,10 @@
 		</jar>
 	</target>
 
-	<target name="jar-lst-plugins" depends="makeplugindirs" description="Build (Link) Lst Token plugin jar files">
+	<target name="jar-lst-plugins" depends="jar-lst-global-plugins, jar-lst-ability-plugins, jar-lst-campaign-plugins, jar-lst-class-plugins, jar-lst-companionmod-plugins, jar-lst-diety-plugins, jar-lst-domain-plugins, jar-lst-equipment-plugins, jar-lst-equipmentmodifier-plugins, jar-lst-race-plugins, jar-lst-skill-plugins, jar-lst-spell-plugins, jar-lst-subclass-plugins, jar-lst-weaponprof-plugins, jar-lst-kit-plugins" description="Build (Link) Lst Token plugin jar files">
+	</target>
+
+	<target name="jar-lst-global-plugins" depends="makeplugindirs" description="Build (Link) Global Lst Token plugin jar files">
 		<!-- Global Lst tokens-->
 		<jar jarfile="${lstplugins.dir}/LstToken-ADD.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -1921,6 +1924,41 @@
 				</patternset>
 			</fileset>
 		</jar>
+		<jar jarfile="${lstplugins.dir}/LstToken-SOURCE.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
+			<fileset dir="${build.classes.dir}">
+				<patternset>
+					<include name="plugin/lsttokens/SourceLst.class" />
+				</patternset>
+			</fileset>
+		</jar>
+		<jar jarfile="${lstplugins.dir}/LstToken-SOURCELONG.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
+			<fileset dir="${build.classes.dir}">
+				<patternset>
+					<include name="plugin/lsttokens/SourcelongLst.class" />
+				</patternset>
+			</fileset>
+		</jar>
+		<jar jarfile="${lstplugins.dir}/LstToken-SOURCEPAGE.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
+			<fileset dir="${build.classes.dir}">
+				<patternset>
+					<include name="plugin/lsttokens/SourcepageLst.class" />
+				</patternset>
+			</fileset>
+		</jar>
+		<jar jarfile="${lstplugins.dir}/LstToken-SOURCESHORT.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
+			<fileset dir="${build.classes.dir}">
+				<patternset>
+					<include name="plugin/lsttokens/SourceshortLst.class" />
+				</patternset>
+			</fileset>
+		</jar>
+		<jar jarfile="${lstplugins.dir}/LstToken-SOURCEWEB.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
+			<fileset dir="${build.classes.dir}">
+				<patternset>
+					<include name="plugin/lsttokens/SourcewebLst.class" />
+				</patternset>
+			</fileset>
+		</jar>
 		<jar jarfile="${lstplugins.dir}/LstToken-SPELLS.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
 				<patternset>
@@ -1991,6 +2029,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-ability-plugins" depends="makeplugindirs" description="Build (Link) Ability Lst Token plugin jar files">
 		<!-- Ability tokens-->
 		<jar jarfile="${lstplugins.dir}/AbilityLstToken-ADDSPELLLEVEL.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -2062,6 +2103,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-campaign-plugins" depends="makeplugindirs" description="Build (Link) Campaign Lst Token plugin jar files">
 		<!-- Campaign tokens-->
 		<jar jarfile="${lstplugins.dir}/CampaignLstToken-ABILITY.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -2350,6 +2394,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-class-plugins" depends="makeplugindirs" description="Build (Link) Class Lst Token plugin jar files">
 		<!-- Class tokens-->
 		<jar jarfile="${lstplugins.dir}/ClassLstToken-ABB.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -2694,6 +2741,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-companionmod-plugins" depends="makeplugindirs" description="Build (Link) CompanionMod Lst Token plugin jar files">
 		<!-- CompanionMod tokens-->
 		<jar jarfile="${lstplugins.dir}/CompanionModLstToken-COPYMASTERBAB.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -2758,6 +2808,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+	
+	<target name="jar-lst-diety-plugins" depends="makeplugindirs" description="Build (Link) Diety Lst Token plugin jar files">
 		<!-- Deity tokens-->
 		<jar jarfile="${lstplugins.dir}/DeityLstToken-ALIGN.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -2836,6 +2889,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+	
+	<target name="jar-lst-domain-plugins" depends="makeplugindirs" description="Build (Link) Do Lst Token plugin jar files">
 		<!-- Domain tokens-->
 		<jar jarfile="${lstplugins.dir}/DomainLstToken-ABILITY.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -2858,6 +2914,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-equipment-plugins" depends="makeplugindirs" description="Build (Link) Equipment Lst Token plugin jar files">
 		<!-- Equipment tokens-->
 		<jar jarfile="${lstplugins.dir}/EquipmentLstToken-ACCHECK.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -3118,6 +3177,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-equipmentmodifier-plugins" depends="makeplugindirs" description="Build (Link) Equipment Modifier Lst Token plugin jar files">
 		<!-- Equipment Modifier tokens-->
 		<jar jarfile="${lstplugins.dir}/EquipmentModifierLstToken-ADDPROF.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -3231,6 +3293,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-race-plugins" depends="makeplugindirs" description="Build (Link) Race Lst Token plugin jar files">
 		<!-- Race tokens-->
 		<jar jarfile="${lstplugins.dir}/RaceLstToken-AC.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -3456,6 +3521,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-skill-plugins" depends="makeplugindirs" description="Build (Link) Skill Lst Token plugin jar files">
 		<!-- Skill tokens-->
 		<jar jarfile="${lstplugins.dir}/SkillLstToken-ACCHECK.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -3513,6 +3581,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-spell-plugins" depends="makeplugindirs" description="Build (Link) Spell Lst Token plugin jar files">
 		<!-- Spell tokens-->
 		<jar jarfile="${lstplugins.dir}/SpellLstToken-CASTTIMES.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -3661,6 +3732,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-subclass-plugins" depends="makeplugindirs" description="Build (Link) SubClass Lst Token plugin jar files">
 		<!-- SubClass tokens:
 			   CHOICE, COST, PROHIBITCOST, SUBCLASSLEVEL, SUBCLASS
 		-->
@@ -3699,6 +3773,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-weaponprof-plugins" depends="makeplugindirs" description="Build (Link) Weapon Prof Lst Token plugin jar files">
 		<!-- WeaponProf tokens-->
 		<jar jarfile="${lstplugins.dir}/WeaponProfLstToken-HANDS.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">
@@ -3714,6 +3791,9 @@
 				</patternset>
 			</fileset>
 		</jar>
+	</target>
+
+	<target name="jar-lst-kit-plugins" depends="makeplugindirs" description="Build (Link) Kit Lst Token plugin jar files">
 		<!-- Kit tokens-->
 		<jar jarfile="${lstplugins.dir}/KitLstToken-STARTPACK.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf">
 			<fileset dir="${build.classes.dir}">

Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java	2006-03-07 00:10:39 UTC (rev 114)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -291,7 +291,7 @@
 			}
 			else if (line.startsWith("SOURCE"))
 			{
-				sourceMap = PObjectLoader.parseSource(line);
+				sourceMap = SourceLoader.parseLine(line, sourceEntry.getFile());
 			}
 			else if (tokens[0].indexOf(".COPY") > 0)
 			{

Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java	2006-03-07 00:10:39 UTC (rev 114)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -25,23 +25,62 @@
  */
 package pcgen.persistence.lst;
 
-import pcgen.core.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Observable;
+import java.util.Observer;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
+
+import pcgen.core.BioSet;
+import pcgen.core.Campaign;
+import pcgen.core.Constants;
+import pcgen.core.CustomData;
+import pcgen.core.Deity;
+import pcgen.core.Domain;
+import pcgen.core.Equipment;
+import pcgen.core.EquipmentList;
+import pcgen.core.EquipmentModifier;
+import pcgen.core.GameMode;
+import pcgen.core.Globals;
+import pcgen.core.Kit;
+import pcgen.core.LevelInfo;
+import pcgen.core.PCClass;
+import pcgen.core.PCTemplate;
+import pcgen.core.PObject;
+import pcgen.core.PlayerCharacter;
+import pcgen.core.Race;
+import pcgen.core.SettingsHandler;
+import pcgen.core.Skill;
+import pcgen.core.SourceUtilities;
+import pcgen.core.SystemCollections;
 import pcgen.core.character.CompanionMod;
 import pcgen.core.spell.Spell;
 import pcgen.core.utils.CoreUtility;
 import pcgen.core.utils.MessageType;
 import pcgen.core.utils.ShowMessageDelegate;
 import pcgen.gui.pcGenGUI;
+import pcgen.io.PCGFile;
 import pcgen.persistence.PersistenceLayerException;
 import pcgen.persistence.SystemLoader;
 import pcgen.util.Logging;
-import pcgen.io.PCGFile;
 
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
 /**
  * ???
  *

Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/PObjectLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/PObjectLoader.java	2006-03-07 00:10:39 UTC (rev 114)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/PObjectLoader.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -26,11 +26,9 @@
 package pcgen.persistence.lst;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.StringTokenizer;
 
 import pcgen.core.Campaign;
 import pcgen.core.PObject;
@@ -142,13 +140,9 @@
 					}
 				}
 			}
-			else if (aTag.startsWith("SOURCE"))
-			{
-				obj.setSourceMap(parseSource(aTag));
-			}
 			else if (aTag.startsWith("VFEAT:"))
 			{
-					featList.add(new PObjectHelper(obj, aTag.substring(6), anInt));
+				featList.add(new PObjectHelper(obj, aTag.substring(6), anInt));
 			}
 			else
 			{
@@ -168,27 +162,4 @@
 			p.getObject().addVirtualFeats(vFeatList);
 		}
 	}
-
-	/**
-	 * This method parses a line in an LST file containing the source information
-	 * into the map form used by a PObject.
-	 *
-	 * @param value String LST formatted source information line
-	 * @return Map of source forms
-	 */
-	public static Map parseSource(String value)
-	{
-		Map sourceMap = new HashMap();
-		StringTokenizer aTok = new StringTokenizer(value, "|");
-
-		while (aTok.hasMoreTokens())
-		{
-			String arg = aTok.nextToken();
-			String key = arg.substring(6, arg.indexOf(':'));
-			String val = arg.substring(arg.indexOf(':') + 1);
-			sourceMap.put(key, val);
-		}
-
-		return sourceMap;
-	}
 }
\ No newline at end of file

Added: Trunk/pcgen/code/src/java/pcgen/persistence/lst/SourceLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/SourceLoader.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/SourceLoader.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -0,0 +1,80 @@
+package pcgen.persistence.lst;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import pcgen.persistence.SystemLoader;
+import pcgen.util.Logging;
+
+public class SourceLoader {
+	
+	/**
+	 * @see pcgen.persistence.lst.LstObjectFileLoader#parseLine(pcgen.core.PObject, java.lang.String, pcgen.persistence.lst.CampaignSourceEntry)
+	 */
+	public static Map parseLine(String lstLine, String sourceFile)
+	{
+		Map sourceMap = new HashMap();
+
+		final StringTokenizer colToken = new StringTokenizer(lstLine, SystemLoader.TAB_DELIM);
+
+		Map tokenMap = TokenStore.inst().getTokenMap(SourceLstToken.class);
+		while (colToken.hasMoreTokens())
+		{
+			final String colString = colToken.nextToken().trim();
+
+			final int idxColon = colString.indexOf(':');
+			String key = "";
+			try
+			{
+				key = colString.substring(0, idxColon);
+			}
+			catch(StringIndexOutOfBoundsException e) {
+				// TODO Handle Exception
+			}
+			SourceLstToken token = (SourceLstToken) tokenMap.get(key);
+			if (token != null)
+			{
+				final String value = colString.substring(idxColon + 1);
+				LstUtils.deprecationCheck(token, "SOURCE", sourceFile, value);
+				if (!token.parse(sourceMap, value))
+				{
+					Logging.errorPrint("Error parsing source: " + colString + " in: " + sourceFile);
+				}
+			}
+			else
+			{
+				Logging.errorPrint("Unknown tag '" + colString + "' in: " + sourceFile);
+			}
+
+		}
+
+		return sourceMap;
+	}
+	
+	/**
+	 * This method parses a line in an LST file containing the source information
+	 * into the map form used by a PObject.
+	 *
+	 * @param value String LST formatted source information line
+	 * @return Map of source forms
+	 */
+	public static Map parseSource(String value)
+	{
+		Map sourceMap = new HashMap();
+		if(value.indexOf("|") != -1) {
+			Logging.errorPrint("Use of SOURCELONG:<value>|SOURCESHORT:<value>|SOURCEWEB:<value>|SOURCEPAGE:<value> is deprecated.  These need to be split up into separate tokens");
+		}
+		StringTokenizer aTok = new StringTokenizer(value, "|");
+
+		while (aTok.hasMoreTokens())
+		{
+			String arg = aTok.nextToken();
+			String key = arg.substring(6, arg.indexOf(':'));
+			String val = arg.substring(arg.indexOf(':') + 1);
+			sourceMap.put(key, val);
+		}
+
+		return sourceMap;
+	}
+}

Added: Trunk/pcgen/code/src/java/pcgen/persistence/lst/SourceLstToken.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/SourceLstToken.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/SourceLstToken.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -0,0 +1,8 @@
+package pcgen.persistence.lst;
+
+import java.util.Map;
+
+public interface SourceLstToken extends LstToken {
+	public boolean parse(Map sourceMap, String value);
+
+}

Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/TokenStore.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/TokenStore.java	2006-03-07 00:10:39 UTC (rev 114)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/TokenStore.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -47,6 +47,7 @@
 		tokenTypeList.add(RaceLstToken.class);
 		tokenTypeList.add(SkillLstToken.class);
 		tokenTypeList.add(SpellLstToken.class);
+		tokenTypeList.add(SourceLstToken.class);
 		tokenTypeList.add(SubClassLstToken.class);
 		tokenTypeList.add(WeaponProfLstToken.class);
 		//Kits

Added: Trunk/pcgen/code/src/java/plugin/lsttokens/SourceLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/SourceLst.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/SourceLst.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -0,0 +1 @@
+/*
 * Created on Sep 2, 2005
 *
 */
package plugin.lsttokens;

import java.util.Map;

import pcgen.core.PObject;
import pcgen.persistence.lst.GlobalLstToken;
import pcgen.persistence.lst.SourceLoader;
import pcgen.persistence.lst.SourceLstToken;


/**
 * @author djones4
 *
 */
public class SourceLst implements GlobalLstToken, SourceLstToken  {

	public String getTokenName() {
		return "SOURCE";
	}

	public boolean parse(PObject obj, String value, int anInt) {
		obj.setSourceMap(SourceLoader.parseSource("SOURCE:" + value));
		return true;
	}

	public boolean parse(Map sourceMap, String value) {
		sourceMap.putAll(SourceLoader.parseSource("SOURCE:" + value));
		return true;
	}
}
\ No newline at end of file

Added: Trunk/pcgen/code/src/java/plugin/lsttokens/SourcelongLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/SourcelongLst.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/SourcelongLst.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -0,0 +1 @@
+/*
 * Created on Sep 2, 2005
 *
 */
package plugin.lsttokens;

import java.util.Map;

import pcgen.core.PObject;
import pcgen.persistence.lst.GlobalLstToken;
import pcgen.persistence.lst.SourceLoader;
import pcgen.persistence.lst.SourceLstToken;


/**
 * @author djones4
 *
 */
public class SourcelongLst implements GlobalLstToken, SourceLstToken  {

	public String getTokenName() {
		return "SOURCELONG";
	}

	public boolean parse(PObject obj, String value, int anInt) {
		obj.setSourceMap(SourceLoader.parseSource("SOURCELONG:" + value));
		return true;
	}

	public boolean parse(Map sourceMap, String value) {
		sourceMap.putAll(SourceLoader.parseSource("SOURCELONG:" + value));
		return true;
	}
}
\ No newline at end of file

Added: Trunk/pcgen/code/src/java/plugin/lsttokens/SourcepageLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/SourcepageLst.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/SourcepageLst.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -0,0 +1 @@
+/*
 * Created on Sep 2, 2005
 *
 */
package plugin.lsttokens;

import java.util.Map;

import pcgen.core.PObject;
import pcgen.persistence.lst.GlobalLstToken;
import pcgen.persistence.lst.SourceLoader;
import pcgen.persistence.lst.SourceLstToken;

/**
 * @author djones4
 *
 */
public class SourcepageLst implements GlobalLstToken, SourceLstToken {

	public String getTokenName() {
		return "SOURCEPAGE";
	}

	public boolean parse(PObject obj, String value, int anInt) {
		obj.setSourceMap(SourceLoader.parseSource("SOURCEPAGE:" + value));
		return true;
	}

	public boolean parse(Map sourceMap, String value) {
		sourceMap.putAll(SourceLoader.parseSource("SOURCEPAGE:" + value));
		return true;
	}
}
\ No newline at end of file

Added: Trunk/pcgen/code/src/java/plugin/lsttokens/SourceshortLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/SourceshortLst.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/SourceshortLst.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -0,0 +1 @@
+/*
 * Created on Sep 2, 2005
 *
 */
package plugin.lsttokens;

import java.util.Map;

import pcgen.core.PObject;
import pcgen.persistence.lst.GlobalLstToken;
import pcgen.persistence.lst.SourceLoader;
import pcgen.persistence.lst.SourceLstToken;

/**
 * @author djones4
 *
 */
public class SourceshortLst implements GlobalLstToken, SourceLstToken {

	public String getTokenName() {
		return "SOURCESHORT";
	}

	public boolean parse(PObject obj, String value, int anInt) {
		obj.setSourceMap(SourceLoader.parseSource("SOURCESHORT:" + value));
		return true;
	}

	public boolean parse(Map sourceMap, String value) {
		sourceMap.putAll(SourceLoader.parseSource("SOURCESHORT:" + value));
		return true;
	}
}
\ No newline at end of file

Added: Trunk/pcgen/code/src/java/plugin/lsttokens/SourcewebLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/SourcewebLst.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/SourcewebLst.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -0,0 +1 @@
+/*
 * Created on Sep 2, 2005
 *
 */
package plugin.lsttokens;

import java.util.Map;

import pcgen.core.PObject;
import pcgen.persistence.lst.GlobalLstToken;
import pcgen.persistence.lst.SourceLoader;
import pcgen.persistence.lst.SourceLstToken;


/**
 * @author djones4
 *
 */
public class SourcewebLst implements GlobalLstToken, SourceLstToken {

	public String getTokenName() {
		return "SOURCEWEB";
	}

	public boolean parse(PObject obj, String value, int anInt) {
		obj.setSourceMap(SourceLoader.parseSource("SOURCEWEB:" + value));
		return true;
	}

	public boolean parse(Map sourceMap, String value) {
		sourceMap.putAll(SourceLoader.parseSource("SOURCEWEB:" + value));
		return true;
	}
}
\ No newline at end of file

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/kit/ability/FreeToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/kit/ability/FreeToken.java	2006-03-07 00:10:39 UTC (rev 114)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/kit/ability/FreeToken.java	2006-03-07 00:31:08 UTC (rev 115)
@@ -26,7 +26,6 @@
 
 import pcgen.core.kit.KitAbilities;
 import pcgen.persistence.lst.KitAbilityLstToken;
-import pcgen.util.Logging;
 
 public class FreeToken implements KitAbilityLstToken
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.