Thread: [pcgen-commit-svn] SF.net SVN: pcgen: [6673] Trunk/pcgen/code/src (Page 6)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 6673
          http://pcgen.svn.sourceforge.net/pcgen/?rev=6673&view=rev
Author:   thpr
Date:     2008-06-15 20:05:01 -0700 (Sun, 15 Jun 2008)

Log Message:
-----------
More simplification & cleanup of ConcretePrereqObject & PrereqObject

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java
    Trunk/pcgen/code/src/java/pcgen/cdom/base/ConcretePrereqObject.java
    Trunk/pcgen/code/src/java/pcgen/cdom/base/PrereqObject.java
    Trunk/pcgen/code/src/java/pcgen/core/Ability.java
    Trunk/pcgen/code/src/java/pcgen/core/DamageReduction.java
    Trunk/pcgen/code/src/java/pcgen/core/Description.java
    Trunk/pcgen/code/src/java/pcgen/core/Domain.java
    Trunk/pcgen/code/src/java/pcgen/core/Equipment.java
    Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java
    Trunk/pcgen/code/src/java/pcgen/core/FollowerOption.java
    Trunk/pcgen/code/src/java/pcgen/core/Kit.java
    Trunk/pcgen/code/src/java/pcgen/core/KitUtilities.java
    Trunk/pcgen/code/src/java/pcgen/core/PCClass.java
    Trunk/pcgen/code/src/java/pcgen/core/PCSpell.java
    Trunk/pcgen/code/src/java/pcgen/core/PObject.java
    Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
    Trunk/pcgen/code/src/java/pcgen/core/QualifiedObject.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/SpecialAbility.java
    Trunk/pcgen/code/src/java/pcgen/core/TextProperty.java
    Trunk/pcgen/code/src/java/pcgen/core/analysis/SkillLanguage.java
    Trunk/pcgen/code/src/java/pcgen/core/analysis/TemplateSelect.java
    Trunk/pcgen/code/src/java/pcgen/core/bonus/BonusObj.java
    Trunk/pcgen/code/src/java/pcgen/core/chooser/DomainChoiceManager.java
    Trunk/pcgen/code/src/java/pcgen/core/chooser/FeatAddChoiceManager.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitClass.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitDeity.java
    Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilityAbility.java
    Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilityEquipment.java
    Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilityFeat.java
    Trunk/pcgen/code/src/java/pcgen/core/npcgen/NPCGenerator.java
    Trunk/pcgen/code/src/java/pcgen/gui/EqBuilder.java
    Trunk/pcgen/code/src/java/pcgen/gui/KitSelector.java
    Trunk/pcgen/code/src/java/pcgen/gui/MainSource.java
    Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassLevelPanel.java
    Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java
    Trunk/pcgen/code/src/java/pcgen/gui/filter/FilterFactory.java
    Trunk/pcgen/code/src/java/pcgen/gui/filter/QualifyFilter.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoAbility.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoClasses.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoEquipping.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoRaces.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoResources.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSkills.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSpecialAbilities.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSummary.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/ability/AbilityInfoPanel.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/ability/AbilityModel.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/resources/AvailableFollowerModel.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoSpellsSubTab.java
    Trunk/pcgen/code/src/java/pcgen/gui/utils/PObjectNode.java
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/PCClassLoader.java
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/output/prereq/PrerequisiteWriter.java
    Trunk/pcgen/code/src/java/pcgen/rules/context/LoadContext.java
    Trunk/pcgen/code/src/java/plugin/exporttokens/TemplateToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/deity/DomainsToken.java
    Trunk/pcgen/code/src/test/pcgen/core/EquipmentModifierTest.java
    Trunk/pcgen/code/src/test/pcgen/persistence/lst/PObjectLoaderTest.java
    Trunk/pcgen/code/src/test/pcgen/persistence/lst/utils/FeatParserTest.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java
===================================================================

--- Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -444,7 +444,7 @@
 	}
 
 	@Override
-	public Object clone() throws CloneNotSupportedException
+	public CDOMObject clone() throws CloneNotSupportedException
 	{
 		CDOMObject clone = (CDOMObject) super.clone();
 		clone.integerChar = new HashMap<IntegerKey, Integer>(integerChar);

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/ConcretePrereqObject.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/base/ConcretePrereqObject.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/ConcretePrereqObject.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -23,7 +23,6 @@
  */
 package pcgen.cdom.base;
 
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -31,20 +30,18 @@
 import java.util.Set;
 
 import pcgen.base.util.ListSet;
-import pcgen.core.PObject;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.prereq.PrereqHandler;
 import pcgen.core.prereq.Prerequisite;
 import pcgen.core.prereq.PrerequisiteUtilities;
-import pcgen.persistence.PersistenceLayerException;
-import pcgen.persistence.lst.output.prereq.PrerequisiteWriter;
 
 /**
- * This class implements support for prerequisites for an object.
+ * A ConcretePrereqObject is an object that contains a list of Prerequisites.
+ * This list of Prerequisites is designed to serve as a list of conditions that
+ * must be met before the PrereqObject can be "used"
  * 
- * @author boomer70 <boo...@ya...>
- * 
- * @since 5.11.1
+ * ConcretePrereqObject is intended to provide a quick foundation class that
+ * implements PrereqObject.
  */
 public class ConcretePrereqObject implements Cloneable, PrereqObject
 {
@@ -54,11 +51,12 @@
 	/**
 	 * Tests if the specified PlayerCharacter passes all the prerequisites.
 	 * 
-	 * @param aPC The <tt>PlayerCharacter</tt> to test.
+	 * @param aPC
+	 *            The <tt>PlayerCharacter</tt> to test.
 	 * 
 	 * @return <tt>true</tt> if the PC passes all the prerequisites.
 	 */
-	public boolean qualifies( final PlayerCharacter aPC )
+	public boolean qualifies(final PlayerCharacter aPC)
 	{
 		if (thePrereqs == null)
 		{
@@ -69,23 +67,12 @@
 	}
 
 	/**
-	 * Get the list of <tt>Prerequesite</tt>s.
+	 * Returns a List of the Prerequisite objects contained in the PrereqObject.
+	 * If the PrereqObject contains no Prerequisites, the return value may be
+	 * null or an empty list, it is implementation-specific.
 	 * 
-	 * @return An unmodifiable <tt>List</tt> of <tt>Prerequesite</tt>s or <tt>
-	 * null</tt> if no prerequisites have been set.
+	 * @return A List of Prerequesite objects contained in the PrereqObject.
 	 */
-	public List<Prerequisite> getPreReqList()
-	{
-		return getPrerequisiteList();
-	}
-
-	/**
-	 * Get the list of <tt>Prerequesite</tt>s.
-	 * 
-	 * @return An unmodifiable <tt>List</tt> of <tt>Prerequesite</tt>s or
-	 *         <tt>
-	 * null</tt> if no prerequisites have been set.
-	 */
 	public List<Prerequisite> getPrerequisiteList()
 	{
 		if (thePrereqs == null)
@@ -97,23 +84,28 @@
 		 * 5.14 - to be changed once 5.14 code is gone and this can be changed
 		 * to return Collection or Set (or perhaps ListSet?)
 		 */
-		return Collections.unmodifiableList(new ArrayList<Prerequisite>(thePrereqs));
+		return Collections.unmodifiableList(new ArrayList<Prerequisite>(
+				thePrereqs));
 	}
 
 	/**
 	 * Add a <tt>Prerequesite</tt> to the prereq list with a level qualifier.
 	 * 
-	 * <p>If the Prerequisite kind is &quot;clear&quot; all the prerequisites
-	 * will be cleared from the list.
+	 * <p>
+	 * If the Prerequisite kind is &quot;clear&quot; all the prerequisites will
+	 * be cleared from the list.
 	 * 
-	 * @param preReq The <tt>Prerequisite</tt> to add.
-	 * @param levelQualifier A level qualifier.
+	 * @param preReq
+	 *            The <tt>Prerequisite</tt> to add.
+	 * @param levelQualifier
+	 *            A level qualifier.
 	 * 
 	 * @see pcgen.core.prereq.Prerequisite#setLevelQualifier(int)
 	 */
-	public final void addPreReq(final Prerequisite preReq, final int levelQualifier)
+	public final void addPreReq(final Prerequisite preReq,
+			final int levelQualifier)
 	{
-		if ( preReq == null )
+		if (preReq == null)
 		{
 			return;
 		}
@@ -136,14 +128,15 @@
 	}
 
 	/**
-	 * Returns true if this object has any prerequisites of the kind that
-	 * is passed in.
-	 *
-	 * @param matchType The kind of Prerequisite to test for.
+	 * Returns true if this object has any prerequisites of the kind that is
+	 * passed in.
 	 * 
-	 * @return <tt>true</tt> if this object has a prerequisite of the kind that
-	 * is passed in
+	 * @param matchType
+	 *            The kind of Prerequisite to test for.
 	 * 
+	 * @return <tt>true</tt> if this object has a prerequisite of the kind
+	 *         that is passed in
+	 * 
 	 * @see pcgen.core.prereq.Prerequisite#getKind()
 	 */
 	public final boolean hasPreReqTypeOf(final String matchType)
@@ -153,7 +146,7 @@
 			return false;
 		}
 
-		for (Prerequisite prereq : getPreReqList())
+		for (Prerequisite prereq : getPrerequisiteList())
 		{
 			if (PrerequisiteUtilities.hasPreReqKindOf(prereq, matchType))
 			{
@@ -165,75 +158,18 @@
 	}
 
 	/**
-	 * Returns the pre requesites as an HTML String
-	 * @param aPC
-	 * @return the pre requesites as an HTML String
-	 */
-	public final String preReqHTMLStrings(final PlayerCharacter aPC)
-	{
-		return PrerequisiteUtilities.preReqHTMLStringsForList(aPC, null, thePrereqs, true);
-	}
-
-	/**
-	 * Returns the pre requesites as an HTML String with a header
-	 * @param aPC
-	 * @param includeHeader
-	 * @return the pre requesites as an HTML String
-	 */
-	public String preReqHTMLStrings(final PlayerCharacter aPC, final boolean includeHeader)
-	{
-		return PrerequisiteUtilities.preReqHTMLStringsForList(aPC, null, thePrereqs, includeHeader);
-	}
-
-	/**
-	 * Returns the pre requesites as an HTML String given an object
-	 * @param aPC
-	 * @param p
-	 * @return the pre requesites as an HTML String given an object
-	 */
-	public final String preReqHTMLStrings(final PlayerCharacter aPC, final PObject p)
-	{
-		return PrerequisiteUtilities.preReqHTMLStringsForList(aPC, p, thePrereqs, true);
-	}
-
-	/**
-	 * Returns the prerequisites in &quot;PCC&quot; format.
+	 * Clones this ConcretePrereqObject. This is not a "deep" clone, in that the
+	 * List of Prerequisites is cloned (to allow Prerequisites to be
+	 * added/removed without altering the original or the clone), but the
+	 * Prerequisites contained within the ConcretePrereqObject are not cloned.
 	 * 
-	 * @return A string in &quot;PCC&quot; format or an empty string.
-	 */
-	public String getPCCText()
-	{
-		if ( thePrereqs == null )
-		{
-			return Constants.EMPTY_STRING;
-		}
-		
-		final StringWriter writer = new StringWriter();
-		for ( final Prerequisite prereq : thePrereqs )
-		{
-			final PrerequisiteWriter prereqWriter = new PrerequisiteWriter();
-			writer.write(Constants.PIPE);
-			try
-			{
-				prereqWriter.write(writer, prereq);
-			}
-			catch (PersistenceLayerException e)
-			{
-				e.printStackTrace();
-			}
-		}
-		return writer.toString();
-	}
-	
-	/**
 	 * @see java.lang.Object#clone()
 	 */
 	@Override
-	public Object clone()
-		throws CloneNotSupportedException
+	public ConcretePrereqObject clone() throws CloneNotSupportedException
 	{
-		final ConcretePrereqObject obj = (ConcretePrereqObject)super.clone();
-		if ( thePrereqs != null )
+		final ConcretePrereqObject obj = (ConcretePrereqObject) super.clone();
+		if (thePrereqs != null)
 		{
 			obj.thePrereqs = new ListSet<Prerequisite>();
 			obj.thePrereqs.addAll(thePrereqs);
@@ -242,9 +178,11 @@
 	}
 
 	/**
-	 * Adds a <tt>Collection</tt> of <tt>Prerequisite</tt> objects.
+	 * Adds a Collection of Prerequisite objects to the ConcretePrereqObject.
 	 * 
-	 * @param prereqs A <tt>Collection</tt> of <tt>Prerequisite</tt> objects.
+	 * @param prereqs
+	 *            A Collection of Prerequisite objects to added to the
+	 *            ConcretePrereqObject.
 	 */
 	public void addAllPrerequisites(final Collection<Prerequisite> prereqs)
 	{
@@ -263,44 +201,34 @@
 	}
 
 	/**
-	 * Adds an <tt>Array</tt> of <tt>Prerequisite</tt> objects.
+	 * Add a Prerequisite to the ConcretePrereqObject.
 	 * 
-	 * @param prereqs An <tt>Array</tt> of <tt>Prerequisite</tt> objects.
-	 */
-	public void addAllPrerequisites(Prerequisite... prereqs)
-	{
-		if (prereqs == null || prereqs.length == 0)
-		{
-			return;
-		}
-		if (thePrereqs == null)
-		{
-			thePrereqs = new ListSet<Prerequisite>(prereqs.length);
-		}
-		for (final Prerequisite pre : prereqs)
-		{
-			addPrerequisite(pre);
-		}
-	}
-
-	/**
-	 * Add a <tt>Prerequesite</tt> to the prereq list with a level qualifier.
+	 * If the Prerequisite kind is CLEAR all the prerequisites will be cleared
+	 * from the list.
 	 * 
-	 * <p>If the Prerequisite kind is &quot;clear&quot; all the prerequisites
-	 * will be cleared from the list.
-	 * 
-	 * @param preReq The <tt>Prerequisite</tt> to add.
+	 * @param prereq
+	 *            The Prerequisite to add to the ConcretePrereqObject.
 	 */
 	public void addPrerequisite(Prerequisite preReq)
 	{
 		this.addPreReq(preReq, -1);
 	}
 
+	/**
+	 * Remove All Prerequisites contained in the ConcretePrereqObject.
+	 */
 	public void clearPrerequisiteList()
 	{
 		thePrereqs = null;
 	}
 
+	/**
+	 * Returns the number of Prerequisites contained in the
+	 * ConcretePrereqObject.
+	 * 
+	 * @return the number of Prerequisites contained in the
+	 *         ConcretePrereqObject.
+	 */
 	public int getPrerequisiteCount()
 	{
 		if (thePrereqs == null)
@@ -310,16 +238,31 @@
 		return thePrereqs.size();
 	}
 
-	public Class<? extends PrereqObject> getReferenceClass()
-	{
-		return getClass();
-	}
-
+	/**
+	 * Returns true if this ConcretePrereqObject contains any Prerequisites;
+	 * false otherwise.
+	 * 
+	 * @return true if this ConcretePrereqObject contains any Prerequisites;
+	 *         false otherwise.
+	 */
 	public boolean hasPrerequisites()
 	{
 		return thePrereqs != null;
 	}
 
+	/**
+	 * Returns true if the given PrereqObject contains Prerequisites that are
+	 * equal to the Prerequisites contained within this ConcretePrereqObject. If
+	 * the number of Prerequisites does not match, or if the Prerequisites are
+	 * not equal, this will return false.
+	 * 
+	 * @param other
+	 *            The PrereqObject for which the Prerequisites will be compared
+	 *            to the Prerequisites in this ConcretePrereqObject.
+	 * @return true if the given PrereqObject contains Prerequisites that are
+	 *         equal to the Prerequisites contained within this
+	 *         ConcretePrereqObject; false otherwise
+	 */
 	public boolean equalsPrereqObject(PrereqObject other)
 	{
 		if (this == other)

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/PrereqObject.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/base/PrereqObject.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/PrereqObject.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -1,5 +1,6 @@
 /*
  * PrereqObject.java Copyright 2006 Aaron Divinsky <boo...@ya...>
+ *   Copyright 2008 Tom Parker <th...@us...>
  * 
  * 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
@@ -27,67 +28,60 @@
 import pcgen.core.prereq.Prerequisite;
 
 /**
- * This class implements support for prerequisites for an object.
- * 
- * @author boomer70 <boo...@ya...>
- * 
- * @since 5.11.1
+ * A PrereqObject is an object that contains a list of Prerequisites. This list
+ * of Prerequisites is designed to serve as a list of conditions that must be
+ * met before the PrereqObject can be "used"
  */
 public interface PrereqObject
 {
-	
+
 	/**
-	 * Add a <tt>Prerequesite</tt> to the prereq list with a level qualifier.
+	 * Add a Prerequisite to the PrereqObject.
 	 * 
-	 * <p>If the Prerequisite kind is &quot;clear&quot; all the prerequisites
-	 * will be cleared from the list.
+	 * If the Prerequisite kind is CLEAR all the prerequisites will be cleared
+	 * from the list.
 	 * 
-	 * @param preReq The <tt>Prerequisite</tt> to add.
+	 * @param prereq
+	 *            The Prerequisite to add to the PrereqObject.
 	 */
-	public void addPrerequisite(Prerequisite preReq);
+	public void addPrerequisite(Prerequisite prereq);
 
 	/**
-	 * Adds an <tt>Array</tt> of <tt>Prerequisite</tt> objects.
+	 * Adds a Collection of Prerequisite objects to the PrereqObject.
 	 * 
-	 * @param prereqs An <tt>Array</tt> of <tt>Prerequisite</tt> objects.
+	 * @param prereqs
+	 *            A Collection of Prerequisite objects to added to the
+	 *            PrereqObject.
 	 */
-	public void addAllPrerequisites(Prerequisite... prereqs);
+	public void addAllPrerequisites(Collection<Prerequisite> prereqs);
 
 	/**
-	 * Adds a <tt>Collection</tt> of <tt>Prerequisite</tt> objects.
+	 * Returns true if this PrereqObject contains any Prerequisites; false
+	 * otherwise.
 	 * 
-	 * @param prereqs A <tt>Collection</tt> of <tt>Prerequisite</tt> objects.
+	 * @return true if this PrereqObject contains any Prerequisites; false
+	 *         otherwise.
 	 */
-	public void addAllPrerequisites(Collection<Prerequisite> prereqs);
-	
+	public boolean hasPrerequisites();
+
 	/**
-	 * Get the list of <tt>Prerequesite</tt>s.
+	 * Returns a List of the Prerequisite objects contained in the PrereqObject.
+	 * If the PrereqObject contains no Prerequisites, the return value may be
+	 * null or an empty list, it is implementation-specific.
 	 * 
-	 * @return An unmodifiable <tt>List</tt> of <tt>Prerequesite</tt>s or
-	 *         <tt>
-	 * null</tt> if no prerequisites have been set.
+	 * @return A List of Prerequesite objects contained in the PrereqObject.
 	 */
 	public List<Prerequisite> getPrerequisiteList();
 
 	/**
-	 * Clear the prerequisite list.
+	 * Remove All Prerequisites contained in the PrereqObject.
 	 */
 	public void clearPrerequisiteList();
 
 	/**
-	 * Tests to see if this object has any prerequisites associated with it.
+	 * Returns the number of Prerequisites contained in the PrereqObject.
 	 * 
-	 * @return <tt>true</tt> if it has prereqs
+	 * @return the number of Prerequisites contained in the PrereqObject.
 	 */
-	public boolean hasPrerequisites();
-
-	/**
-	 * Gets the number of prerequisites currently associated.
-	 * 
-	 * @return the number of prerequesites
-	 */
 	public int getPrerequisiteCount();
-
-	public Class<? extends PrereqObject> getReferenceClass();
-	
 }

Modified: Trunk/pcgen/code/src/java/pcgen/core/Ability.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Ability.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/core/Ability.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -355,7 +355,7 @@
 
 	boolean canBeSelectedBy(final PlayerCharacter pc)
 	{
-		return PrereqHandler.passesAll(getPreReqList(), pc, this);
+		return PrereqHandler.passesAll(getPrerequisiteList(), pc, this);
 	}
 
 	/**

Modified: Trunk/pcgen/code/src/java/pcgen/core/DamageReduction.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/DamageReduction.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/core/DamageReduction.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -689,7 +689,7 @@
 		//Have to do deep clone of Prereqs to match previous behavior :/
 		if (hasPrerequisites()) {
 			clone.clearPrerequisiteList();
-			for (Prerequisite prereq : getPreReqList())
+			for (Prerequisite prereq : getPrerequisiteList())
 			{
 				clone.addPrerequisite(prereq.clone());
 			}
@@ -711,7 +711,7 @@
 		result.append(theBypass);
 
 		final StringWriter writer = new StringWriter();
-		for (Prerequisite prereq : getPreReqList())
+		for (Prerequisite prereq : getPrerequisiteList())
 		{
 			if (!includeLevel && "class".equals(prereq.getKind()))
 			{
@@ -742,7 +742,7 @@
 	 */
 	public boolean isForClassLevel(String keyName)
 	{
-		for (Prerequisite prereq : getPreReqList())
+		for (Prerequisite prereq : getPrerequisiteList())
 		{
 			if (DamageReduction.isPrereqForClassLevel(prereq, keyName))
 			{

Modified: Trunk/pcgen/code/src/java/pcgen/core/Description.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Description.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/core/Description.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -27,6 +27,8 @@
 
 import pcgen.cdom.base.ConcretePrereqObject;
 import pcgen.cdom.base.Constants;
+import pcgen.persistence.PersistenceLayerException;
+import pcgen.persistence.lst.output.prereq.PrerequisiteWriter;
 import pcgen.util.Logging;
 
 /**
@@ -265,7 +267,6 @@
 	 * 
 	 * @see pcgen.cdom.base.PrereqObject#getPCCText()
 	 */
-	@Override
 	public String getPCCText()
 	{
 		final StringBuffer buf = new StringBuffer();
@@ -291,7 +292,20 @@
 			}
 		}
 		
-		buf.append(super.getPCCText());
+		PrerequisiteWriter prereqWriter = new PrerequisiteWriter();
+		try
+		{
+			String prerequisiteString = prereqWriter
+					.getPrerequisiteString(getPrerequisiteList());
+			if (prerequisiteString != null)
+			{
+				buf.append(prerequisiteString);
+			}
+		}
+		catch (PersistenceLayerException e)
+		{
+			Logging.errorPrint("Error writing Prerequisite: " + e);
+		}
 		return buf.toString();
 	}
 	

Modified: Trunk/pcgen/code/src/java/pcgen/core/Domain.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Domain.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/core/Domain.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -127,7 +127,7 @@
 
 					final String book = pcSpell.getSpellbook();
 
-					if (PrereqHandler.passesAll(pcSpell.getPreReqList(), aPC, this))
+					if (PrereqHandler.passesAll(pcSpell.getPrerequisiteList(), aPC, this))
 					{
 						final List<CharacterSpell> aList = aClass.getSpellSupport()
 							.getCharacterSpell(aSpell, book, -1);

Modified: Trunk/pcgen/code/src/java/pcgen/core/Equipment.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/core/Equipment.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -3086,7 +3086,7 @@
 	 * @return Description of the Return Value
 	 */
 	public boolean meetsPreReqs(PlayerCharacter currentPC) {
-		return PrereqHandler.passesAll(this.getPreReqList(), this, currentPC);
+		return PrereqHandler.passesAll(getPrerequisiteList(), this, currentPC);
 	}
 
 	/**
@@ -3383,7 +3383,7 @@
 			//
 			if (hasPrerequisites())
 			{
-				for (Prerequisite aBonus : getPreReqList()) {
+				for (Prerequisite aBonus : getPrerequisiteList()) {
 					if ("SIZE".equalsIgnoreCase(aBonus.getKind())) {
 						final int iOldPre = Globals.sizeInt(aBonus.getOperand());
 						iNewSize += (iOldPre - iOldSize);

Modified: Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -128,7 +128,7 @@
 					if (aBonus.hasPrerequisites())
 					{
 						newBonus.clearPrerequisiteList();
-						for (Prerequisite prereq : aBonus.getPreReqList())
+						for (Prerequisite prereq : aBonus.getPrerequisiteList())
 						{
 							try
 							{
@@ -872,7 +872,7 @@
 				return true;
 			}
 
-			for (Prerequisite preReq : getPreReqList())
+			for (Prerequisite preReq : getPrerequisiteList())
 			{
 				if (
 					"TYPE".equalsIgnoreCase(preReq.getKind()) &&

Modified: Trunk/pcgen/code/src/java/pcgen/core/FollowerOption.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/FollowerOption.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/core/FollowerOption.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -131,7 +131,7 @@
 			{
 				final FollowerOption opt = new FollowerOption( r );
 				opt.setAdjustment( getAdjustment() );
-				opt.addAllPrerequisites(getPreReqList());
+				opt.addAllPrerequisites(getPrerequisiteList());
 				options.add( opt );
 			}
 		}

Modified: Trunk/pcgen/code/src/java/pcgen/core/Kit.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Kit.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/core/Kit.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -299,7 +299,7 @@
 	{
 		if (kitVisible == VISIBLE_QUALIFIED)
 		{
-			final List<Prerequisite> prereqList = getPreReqList();
+			final List<Prerequisite> prereqList = getPrerequisiteList();
 
 			if (PrereqHandler.passesAll(prereqList, aPC, this))
 			{
@@ -431,7 +431,7 @@
 
 	private String getPreReqHTMLStrings(PlayerCharacter aPC)
 	{
-		return PrerequisiteUtilities.preReqHTMLStringsForList(aPC, this, getPreReqList(), false);
+		return PrerequisiteUtilities.preReqHTMLStringsForList(aPC, this, getPrerequisiteList(), false);
 	}
 
 	/**

Modified: Trunk/pcgen/code/src/java/pcgen/core/KitUtilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/KitUtilities.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/core/KitUtilities.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -99,7 +99,7 @@
 				Logging.errorPrint("Nonexistant kit: " + kitKey);
 				return;
 			}
-			if (PrereqHandler.passesAll(aKit.getPreReqList(), aPC, aKit))
+			if (PrereqHandler.passesAll(aKit.getPrerequisiteList(), aPC, aKit))
 			{
 				aList.add(aKit);
 			}

Modified: Trunk/pcgen/code/src/java/pcgen/core/PCClass.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PCClass.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/core/PCClass.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -542,7 +542,7 @@
 							new ArrayList<Prerequisite>();
 					if (bonus.hasPrerequisites())
 					{
-						localPreReqList.addAll(bonus.getPreReqList());
+						localPreReqList.addAll(bonus.getPrerequisiteList());
 					}
 
 					// TODO: This code should be removed after the 5.8 release
@@ -2243,7 +2243,7 @@
 			return false;
 		}
 
-		if (!PrereqHandler.passesAll(getPreReqList(), aPC, this))
+		if (!PrereqHandler.passesAll(getPrerequisiteList(), aPC, this))
 		{
 			return false;
 		}
@@ -2440,7 +2440,7 @@
 		// Output the level based DR only
 		for (DamageReduction reduction : getDRList())
 		{
-			for (Prerequisite prereq : reduction.getPreReqList())
+			for (Prerequisite prereq : reduction.getPrerequisiteList())
 			{
 				if (DamageReduction.isPrereqForClassLevel(prereq, getKeyName()))
 				{
@@ -3743,7 +3743,7 @@
 	 */
 	public boolean isProhibited(final Spell aSpell, final PlayerCharacter aPC)
 	{
-		if (!PrereqHandler.passesAll(aSpell.getPreReqList(), aPC, aSpell))
+		if (!PrereqHandler.passesAll(aSpell.getPrerequisiteList(), aPC, aSpell))
 		{
 			return true;
 		}
@@ -3946,7 +3946,7 @@
 			// When loading a character, classes are added before feats, so
 			// this test would always fail on loading if feats are required
 			boolean doReturn = false;
-			if (!PrereqHandler.passesAll(getPreReqList(), aPC, this))
+			if (!PrereqHandler.passesAll(getPrerequisiteList(), aPC, this))
 			{
 				doReturn = true;
 				if (!bSilent)
@@ -4465,7 +4465,7 @@
 		//
 		for (DamageReduction reduction : getDRList())
 		{
-			for (Prerequisite prereq : reduction.getPreReqList())
+			for (Prerequisite prereq : reduction.getPrerequisiteList())
 			{
 				if (DamageReduction.isPrereqForClassLevel(prereq, oldClass))
 				{
@@ -5131,7 +5131,7 @@
 
 		for (SubstitutionClass sc : substitutionClassList)
 		{
-			if (!PrereqHandler.passesAll(sc.getPreReqList(), aPC, this))
+			if (!PrereqHandler.passesAll(sc.getPrerequisiteList(), aPC, this))
 			{
 				continue;
 			}
@@ -5249,7 +5249,7 @@
 			 * 
 			 * STOP THE MAGIC, I want to delete MULTIPREREQs
 			 */
-			if (!PrereqHandler.passesAll(sc.getPreReqList(), aPC, this))
+			if (!PrereqHandler.passesAll(sc.getPrerequisiteList(), aPC, this))
 			{
 				continue;
 			}
@@ -5378,7 +5378,7 @@
 				 * 
 				 * STOP THE MAGIC, I want to delete MULTIPREREQs
 				 */
-				if (!PrereqHandler.passesAll(sub.getPreReqList(), aPC, this))
+				if (!PrereqHandler.passesAll(sub.getPrerequisiteList(), aPC, this))
 				{
 					continue;
 				}
@@ -6089,7 +6089,7 @@
 		List<DamageReduction> newDR = new ArrayList<DamageReduction>();
 		for (DamageReduction reduction : getDRList())
 		{
-			for (Prerequisite prereq : reduction.getPreReqList())
+			for (Prerequisite prereq : reduction.getPrerequisiteList())
 			{
 				if (!DamageReduction.isPrereqForClassLevel(prereq, getKeyName())
 					&& !prereq.getOperand().equals(Integer.toString(level))

Modified: Trunk/pcgen/code/src/java/pcgen/core/PCSpell.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PCSpell.java	2008-06-16 02:51:10 UTC (rev 6672)
+++ Trunk/pcgen/code/src/java/pcgen/core/PCSpell.java	2008-06-16 03:05:01 UTC (rev 6673)
@@ -53,7 +53,7 @@
 			sBuff.append(dcFormula);
 		}
 
-		final List<Prerequisite> ...
 
[truncated message content]

Thread: [pcgen-commit-svn] SF.net SVN: pcgen: [6673] Trunk/pcgen/code/src (Page 6)

RPG character generator for RPG d20 systems.

pcgen-commit-svn