Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen: [3841] branches/cdom/code/src/java/plugin/lsttokens
|
From: <th...@us...> - 2007-08-21 01:36:19
|
Revision: 3841
http://pcgen.svn.sourceforge.net/pcgen/?rev=3841&view=rev
Author: thpr
Date: 2007-08-20 18:36:19 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
CDOM: final step in converting LoadContext to an abstract class
Modified Paths:
--------------
branches/cdom/code/src/java/plugin/lsttokens/AbilityLst.java
branches/cdom/code/src/java/plugin/lsttokens/BonusLst.java
branches/cdom/code/src/java/plugin/lsttokens/CcskillLst.java
branches/cdom/code/src/java/plugin/lsttokens/ChangeprofLst.java
branches/cdom/code/src/java/plugin/lsttokens/ChooseLst.java
branches/cdom/code/src/java/plugin/lsttokens/CompanionListLst.java
branches/cdom/code/src/java/plugin/lsttokens/CskillLst.java
branches/cdom/code/src/java/plugin/lsttokens/DefineLst.java
branches/cdom/code/src/java/plugin/lsttokens/DescLst.java
branches/cdom/code/src/java/plugin/lsttokens/DrLst.java
branches/cdom/code/src/java/plugin/lsttokens/FollowersLst.java
branches/cdom/code/src/java/plugin/lsttokens/KeyLst.java
branches/cdom/code/src/java/plugin/lsttokens/KitLst.java
branches/cdom/code/src/java/plugin/lsttokens/LangautoLst.java
branches/cdom/code/src/java/plugin/lsttokens/MoveLst.java
branches/cdom/code/src/java/plugin/lsttokens/MovecloneLst.java
branches/cdom/code/src/java/plugin/lsttokens/NaturalattacksLst.java
branches/cdom/code/src/java/plugin/lsttokens/OutputnameLst.java
branches/cdom/code/src/java/plugin/lsttokens/QualifyToken.java
branches/cdom/code/src/java/plugin/lsttokens/RegionLst.java
branches/cdom/code/src/java/plugin/lsttokens/SaLst.java
branches/cdom/code/src/java/plugin/lsttokens/SpelllevelLst.java
branches/cdom/code/src/java/plugin/lsttokens/SpellsLst.java
branches/cdom/code/src/java/plugin/lsttokens/SrLst.java
branches/cdom/code/src/java/plugin/lsttokens/TempdescLst.java
branches/cdom/code/src/java/plugin/lsttokens/TemplateLst.java
branches/cdom/code/src/java/plugin/lsttokens/TypeLst.java
branches/cdom/code/src/java/plugin/lsttokens/UdamLst.java
branches/cdom/code/src/java/plugin/lsttokens/UmultLst.java
branches/cdom/code/src/java/plugin/lsttokens/UnencumberedmoveLst.java
branches/cdom/code/src/java/plugin/lsttokens/VFeatLst.java
branches/cdom/code/src/java/plugin/lsttokens/VisionLst.java
Modified: branches/cdom/code/src/java/plugin/lsttokens/AbilityLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/AbilityLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/AbilityLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -268,7 +268,8 @@
context.ref.getCDOMReference(ABILITY_CLASS, ac, tok
.nextToken());
PCGraphGrantsEdge edge =
- context.graph.grant(getTokenName(), obj, ability);
+ context.getGraphContext().grant(getTokenName(), obj,
+ ability);
edge.setAssociation(AssociationKey.ABILITY_NATURE, an);
}
return true;
@@ -277,8 +278,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
GraphChanges<Ability> changes =
- context.graph.getChangesFromToken(getTokenName(), obj,
- ABILITY_CLASS);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ obj, ABILITY_CLASS);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/BonusLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/BonusLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/BonusLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -141,7 +141,7 @@
"; value was: ").append(value).toString());
}
}
- context.obj.addToList(obj, ListKey.BONUSES, bonus);
+ context.getObjectContext().addToList(obj, ListKey.BONUSES, bonus);
return true;
}
Modified: branches/cdom/code/src/java/plugin/lsttokens/CcskillLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/CcskillLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/CcskillLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -102,7 +102,7 @@
+ ": .CLEAR was not the first list item");
return false;
}
- context.graph.removeAll(getTokenName(), obj);
+ context.getGraphContext().removeAll(getTokenName(), obj);
}
else if (tokText.startsWith(Constants.LST_DOT_CLEAR_DOT))
{
@@ -124,7 +124,7 @@
+ getTokenName());
return false;
}
- context.graph.remove(getTokenName(), obj, ref);
+ context.getGraphContext().remove(getTokenName(), obj, ref);
}
else
{
@@ -154,9 +154,13 @@
return false;
}
AssociatedPrereqObject edge =
- context.list
- .addToMasterList(getTokenName(), obj, context.ref
- .getCDOMAllReference(CLASSSKILLLIST_CLASS), ref);
+ context.getListContext()
+ .addToMasterList(
+ getTokenName(),
+ obj,
+ context.ref
+ .getCDOMAllReference(CLASSSKILLLIST_CLASS),
+ ref);
edge.setAssociation(AssociationKey.SKILL_COST,
SkillCost.CROSS_CLASS);
}
@@ -176,8 +180,8 @@
CDOMGroupRef<ClassSkillList> listRef =
context.ref.getCDOMAllReference(CLASSSKILLLIST_CLASS);
MasterListChanges<Skill> changes =
- context.list.getChangesInMasterList(getTokenName(), obj,
- listRef);
+ context.getListContext().getChangesInMasterList(getTokenName(),
+ obj, listRef);
if (changes == null)
{
// Legal if no CSKILL was present
Modified: branches/cdom/code/src/java/plugin/lsttokens/ChangeprofLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/ChangeprofLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/ChangeprofLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -182,7 +182,7 @@
}
for (ChangeProf cp : list)
{
- context.graph.grant(getTokenName(), obj, cp);
+ context.getGraphContext().grant(getTokenName(), obj, cp);
}
return true;
}
@@ -190,8 +190,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
GraphChanges<ChangeProf> changes =
- context.graph.getChangesFromToken(getTokenName(), obj,
- ChangeProf.class);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ obj, ChangeProf.class);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/ChooseLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/ChooseLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/ChooseLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -232,7 +232,7 @@
: FormulaFactory.getFormulaFor(count);
ChoiceSet<?> choiceSet = new ChoiceSet(Constants.CHOOSE, chooser);
PCGraphGrantsEdge edge =
- context.graph.grant(getTokenName(), obj, choiceSet);
+ context.getGraphContext().grant(getTokenName(), obj, choiceSet);
edge.setAssociation(AssociationKey.CHOICE_COUNT, countFormula);
edge.setAssociation(AssociationKey.CHOICE_MAXCOUNT, maxFormula);
/*
@@ -250,8 +250,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
GraphChanges<ChoiceSet> changes =
- context.graph.getChangesFromToken(getTokenName(), obj,
- ChoiceSet.class);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ obj, ChoiceSet.class);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/CompanionListLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/CompanionListLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/CompanionListLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -372,7 +372,8 @@
for (CDOMReference<Race> race : races)
{
AssociatedPrereqObject edge =
- context.list.addToList(getTokenName(), obj, ref, race);
+ context.getListContext().addToList(getTokenName(), obj,
+ ref, race);
if (followerAdjustment != null)
{
edge.setAssociation(AssociationKey.FOLLOWER_ADJUSTMENT,
@@ -385,14 +386,16 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
Collection<CDOMReference<CDOMList<? extends CDOMObject>>> changedLists =
- context.list.getChangedLists(obj, CompanionList.class);
+ context.getListContext().getChangedLists(obj,
+ CompanionList.class);
TripleKeyMapToList<Set<Prerequisite>, CDOMReference<CompanionList>, Integer, LSTWriteable> m =
new TripleKeyMapToList<Set<Prerequisite>, CDOMReference<CompanionList>, Integer, LSTWriteable>();
for (CDOMReference ref : changedLists)
{
ListGraphChanges<Race> changes =
- context.list.getChangesInList(getTokenName(), obj, ref);
+ context.getListContext().getChangesInList(getTokenName(),
+ obj, ref);
if (changes == null)
{
// Legal if no COMPANIONLIST was present
Modified: branches/cdom/code/src/java/plugin/lsttokens/CskillLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/CskillLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/CskillLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -100,7 +100,7 @@
+ ": .CLEAR was not the first list item");
return false;
}
- context.graph.removeAll(getTokenName(), obj);
+ context.getGraphContext().removeAll(getTokenName(), obj);
}
else if (tokText.startsWith(Constants.LST_DOT_CLEAR_DOT))
{
@@ -122,7 +122,7 @@
+ getTokenName());
return false;
}
- context.graph.remove(getTokenName(), obj, ref);
+ context.getGraphContext().remove(getTokenName(), obj, ref);
}
else
{
@@ -152,7 +152,8 @@
return false;
}
AssociatedPrereqObject edge =
- context.list.addToMasterList(getTokenName(), obj,
+ context.getListContext().addToMasterList(
+ getTokenName(), obj,
context.ref.getCDOMAllReference(SKILLLIST_CLASS),
ref);
edge.setAssociation(AssociationKey.SKILL_COST, SkillCost.CLASS);
@@ -173,8 +174,8 @@
CDOMGroupRef<ClassSkillList> listRef =
context.ref.getCDOMAllReference(SKILLLIST_CLASS);
MasterListChanges<Skill> changes =
- context.list.getChangesInMasterList(getTokenName(), obj,
- listRef);
+ context.getListContext().getChangesInMasterList(getTokenName(),
+ obj, listRef);
if (changes == null)
{
// Legal if no CSKILL was present
Modified: branches/cdom/code/src/java/plugin/lsttokens/DefineLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/DefineLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/DefineLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -84,7 +84,8 @@
{
Formula f =
FormulaFactory.getFormulaFor(value.substring(barLoc + 1));
- context.obj.put(obj, VariableKey.getConstant(var), f);
+ context.getObjectContext()
+ .put(obj, VariableKey.getConstant(var), f);
return true;
}
catch (IllegalArgumentException e)
@@ -97,7 +98,7 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
- Set<VariableKey> keys = context.obj.getVariableKeys(obj);
+ Set<VariableKey> keys = context.getObjectContext().getVariableKeys(obj);
if (keys == null || keys.isEmpty())
{
return null;
@@ -106,7 +107,7 @@
for (VariableKey key : keys)
{
set.add(key.toString() + Constants.PIPE
- + context.obj.getVariable(obj, key));
+ + context.getObjectContext().getVariable(obj, key));
}
return set.toArray(new String[set.size()]);
}
Modified: branches/cdom/code/src/java/plugin/lsttokens/DescLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/DescLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/DescLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -130,7 +130,7 @@
if (Constants.LST_DOT_CLEAR.equals(value))
{
- context.graph.removeAll(getTokenName(), obj);
+ context.getGraphContext().removeAll(getTokenName(), obj);
return true;
}
if (value.startsWith(Constants.LST_DOT_CLEAR_DOT))
@@ -151,7 +151,7 @@
{
return false;
}
- context.graph.grant(getTokenName(), obj, d);
+ context.getGraphContext().grant(getTokenName(), obj, d);
return true;
}
@@ -230,8 +230,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
GraphChanges<Description> changes =
- context.graph.getChangesFromToken(getTokenName(), obj,
- Description.class);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ obj, Description.class);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/DrLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/DrLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/DrLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -125,7 +125,7 @@
{
if (".CLEAR".equals(value))
{
- context.graph.removeAll(getTokenName(), obj);
+ context.getGraphContext().removeAll(getTokenName(), obj);
return true;
}
@@ -174,15 +174,15 @@
}
dr.addPrerequisite(prereq);
}
- context.graph.grant(getTokenName(), obj, dr);
+ context.getGraphContext().grant(getTokenName(), obj, dr);
return true;
}
public String[] unparse(LoadContext context, CDOMObject obj)
{
GraphChanges<DamageReduction> changes =
- context.graph
- .getChangesFromToken(getTokenName(), obj, DR_CLASS);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ obj, DR_CLASS);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/FollowersLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/FollowersLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/FollowersLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -157,7 +157,7 @@
CDOMSimpleSingleRef<CompanionList> cl =
context.ref.getCDOMReference(CompanionList.class, followerType);
Formula num = FormulaFactory.getFormulaFor(followerNumber);
- context.obj.addToList(obj, ListKey.FOLLOWERS,
+ context.getObjectContext().addToList(obj, ListKey.FOLLOWERS,
new FollowerLimit(cl, num));
return true;
}
@@ -165,7 +165,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
Changes<FollowerLimit> changes =
- context.obj.getListChanges(obj, ListKey.FOLLOWERS);
+ context.getObjectContext().getListChanges(obj,
+ ListKey.FOLLOWERS);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/KeyLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/KeyLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/KeyLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -56,7 +56,7 @@
* TODO This actually needs to be special - since the Key is the lookup
* method FUTURE isn't this redundant with the set above?!
*/
- context.obj.put(obj, StringKey.KEY_NAME, value);
+ context.getObjectContext().put(obj, StringKey.KEY_NAME, value);
return true;
}
Modified: branches/cdom/code/src/java/plugin/lsttokens/KitLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/KitLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/KitLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -103,7 +103,7 @@
}
ChoiceSet<?> choiceSet = new ChoiceSet("KIT", chooser);
PCGraphGrantsEdge edge =
- context.graph.grant(getTokenName(), obj, choiceSet);
+ context.getGraphContext().grant(getTokenName(), obj, choiceSet);
edge.setAssociation(AssociationKey.CHOICE_COUNT, FormulaFactory
.getFormulaFor(count));
edge.setAssociation(AssociationKey.CHOICE_MAXCOUNT, FormulaFactory
@@ -113,7 +113,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
- ChoiceSet<?> choice = context.obj.getObject(obj, ObjectKey.KIT_CHOICE);
+ ChoiceSet<?> choice =
+ context.getObjectContext().getObject(obj, ObjectKey.KIT_CHOICE);
if (choice == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/LangautoLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/LangautoLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/LangautoLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -86,7 +86,7 @@
{
return false;
}
- context.graph.removeAll(getTokenName(), obj);
+ context.getGraphContext().removeAll(getTokenName(), obj);
}
else
{
@@ -109,7 +109,7 @@
+ getTokenName());
return false;
}
- context.graph.grant(getTokenName(), obj, ref);
+ context.getGraphContext().grant(getTokenName(), obj, ref);
}
firstToken = true;
}
@@ -125,8 +125,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
GraphChanges<Language> changes =
- context.graph.getChangesFromToken(getTokenName(), obj,
- LANGUAGE_CLASS);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ obj, LANGUAGE_CLASS);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/MoveLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/MoveLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/MoveLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -100,8 +100,8 @@
+ " was negative");
return false;
}
- context.graph.grant(getTokenName(), obj, new SimpleMovement(
- moveType, distance));
+ context.getGraphContext().grant(getTokenName(), obj,
+ new SimpleMovement(moveType, distance));
}
catch (NumberFormatException e)
{
@@ -118,8 +118,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
GraphChanges<SimpleMovement> changes =
- context.graph.getChangesFromToken(getTokenName(), obj,
- SimpleMovement.class);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ obj, SimpleMovement.class);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/MovecloneLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/MovecloneLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/MovecloneLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -52,7 +52,7 @@
{
Movement cm = Movement.getMovementFrom(value);
cm.setMoveRatesFlag(2);
- context.graph.grant(getTokenName(), obj, cm);
+ context.getGraphContext().grant(getTokenName(), obj, cm);
return true;
}
Modified: branches/cdom/code/src/java/plugin/lsttokens/NaturalattacksLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/NaturalattacksLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/NaturalattacksLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -293,7 +293,7 @@
}
for (Equipment weapon : naturalWeapons)
{
- context.graph.grant(getTokenName(), obj, weapon);
+ context.getGraphContext().grant(getTokenName(), obj, weapon);
}
return true;
}
@@ -482,7 +482,7 @@
CDOMSimpleSingleRef<WeaponProf> wp =
context.ref.getCDOMReference(WEAPONPROF_CLASS, attackName);
anEquip.put(ObjectKey.WEAPON_PROF, wp);
- context.graph.grant(getTokenName(), anEquip, wp);
+ context.getGraphContext().grant(getTokenName(), anEquip, wp);
anEquip.put(IntegerKey.SLOTS, Integer.valueOf(handsRequired));
@@ -503,8 +503,9 @@
* link* or allow*, as the general relationships are contains and
* equips?
*/
- context.graph.grant(getTokenName(), anEquip, size);
- context.graph.grant(Constants.VT_EQ_HEAD, anEquip, equipHead);
+ context.getGraphContext().grant(getTokenName(), anEquip, size);
+ context.getGraphContext().grant(Constants.VT_EQ_HEAD, anEquip,
+ equipHead);
return anEquip;
}
Modified: branches/cdom/code/src/java/plugin/lsttokens/OutputnameLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/OutputnameLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/OutputnameLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -48,13 +48,15 @@
public boolean parse(LoadContext context, CDOMObject obj, String value)
{
- context.obj.put(obj, StringKey.OUTPUT_NAME, value);
+ context.getObjectContext().put(obj, StringKey.OUTPUT_NAME, value);
return true;
}
public String[] unparse(LoadContext context, CDOMObject obj)
{
- String oname = context.obj.getString(obj, StringKey.OUTPUT_NAME);
+ String oname =
+ context.getObjectContext()
+ .getString(obj, StringKey.OUTPUT_NAME);
if (oname == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/QualifyToken.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/QualifyToken.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/QualifyToken.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -186,7 +186,7 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
Changes<Qualifier> changes =
- context.obj.getListChanges(obj, ListKey.QUALIFY);
+ context.getObjectContext().getListChanges(obj, ListKey.QUALIFY);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/RegionLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/RegionLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/RegionLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -55,13 +55,14 @@
public boolean parse(LoadContext context, CDOMObject obj, String value)
{
- context.obj.put(obj, StringKey.REGION, value);
+ context.getObjectContext().put(obj, StringKey.REGION, value);
return true;
}
public String[] unparse(LoadContext context, CDOMObject obj)
{
- String region = context.obj.getString(obj, StringKey.REGION);
+ String region =
+ context.getObjectContext().getString(obj, StringKey.REGION);
if (region == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/SaLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/SaLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/SaLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -81,8 +81,7 @@
* @param level
* int level at which the ability is gained
*/
- public void parseSpecialAbility(PObject obj, String aString,
- int level)
+ public void parseSpecialAbility(PObject obj, String aString, int level)
{
StringTokenizer aTok = new StringTokenizer(aString, "|", true);
@@ -97,7 +96,7 @@
SpecialAbility sa = new SpecialAbility();
boolean isPre = false;
-
+
while (aTok.hasMoreTokens())
{
String cString = aTok.nextToken();
@@ -161,7 +160,8 @@
}
catch (PersistenceLayerException notUsed)
{
- Logging.errorPrint("Failed to assign level prerequisite.", notUsed);
+ Logging.errorPrint("Failed to assign level prerequisite.",
+ notUsed);
}
}
if (obj instanceof PCClass)
@@ -212,7 +212,7 @@
if (Constants.LST_DOT_CLEAR.equals(firstToken))
{
- context.graph.removeAll(getTokenName(), obj);
+ context.getGraphContext().removeAll(getTokenName(), obj);
if (!tok.hasMoreTokens())
{
return true;
@@ -231,7 +231,7 @@
if (!tok.hasMoreTokens())
{
- context.graph.grant(getTokenName(), obj, sa);
+ context.getGraphContext().grant(getTokenName(), obj, sa);
return true;
}
@@ -262,7 +262,7 @@
// No prereqs, so we're done
// CONSIDER This is a HACK and not the long term strategy of SA:
sa.setName(saName.toString());
- context.graph.grant(getTokenName(), obj, sa);
+ context.getGraphContext().grant(getTokenName(), obj, sa);
return true;
}
token = tok.nextToken();
@@ -296,15 +296,15 @@
}
token = tok.nextToken();
}
- context.graph.grant(getTokenName(), obj, sa);
+ context.getGraphContext().grant(getTokenName(), obj, sa);
return true;
}
public String[] unparse(LoadContext context, CDOMObject obj)
{
GraphChanges<SpecialAbility> changes =
- context.graph
- .getChangesFromToken(getTokenName(), obj, SA_CLASS);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ obj, SA_CLASS);
if (changes == null)
{
return null;
@@ -328,7 +328,8 @@
if (ab.hasPrerequisites())
{
sb.append(Constants.PIPE);
- sb.append(getPrerequisiteString(context, ab.getPrerequisiteList()));
+ sb.append(getPrerequisiteString(context, ab
+ .getPrerequisiteList()));
}
list.add(sb.toString());
}
Modified: branches/cdom/code/src/java/plugin/lsttokens/SpelllevelLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/SpelllevelLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/SpelllevelLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -307,8 +307,8 @@
* TODO Deprecate the use of SPELLCASTER? No need for it, since
* the function isn't any different.
*
- * Actually, I think it IS necessary still - thpr 1/8/07
- * It is, since this is actually a TYPE
+ * Actually, I think it IS necessary still - thpr 1/8/07 It is,
+ * since this is actually a TYPE
*/
classString = classString.substring(12);
}
@@ -337,7 +337,8 @@
for (CDOMReference<? extends CDOMList<Spell>> sl : slList)
{
AssociatedPrereqObject tpr =
- context.list.addToList(getTokenName(), obj, sl, sp);
+ context.getListContext().addToList(getTokenName(), obj,
+ sl, sp);
tpr.setAssociation(AssociationKey.SPELL_LEVEL, splLevel);
tpr.addAllPrerequisites(prereqs);
}
@@ -348,11 +349,13 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
Collection<CDOMReference<CDOMList<? extends CDOMObject>>> changedDomainLists =
- context.list.getChangedLists(obj, DomainSpellList.class);
+ context.getListContext().getChangedLists(obj,
+ DomainSpellList.class);
TripleKeyMapToList<String, Integer, CDOMReference<CDOMList<? extends CDOMObject>>, CDOMReference<Spell>> domainMap =
getMap(context, obj, changedDomainLists);
Collection<CDOMReference<CDOMList<? extends CDOMObject>>> changedClassLists =
- context.list.getChangedLists(obj, ClassSpellList.class);
+ context.getListContext().getChangedLists(obj,
+ ClassSpellList.class);
TripleKeyMapToList<String, Integer, CDOMReference<CDOMList<? extends CDOMObject>>, CDOMReference<Spell>> classMap =
getMap(context, obj, changedDomainLists);
@@ -419,7 +422,8 @@
for (CDOMReference listRef : changedLists)
{
ListGraphChanges<Spell> changes =
- context.list.getChangesInList(getTokenName(), obj, listRef);
+ context.getListContext().getChangesInList(getTokenName(),
+ obj, listRef);
if (changes == null)
{
// Legal if no SPELLLEVEL was present
Modified: branches/cdom/code/src/java/plugin/lsttokens/SpellsLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/SpellsLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/SpellsLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -349,7 +349,7 @@
for (CDOMReference<Spell> spell : dkm.getKeySet())
{
PCGraphGrantsEdge edge =
- context.graph.grant(getTokenName(), obj, spell);
+ context.getGraphContext().grant(getTokenName(), obj, spell);
for (AssociationKey<String> ak : dkm.getSecondaryKeySet(spell))
{
edge.setAssociation(ak, dkm.get(spell, ak));
@@ -367,8 +367,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
GraphChanges<Spell> changes =
- context.graph.getChangesFromToken(getTokenName(), obj,
- Spell.class);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ obj, Spell.class);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/SrLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/SrLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/SrLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -67,11 +67,12 @@
{
if (".CLEAR".equals(value))
{
- context.graph.removeAll(getTokenName(), obj);
+ context.getGraphContext().removeAll(getTokenName(), obj);
}
else
{
- context.graph.grant(getTokenName(), obj, getSpellResistance(value));
+ context.getGraphContext().grant(getTokenName(), obj,
+ getSpellResistance(value));
}
return true;
}
@@ -84,8 +85,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
GraphChanges<SpellResistance> changes =
- context.graph.getChangesFromToken(getTokenName(), obj,
- SpellResistance.class);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ obj, SpellResistance.class);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/TempdescLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/TempdescLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/TempdescLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -49,14 +49,16 @@
public boolean parse(LoadContext context, CDOMObject obj, String value)
{
- context.obj.put(obj, StringKey.TEMP_DESCRIPTION, EntityEncoder
- .decode(value));
+ context.getObjectContext().put(obj, StringKey.TEMP_DESCRIPTION,
+ EntityEncoder.decode(value));
return true;
}
public String[] unparse(LoadContext context, CDOMObject obj)
{
- String descr = context.obj.getString(obj, StringKey.TEMP_DESCRIPTION);
+ String descr =
+ context.getObjectContext().getString(obj,
+ StringKey.TEMP_DESCRIPTION);
if (descr == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/TemplateLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/TemplateLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/TemplateLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -95,14 +95,15 @@
ChoiceSet<PCTemplate> cs =
new ChoiceSet<PCTemplate>("ADD", rcs);
PCGraphGrantsEdge edge =
- context.graph.grant(getTokenName(), cdo, cs);
+ context.getGraphContext()
+ .grant(getTokenName(), cdo, cs);
edge.setAssociation(AssociationKey.CHOICE_COUNT, FormulaFactory
.getFormulaFor(1));
edge.setAssociation(AssociationKey.CHOICE_MAXCOUNT,
FormulaFactory.getFormulaFor(1));
GrantFactory<PCTemplate> gf =
new GrantFactory<PCTemplate>(edge);
- context.graph.grant(getTokenName(), cdo, gf);
+ context.getGraphContext().grant(getTokenName(), cdo, gf);
}
return returnval;
}
@@ -127,7 +128,7 @@
String tokText = tok.nextToken();
CDOMSimpleSingleRef<PCTemplate> ref =
context.ref.getCDOMReference(PCTEMPLATE_CLASS, tokText);
- context.graph.grant(getTokenName(), cdo, ref);
+ context.getGraphContext().grant(getTokenName(), cdo, ref);
}
}
@@ -149,7 +150,7 @@
CDOMSimpleSingleRef<PCTemplate> ref =
context.ref.getCDOMReference(PCTEMPLATE_CLASS, tok
.nextToken());
- context.list.addToList(getTokenName(), obj, swl, ref);
+ context.getListContext().addToList(getTokenName(), obj, swl, ref);
}
return true;
}
@@ -157,8 +158,8 @@
public String[] unparse(LoadContext context, CDOMObject cdo)
{
GraphChanges<PCTemplate> changes =
- context.graph.getChangesFromToken(getTokenName(), cdo,
- PCTEMPLATE_CLASS);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ cdo, PCTEMPLATE_CLASS);
PCTemplateChooseList tcl = cdo.getCDOMTemplateChooseList();
CDOMSingleRef<PCTemplateChooseList> ref =
@@ -167,9 +168,11 @@
context.ref.getCDOMAllReference(PCTEMPLATECHOOSELIST_CLASS);
ListGraphChanges<PCTemplate> tctChanges =
- context.list.getChangesInList(getTokenName(), cdo, ref);
+ context.getListContext().getChangesInList(getTokenName(), cdo,
+ ref);
ListGraphChanges<PCTemplate> allChanges =
- context.list.getChangesInList(getTokenName(), cdo, allRef);
+ context.getListContext().getChangesInList(getTokenName(), cdo,
+ allRef);
if (changes == null && tctChanges == null && allChanges == null)
{
Modified: branches/cdom/code/src/java/plugin/lsttokens/TypeLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/TypeLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/TypeLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -65,7 +65,7 @@
}
if (Constants.LST_DOT_CLEAR.equals(value))
{
- context.obj.removeList(obj, ListKey.TYPE);
+ context.getObjectContext().removeList(obj, ListKey.TYPE);
return true;
}
if (value.charAt(0) == '.')
@@ -106,7 +106,8 @@
Type typeCon = Type.getConstant(aType);
if (removeType)
{
- context.obj.removeFromList(obj, ListKey.TYPE, typeCon);
+ context.getObjectContext().removeFromList(obj,
+ ListKey.TYPE, typeCon);
removeType = false;
}
/*
@@ -120,7 +121,8 @@
*/
else
{
- context.obj.addToList(obj, ListKey.TYPE, typeCon);
+ context.getObjectContext().addToList(obj, ListKey.TYPE,
+ typeCon);
}
}
}
@@ -129,7 +131,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
- Changes<Type> changes = context.obj.getListChanges(obj, ListKey.TYPE);
+ Changes<Type> changes =
+ context.getObjectContext().getListChanges(obj, ListKey.TYPE);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/UdamLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/UdamLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/UdamLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -59,7 +59,7 @@
{
if (Constants.LST_DOT_CLEAR.equals(value))
{
- context.obj.removeList(obj, ListKey.UDAM);
+ context.getObjectContext().removeList(obj, ListKey.UDAM);
}
else
{
@@ -71,18 +71,19 @@
+ " requires 9 comma separated values");
return false;
}
- if (context.obj.containsListFor(obj, ListKey.UDAM))
+ if (context.getObjectContext().containsListFor(obj, ListKey.UDAM))
{
Logging.errorPrint(obj.getDisplayName() + " already has "
+ getTokenName() + " set.");
Logging.errorPrint(" It will be redefined, "
+ "but you should be using " + getTokenName() + ":.CLEAR");
- context.obj.removeList(obj, ListKey.UDAM);
+ context.getObjectContext().removeList(obj, ListKey.UDAM);
}
while (tok.hasMoreTokens())
{
- context.obj.addToList(obj, ListKey.UDAM, tok.nextToken());
+ context.getObjectContext().addToList(obj, ListKey.UDAM,
+ tok.nextToken());
}
}
return true;
@@ -90,7 +91,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
- Changes<String> changes = context.obj.getListChanges(obj, ListKey.UDAM);
+ Changes<String> changes =
+ context.getObjectContext().getListChanges(obj, ListKey.UDAM);
if (changes == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/UmultLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/UmultLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/UmultLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -59,7 +59,7 @@
{
if (Constants.LST_DOT_CLEAR.equals(value))
{
- context.obj.put(obj, IntegerKey.UMULT, null);
+ context.getObjectContext().put(obj, IntegerKey.UMULT, null);
}
else
{
@@ -73,7 +73,7 @@
Logging.errorPrint(" Expecting a positive integer");
return false;
}
- context.obj.put(obj, IntegerKey.UMULT, i);
+ context.getObjectContext().put(obj, IntegerKey.UMULT, i);
}
catch (NumberFormatException nfe)
{
@@ -87,7 +87,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
- Integer mult = context.obj.getInteger(obj, IntegerKey.UMULT);
+ Integer mult =
+ context.getObjectContext().getInteger(obj, IntegerKey.UMULT);
if (mult == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/UnencumberedmoveLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/UnencumberedmoveLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/UnencumberedmoveLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -121,7 +121,8 @@
+ getTokenName() + " this is not valid.");
return false;
}
- context.obj.put(obj, ObjectKey.UNENCUMBERED_LOAD, load);
+ context.getObjectContext().put(obj,
+ ObjectKey.UNENCUMBERED_LOAD, load);
setLoad = true;
}
catch (IllegalArgumentException e)
@@ -136,7 +137,8 @@
+ getTokenName() + " this is not valid.");
return false;
}
- context.obj.put(obj, ObjectKey.UNENCUMBERED_ARMOR, at);
+ context.getObjectContext().put(obj,
+ ObjectKey.UNENCUMBERED_ARMOR, at);
setArmor = true;
}
catch (IllegalArgumentException e2)
@@ -154,8 +156,11 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
pcgen.cdom.enumeration.Load load =
- context.obj.getObject(obj, ObjectKey.UNENCUMBERED_LOAD);
- ArmorType at = context.obj.getObject(obj, ObjectKey.UNENCUMBERED_ARMOR);
+ context.getObjectContext().getObject(obj,
+ ObjectKey.UNENCUMBERED_LOAD);
+ ArmorType at =
+ context.getObjectContext().getObject(obj,
+ ObjectKey.UNENCUMBERED_ARMOR);
if (load == null && at == null)
{
return null;
Modified: branches/cdom/code/src/java/plugin/lsttokens/VFeatLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/VFeatLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/VFeatLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -118,7 +118,8 @@
for (CDOMReference<Ability> ability : abilityList)
{
PCGraphGrantsEdge edge =
- context.graph.grant(getTokenName(), obj, ability);
+ context.getGraphContext().grant(getTokenName(), obj,
+ ability);
edge.setAssociation(AssociationKey.ABILITY_NATURE,
AbilityNature.VIRTUAL);
if (prereqs != null)
@@ -134,8 +135,8 @@
public String[] unparse(LoadContext context, CDOMObject cdo)
{
GraphChanges<Ability> changes =
- context.graph.getChangesFromToken(getTokenName(), cdo,
- ABILITY_CLASS);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ cdo, ABILITY_CLASS);
if (changes == null)
{
return null;
@@ -179,8 +180,8 @@
for (Set<Prerequisite> prereqs : m.getKeySet())
{
String ab =
- ReferenceUtilities.joinLstFormat(m.getListFor(prereqs),
- Constants.PIPE);
+ ReferenceUtilities.joinLstFormat(m.getListFor(prereqs),
+ Constants.PIPE);
if (prereqs != null && !prereqs.isEmpty())
{
ab =
Modified: branches/cdom/code/src/java/plugin/lsttokens/VisionLst.java
===================================================================
--- branches/cdom/code/src/java/plugin/lsttokens/VisionLst.java 2007-08-21 01:35:34 UTC (rev 3840)
+++ branches/cdom/code/src/java/plugin/lsttokens/VisionLst.java 2007-08-21 01:36:19 UTC (rev 3841)
@@ -154,7 +154,7 @@
if (".CLEAR".equals(visionString))
{
- context.graph.removeAll(getTokenName(), obj);
+ context.getGraphContext().removeAll(getTokenName(), obj);
continue;
}
@@ -163,7 +163,7 @@
try
{
Vision vis = Vision.getVision(visionString.substring(7));
- context.graph.remove(getTokenName(), obj, vis);
+ context.getGraphContext().remove(getTokenName(), obj, vis);
}
catch (IllegalArgumentException e)
{
@@ -177,7 +177,7 @@
{
if (visionString.startsWith(".SET."))
{
- context.graph.removeAll(getTokenName(), obj);
+ context.getGraphContext().removeAll(getTokenName(), obj);
visionString = visionString.substring(5);
}
try
@@ -195,7 +195,7 @@
}
for (Vision vis : list)
{
- context.graph.grant(getTokenName(), obj, vis);
+ context.getGraphContext().grant(getTokenName(), obj, vis);
}
return true;
}
@@ -203,8 +203,8 @@
public String[] unparse(LoadContext context, CDOMObject obj)
{
GraphChanges<Vision> changes =
- context.graph.getChangesFromToken(getTokenName(), obj,
- VISION_CLASS);
+ context.getGraphContext().getChangesFromToken(getTokenName(),
+ obj, VISION_CLASS);
if (changes == null)
{
return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|