Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen: [6403] Trunk/pcgen/code/src/java
|
From: <th...@us...> - 2008-05-31 03:00:16
|
Revision: 6403
http://pcgen.svn.sourceforge.net/pcgen/?rev=6403&view=rev
Author: thpr
Date: 2008-05-30 20:00:12 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Refactoring
Modified Paths:
--------------
Trunk/pcgen/code/src/java/pcgen/core/Deity.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/Globals.java
Trunk/pcgen/code/src/java/pcgen/core/Language.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/Race.java
Trunk/pcgen/code/src/java/pcgen/core/WeaponProf.java
Trunk/pcgen/code/src/java/pcgen/core/chooser/DomainChoiceManager.java
Trunk/pcgen/code/src/java/pcgen/core/kit/KitDeity.java
Trunk/pcgen/code/src/java/pcgen/core/npcgen/NPCGenerator.java
Trunk/pcgen/code/src/java/pcgen/gui/filter/QualifyFilter.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java
Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/HasspellformulaToken.java
Modified: Trunk/pcgen/code/src/java/pcgen/core/Deity.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Deity.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/Deity.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -25,24 +25,19 @@
package pcgen.core;
import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import pcgen.base.lang.StringUtil;
import pcgen.cdom.base.CDOMReference;
import pcgen.cdom.base.Constants;
-import pcgen.cdom.enumeration.ListKey;
import pcgen.cdom.enumeration.ObjectKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.cdom.list.DomainList;
import pcgen.cdom.reference.CDOMDirectSingleRef;
-import pcgen.core.prereq.PrereqHandler;
import pcgen.core.utils.MessageType;
import pcgen.core.utils.ShowMessageDelegate;
/**
* <code>Deity</code>.
- *
+ *
* @author Bryan McRoberts <mer...@us...>
* @version $Revision$
*/
@@ -52,36 +47,8 @@
.getRef(new DomainList());
/**
- * Check whether this deity can be selected by a character with the
- * given classes, alignment, race and gender.
- *
- * @param classList a list of PCClass objects.
- * @param anAlignment 0 through 8 inclusive
- * @param pc
- * @return <code>true</code> means the deity can be a selected by a
- * character with the given properties; <code>false</code> means the
- * character cannot.
- */
- public boolean canBeSelectedBy(final List<PCClass> classList, final int anAlignment, final PlayerCharacter pc)
- {
- boolean result;
-
- try
- {
- result = acceptableClass(classList.iterator())
- && PrereqHandler.passesAll( getPreReqList(), pc, this);
- }
- catch (NumberFormatException nfe)
- {
- result = false;
- }
-
- return result;
- }
-
- /**
* Clones a Deity object
- *
+ *
* @return A clone of the Deity object.
*/
@Override
@@ -93,7 +60,8 @@
}
catch (CloneNotSupportedException exc)
{
- ShowMessageDelegate.showMessageDialog(exc.getMessage(), Constants.s_APPNAME, MessageType.ERROR);
+ ShowMessageDelegate.showMessageDialog(exc.getMessage(),
+ Constants.s_APPNAME, MessageType.ERROR);
return null;
}
}
@@ -117,24 +85,6 @@
}
/**
- * This method gets the text used in outputting source files (.pcc files)
- * Made public on 10 Dec 2002 by sage_sam to match PObject method
- * @return String containing properly formatted pcc text for this deity.
- */
- @Override
- public String getPCCText()
- {
- final StringBuffer txt = new StringBuffer(200);
- txt.append(getDisplayName());
- txt.append("\t");
- txt.append(StringUtil.joinToStringBuffer(Globals.getContext().unparse(
- this), "\t"));
- txt.append("\t");
- txt.append(super.getPCCText(false));
- return txt.toString();
- }
-
- /**
* @param aDomain
* @return true if the deity has the passed-in domain
*/
@@ -158,38 +108,4 @@
}
return false;
}
-
- /**
- * This method determines whether any of the classes that a character
- * has is acceptable to this deity.
- * @param classList Iterator pointing to the Collection of classes the
- * character has
- * @return boolean
- */
- private boolean acceptableClass(final Iterator<PCClass> classList)
- {
- boolean flag = (!classList.hasNext());
-
- while (classList.hasNext() && !flag)
- {
- final PCClass aClass = classList.next();
- List<CDOMReference<Deity>> deityList = aClass.getListFor(ListKey.DEITY);
- if (deityList == null)
- {
- flag = true;
- }
- else
- {
- for ( CDOMReference<Deity> deity : deityList )
- {
- if (deity.contains(this))
- {
- flag = true;
- }
- }
- }
- }
-
- return flag;
- }
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/Domain.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Domain.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/Domain.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -255,16 +255,6 @@
}
/**
- * Returns TRUE if PC qualifies for a domain
- * @param pc
- * @return TRUE if PC qualifies for a domain
- */
- public boolean qualifiesForDomain(final PlayerCharacter pc)
- {
- return PrereqHandler.passesAll(this.getPreReqList(), pc, this);
- }
-
- /**
* Get an iterator for the AbilityInfo objects that hold represent
* the Feats granted by this domain
*
Modified: Trunk/pcgen/code/src/java/pcgen/core/Equipment.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -1138,6 +1138,10 @@
* @return item name based off the modifiers
*/
public String getItemNameFromModifiers() {
+ if (baseItem.length() == 0) {
+ return getName();
+ }
+
final List<EquipmentModifier> modList = new ArrayList<EquipmentModifier>(
eqModifierList);
final List<EquipmentModifier> altModList = new ArrayList<EquipmentModifier>(
@@ -1150,44 +1154,21 @@
final List<EquipmentModifier> altModListByFC[] = initSplitModList();
final List<EquipmentModifier> commonListByFC[] = initSplitModList();
+ final Equipment baseEquipment = EquipmentList
+ .getEquipmentKeyed(baseItem);
//
// Remove any modifiers on the base item so they don't confuse the
// naming
//
- if (baseItem.length() == 0) {
- return getName();
- }
-
- final Equipment baseEquipment = EquipmentList
- .getEquipmentKeyed(baseItem);
-
if (baseEquipment != null) {
- for (EquipmentModifier eqMod : baseEquipment
- .getEqModifierList(true)) {
- final int idx = modList.indexOf(eqMod);
-
- if (idx >= 0) {
- modList.remove(idx);
- }
- }
-
- for (EquipmentModifier eqMod : baseEquipment
- .getEqModifierList(false)) {
- final int idx = altModList.indexOf(eqMod);
-
- if (idx >= 0) {
- altModList.remove(idx);
- }
- }
+ modList.removeAll(baseEquipment.getEqModifierList(true));
+ altModList.removeAll(baseEquipment.getEqModifierList(false));
}
-
- for (int i = modList.size() - 1; i >= 0; --i) {
- final EquipmentModifier eqMod = modList.get(i);
-
+ for (Iterator<EquipmentModifier> it = modList.iterator(); it.hasNext();)
+ {
+ EquipmentModifier eqMod = it.next();
if (eqMod.getVisibility().equals(Visibility.HIDDEN)) {
- modList.remove(i);
-
- continue;
+ it.remove();
}
}
@@ -1779,24 +1760,6 @@
}
/**
- * Set proficiency name
- *
- * @param aString
- */
- public void setProfName(final String aString) {
- profName = aString;
- }
-
- /**
- * Get proficiency name
- *
- * @return proficiency name
- */
- public String getProfName() {
- return profName;
- }
-
- /**
* Sets the qty attribute of the Equipment object
*
* @param aString
@@ -2842,7 +2805,6 @@
// eq.setTypeString(super.getType());
// none of the types associated with modifiers
- eq.profName = profName;
eq.carried = carried;
eq.equipped = equipped;
eq.location = location;
@@ -3324,7 +3286,7 @@
}
Logging
.debugPrint("Could not find weapon proficiency with key '"
- + profName + "'.");
+ + getExpandedWeaponProf(aPC) + "'.");
}
String prof = rawProfName();
if (prof == null || prof.length() == 0) {
@@ -3336,7 +3298,7 @@
} catch (RuntimeException e) {
Logging.errorPrint("Problem with: " + this.getDisplayName(), e);
}
- return profName;
+ return "";
}
/**
@@ -3803,7 +3765,7 @@
{
return shieldProf;
}
- return profName;
+ return "";
}
boolean save(final BufferedWriter output) {
@@ -3892,13 +3854,6 @@
{
shieldProf = eq.shieldProf;
}
- else
- {
- profName = eq.profName;
- if (profName == null || profName.length() == 0) {
- profName = eq.getName();
- }
- }
}
}
@@ -5358,9 +5313,7 @@
return true;
}
- final WieldCategory wCat = getEffectiveWieldCategory(aPC);
-
- return (wCat.isFinessable());
+ return getEffectiveWieldCategory(aPC).isFinessable();
}
/**
@@ -5375,9 +5328,7 @@
return false;
}
- final WieldCategory wCat = getEffectiveWieldCategory(pc);
-
- return (wCat.getName().equals("Light"));
+ return WieldCategory.findByName("Light").equals(getEffectiveWieldCategory(pc));
}
/**
@@ -5392,9 +5343,7 @@
return false;
}
- final WieldCategory wCat = getEffectiveWieldCategory(pc);
-
- return wCat.getHands() == 1;
+ return getEffectiveWieldCategory(pc).getHands() == 1;
}
/**
@@ -5427,9 +5376,7 @@
return false;
}
- final WieldCategory wCat = getEffectiveWieldCategory(pc);
-
- return (wCat.getHands() > 2);
+ return getEffectiveWieldCategory(pc).getHands() > 2;
}
/**
@@ -5444,9 +5391,7 @@
return false;
}
- final WieldCategory wCat = getEffectiveWieldCategory(pc);
-
- return wCat.getHands() == 2;
+ return getEffectiveWieldCategory(pc).getHands() == 2;
}
/**
@@ -5534,44 +5479,12 @@
* @return The WeaponProf required to use the weapon.
*/
public WeaponProf getExpandedWeaponProf(final PlayerCharacter aPC) {
- String aWProf;
- if (weaponProf != null)
- {
- aWProf = weaponProf;
- }
- else
- {
- aWProf = profName;
- }
+ String aWProf = weaponProf;
- if (aWProf.length() == 0) {
+ if (aWProf == null || aWProf.length() == 0) {
aWProf = getName();
}
- final int iOffs = aWProf.indexOf("[Hands]");
-
- if (iOffs >= 0) {
- // "Sword (Bastard/[Hands])"
- // expands to:
- // "Sword (Bastard/Exotic)"
- // or
- // "Sword (Bastard/Martial)"
- //
- final String sExotic = aWProf.substring(0, iOffs) + "Exotic"
- + aWProf.substring(iOffs + 7);
- final String sMartial = aWProf.substring(0, iOffs) + "Martial"
- + aWProf.substring(iOffs + 7);
-
- final WeaponProf wpExotic = Globals.getWeaponProfKeyed(sExotic);
- final WeaponProf wpMartial = Globals.getWeaponProfKeyed(sMartial);
-
- if (wpMartial != null && wpExotic != null) {
- if (aPC.hasWeaponProfKeyed(sExotic)) {
- return wpExotic;
- }
- return wpMartial;
- }
- }
return Globals.getWeaponProfKeyed(aWProf);
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/Globals.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -1448,11 +1448,6 @@
*/
public static Language getLanguageKeyed(final String aKey)
{
- // TODO - Fix this.
- if (aKey.equalsIgnoreCase("ALL") || aKey.equalsIgnoreCase("ANY"))
- {
- return Language.getAllLanguage();
- }
for (Language aLang : getLanguageList())
{
if (aLang.getKeyName().equalsIgnoreCase(aKey))
Modified: Trunk/pcgen/code/src/java/pcgen/core/Language.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Language.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/Language.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -41,49 +41,7 @@
public static final CDOMReference<LanguageList> STARTING_LIST = new CDOMDirectSingleRef<LanguageList>(
new LanguageList());
- /** Does this language indicate access to all languages. */
- private boolean isAllLang = false;
-
- /** The language instance representing access to all bonus languages.
- * We keep this outside of the global language list so that it does
- * not appear as a real language. */
- private static Language allLanguage;
-
/**
- * Default constructor.
- */
- public Language()
- {
- super();
- }
-
- /**
- * Constructor for use when creating the ALL placehoder language.
- *
- * @param isAllLang Is this the access to all languages placeholder.
- */
- public Language(boolean isAllLang)
- {
- super();
- this.isAllLang = isAllLang;
- }
-
- /**
- * Retrieve the language instance representing access to all bonus languages.
- * @return Returns the allLanguage.
- */
- public static final synchronized Language getAllLanguage()
- {
- if (allLanguage == null)
- {
- allLanguage = new Language(true);
- allLanguage.setName("ALL");
- allLanguage.setKeyName("ALL");
- }
- return allLanguage;
- }
-
- /**
* Compares keyName only
* @param o1
* @return int
@@ -134,14 +92,6 @@
}
/**
- * @return Returns the isAllLang.
- */
- public final boolean isAllLang()
- {
- return isAllLang;
- }
-
- /**
* Hashcode of the keyName
* @return hash code
*/
Modified: Trunk/pcgen/code/src/java/pcgen/core/PObject.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PObject.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/PObject.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -2809,7 +2809,13 @@
*/
public String getPCCText()
{
- return getPCCText(true);
+ final StringBuffer txt = new StringBuffer(200);
+ txt.append(getDisplayName());
+ txt.append("\t");
+ txt.append(StringUtil.joinToStringBuffer(Globals.getContext().unparse(
+ this), "\t"));
+ txt.append(getPCCText(false));
+ return txt.toString();
}
/**
Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -9098,14 +9098,51 @@
return false;
}
+ /**
+ * Check whether a deity can be selected by this character
+ *
+ * @return <code>true</code> means the deity can be a selected by a
+ * character with the given properties; <code>false</code> means
+ * the character cannot.
+ */
public boolean canSelectDeity(final Deity aDeity)
{
if (aDeity == null)
{
return false;
}
+ boolean result;
+ if (classList.isEmpty())
+ {
+ result = true;
+ }
+ else
+ {
+ result = false;
+ CLASS: for (PCClass aClass : classList)
+ {
+ List<CDOMReference<Deity>> deityList = aClass
+ .getListFor(ListKey.DEITY);
+ if (deityList == null)
+ {
+ result = true;
+ break;
+ }
+ else
+ {
+ for (CDOMReference<Deity> deity : deityList)
+ {
+ if (deity.contains(aDeity))
+ {
+ result = true;
+ break CLASS;
+ }
+ }
+ }
+ }
+ }
- return aDeity.canBeSelectedBy(classList, alignment, this);
+ return result && PrereqHandler.passesAll(aDeity.getPreReqList(), this, aDeity);
}
public int classAC()
@@ -11410,16 +11447,6 @@
setDirty(true);
}
- void addFreeLanguageKeyed(final String aKey)
- {
- final Language aLang = Globals.getLanguageKeyed(aKey);
-
- if (aLang != null)
- {
- addFreeLanguage(aLang);
- }
- }
-
boolean removeFavoredClass(final String aString)
{
StringTokenizer tok = new StringTokenizer(aString, Constants.PIPE);
@@ -14979,23 +15006,6 @@
{
addStartingLanguages(pcClass, languageList);
}
-
- // Scan for the ALL language and if found replace it with all languages
- boolean addAll = false;
- for (Iterator<Language> iter = languageList.iterator(); iter.hasNext();)
- {
- final Language lang = iter.next();
- if (lang.isAllLang())
- {
- iter.remove();
- addAll = true;
- }
- }
- if (addAll)
- {
- languageList.addAll(Globals.getLanguageList());
- }
-
return languageList;
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/Race.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Race.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/Race.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -29,8 +29,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.math.Fraction;
-
import pcgen.base.lang.StringUtil;
import pcgen.cdom.base.AssociatedPrereqObject;
import pcgen.cdom.base.CDOMReference;
Modified: Trunk/pcgen/code/src/java/pcgen/core/WeaponProf.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/WeaponProf.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/WeaponProf.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -20,7 +20,6 @@
*/
package pcgen.core;
-import pcgen.base.lang.StringUtil;
import pcgen.cdom.base.CDOMReference;
import pcgen.cdom.enumeration.IntegerKey;
import pcgen.cdom.list.WeaponProfList;
@@ -81,17 +80,4 @@
Integer hands = get(IntegerKey.HANDS);
return hands == null ? 1 : hands;
}
-
- @Override
- public String getPCCText()
- {
- final StringBuffer txt = new StringBuffer(200);
- txt.append(getDisplayName());
- txt.append("\t");
- txt.append(StringUtil.joinToStringBuffer(Globals.getContext().unparse(
- this), "\t"));
- txt.append("\t");
- txt.append(super.getPCCText(false));
- return txt.toString();
- }
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/DomainChoiceManager.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/chooser/DomainChoiceManager.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/chooser/DomainChoiceManager.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -33,6 +33,7 @@
import pcgen.core.Globals;
import pcgen.core.PObject;
import pcgen.core.PlayerCharacter;
+import pcgen.core.prereq.PrereqHandler;
/**
* This is the chooser that deals with choosing a domain.
@@ -85,7 +86,7 @@
// but does not have.
for ( Domain domain : Globals.getDomainList() )
{
- if (domain.qualifiesForDomain(aPc))
+ if (PrereqHandler.passesAll(domain.getPreReqList(), aPc, domain))
{
boolean found = false;
for ( CharacterDomain cd : aPc.getCharacterDomainList())
Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitDeity.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitDeity.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitDeity.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -23,6 +23,7 @@
package pcgen.core.kit;
import pcgen.core.*;
+import pcgen.core.prereq.PrereqHandler;
import pcgen.gui.CharacterInfo;
import pcgen.gui.PCGen_Frame1;
@@ -238,7 +239,7 @@
Domain domain = Globals.getDomainKeyed(domainKey);
if (domain != null)
{
- if (!domain.qualifiesForDomain(aPC))
+ if (!PrereqHandler.passesAll(domain.getPreReqList(), aPC, domain))
{
warnings.add("DEITY: Not qualified for domain \"" +
domain.getDisplayName() + "\"");
Modified: Trunk/pcgen/code/src/java/pcgen/core/npcgen/NPCGenerator.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/npcgen/NPCGenerator.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/core/npcgen/NPCGenerator.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -422,7 +422,7 @@
for (Iterator<Domain> iterator = domains.iterator(); iterator.hasNext();)
{
Domain domain = (Domain) iterator.next();
- if (! domain.qualifiesForDomain(aPC))
+ if (! PrereqHandler.passesAll(domain.getPreReqList(), aPC, domain))
{
iterator.remove();
}
Modified: Trunk/pcgen/code/src/java/pcgen/gui/filter/QualifyFilter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/filter/QualifyFilter.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/gui/filter/QualifyFilter.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -56,7 +56,8 @@
}
else if (pObject instanceof Domain)
{
- return ((Domain) pObject).qualifiesForDomain(aPC);
+ Domain r = ((Domain) pObject);
+ return PrereqHandler.passesAll(r.getPreReqList(), aPC, r);
}
else if (pObject instanceof Equipment)
{
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -103,6 +103,7 @@
import pcgen.core.QualifiedObject;
import pcgen.core.SettingsHandler;
import pcgen.core.WeaponProf;
+import pcgen.core.prereq.PrereqHandler;
import pcgen.core.prereq.Prerequisite;
import pcgen.core.prereq.PrerequisiteUtilities;
import pcgen.core.utils.MessageType;
@@ -1355,7 +1356,8 @@
}
// Make sure a valid domain was selected
- if (!addedDomain.qualifiesForDomain(pc) || !qualDomain.qualifies(pc))
+ if (!PrereqHandler.passesAll(addedDomain.getPreReqList(), pc, addedDomain)
+ || !qualDomain.qualifies(pc))
{
ShowMessageDelegate.showMessageDialog(PropertyFactory
.getFormattedString("in_qualifyMess",
@@ -2300,7 +2302,7 @@
.append(aDomain.piSubString()).append(
"*</b></html>");
}
- else if (!aDomain.qualifiesForDomain(pc)
+ else if (!PrereqHandler.passesAll(aDomain.getPreReqList(), pc, aDomain)
|| !aQualDomain.qualifies(pc))
{
retVal.append("<html>").append(
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/HasspellformulaToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/HasspellformulaToken.java 2008-05-30 23:57:19 UTC (rev 6402)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/HasspellformulaToken.java 2008-05-31 03:00:12 UTC (rev 6403)
@@ -1,13 +1,15 @@
package plugin.lsttokens.deprecated;
import pcgen.core.PCClass;
-import pcgen.persistence.lst.PCClassLstToken;
+import pcgen.persistence.PersistenceLayerException;
+import pcgen.rules.context.LoadContext;
+import pcgen.rules.persistence.token.CDOMPrimaryToken;
import pcgen.util.Logging;
/**
* Class deals with HASSPELLFORMULA Token
*/
-public class HasspellformulaToken implements PCClassLstToken
+public class HasspellformulaToken implements CDOMPrimaryToken<PCClass>
{
public String getTokenName()
@@ -15,8 +17,19 @@
return "HASSPELLFORMULA";
}
- public boolean parse(PCClass pcclass, String value, int level)
+ public String[] unparse(LoadContext context, PCClass obj)
{
+ return null;
+ }
+
+ public Class<PCClass> getTokenClass()
+ {
+ return PCClass.class;
+ }
+
+ public boolean parse(LoadContext context, PCClass obj, String value)
+ throws PersistenceLayerException
+ {
Logging.deprecationPrint("Ignoring HASSPELLFORMULA: "
+ "No longer required in PCGen 5.15+ ");
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|