From: <th...@us...> - 2009-07-05 16:52:01
|
Revision: 10014 http://pcgen.svn.sourceforge.net/pcgen/?rev=10014&view=rev Author: thpr Date: 2009-07-05 16:51:59 +0000 (Sun, 05 Jul 2009) Log Message: ----------- Eliminate PARENT field in PCClassLevel Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java Trunk/pcgen/code/src/java/pcgen/cdom/inst/PCClassLevel.java Trunk/pcgen/code/src/java/pcgen/core/PCClass.java Trunk/pcgen/code/src/java/pcgen/gui/converter/loader/ClassLoader.java Trunk/pcgen/code/src/java/plugin/lsttokens/BonusLst.java Trunk/pcgen/code/src/test/pcgen/core/PlayerCharacterTest.java Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java 2009-07-05 16:49:28 UTC (rev 10013) +++ Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java 2009-07-05 16:51:59 UTC (rev 10014) @@ -591,7 +591,7 @@ clone.mapChar = new MapKeyMap(); clone.mapChar.putAll(mapChar); clone.cdomListMods = cdomListMods.clone(); - clone.ownBonuses(); + clone.ownBonuses(clone); return clone; } @@ -676,7 +676,7 @@ * Hopefully this is a temporary import - thpr Oct 9, 2008 * @throws CloneNotSupportedException */ - public void ownBonuses() throws CloneNotSupportedException + public void ownBonuses(Object owner) throws CloneNotSupportedException { List<BonusObj> bonusList = getListFor(ListKey.BONUS); if (bonusList != null) @@ -686,7 +686,7 @@ { BonusObj bonus = orig.clone(); addToListFor(ListKey.BONUS, bonus); - bonus.setCreatorObject(this); + bonus.setCreatorObject(owner); } } } Modified: Trunk/pcgen/code/src/java/pcgen/cdom/inst/PCClassLevel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/cdom/inst/PCClassLevel.java 2009-07-05 16:49:28 UTC (rev 10013) +++ Trunk/pcgen/code/src/java/pcgen/cdom/inst/PCClassLevel.java 2009-07-05 16:51:59 UTC (rev 10014) @@ -22,7 +22,6 @@ import pcgen.cdom.base.CDOMObject; import pcgen.cdom.enumeration.IntegerKey; import pcgen.cdom.enumeration.ListKey; -import pcgen.cdom.enumeration.ObjectKey; import pcgen.core.bonus.BonusObj; /** @@ -91,10 +90,9 @@ * items like CL are properly calculated. */ @Override - public void ownBonuses() throws CloneNotSupportedException + public void ownBonuses(Object owner) throws CloneNotSupportedException { List<BonusObj> bonusList = getListFor(ListKey.BONUS); - Object parent = get(ObjectKey.PARENT); if (bonusList != null) { removeListFor(ListKey.BONUS); @@ -102,7 +100,7 @@ { BonusObj bonus = orig.clone(); addToListFor(ListKey.BONUS, bonus); - bonus.setCreatorObject(parent); + bonus.setCreatorObject(owner); } } } Modified: Trunk/pcgen/code/src/java/pcgen/core/PCClass.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2009-07-05 16:49:28 UTC (rev 10013) +++ Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2009-07-05 16:51:59 UTC (rev 10014) @@ -3709,7 +3709,7 @@ } try { - ownBonuses(); + ownBonuses(this); } catch (CloneNotSupportedException ce) { @@ -3970,7 +3970,6 @@ PCClassLevel classLevel = new PCClassLevel(); classLevel.put(IntegerKey.LEVEL, Integer.valueOf(lvl)); classLevel.setName(getDisplayName() + "(" + lvl + ")"); - classLevel.put(ObjectKey.PARENT, this); classLevel.put(ObjectKey.TOKEN_PARENT, this); levelMap.put(lvl, classLevel); } @@ -4012,36 +4011,9 @@ public int getPCClassLevel(PCClassLevel pcl) { - if (this.equals(pcl.get(ObjectKey.PARENT))) - { - for (Map.Entry<Integer, PCClassLevel> me : levelMap.entrySet()) - { - if (me.getValue().equals(pcl)) - { - return me.getKey().intValue(); - } - } - } - return -1; + return pcl.get(IntegerKey.LEVEL); } -// public PCClassLevel getRepeatLevel(int level, String objectName) -// { -// PCClassLevel pcl = new PCClassLevel(); -// repeatLevelObjects.add(pcl); -// pcl.put(ObjectKey.PARENT, this); -// pcl.put(ObjectKey.MULTIPLE_ALLOWED, Boolean.TRUE); -// String originalLevels = level + ":" + objectName; -// pcl.put(StringKey.REPEAT, originalLevels); -// pcl.setName(getDisplayName() + "(" + originalLevels + ")"); -// return pcl; -// } -// -// public Collection<PCClassLevel> getRepeatLevels() -// { -// return Collections.unmodifiableList(repeatLevelObjects); -// } - public boolean updateSpellCache(boolean force) { if (force || !spellCacheValid) @@ -4093,8 +4065,7 @@ try { PCClassLevel lvl = pcc.getClassLevel(cl).clone(); - lvl.put(ObjectKey.PARENT, this); - lvl.ownBonuses(); + lvl.ownBonuses(this); levelMap.put(cl, lvl); } catch (CloneNotSupportedException e) @@ -4134,12 +4105,12 @@ } @Override - public void ownBonuses() throws CloneNotSupportedException + public void ownBonuses(Object owner) throws CloneNotSupportedException { - super.ownBonuses(); + super.ownBonuses(owner); for (PCClassLevel pcl : this.getClassLevelCollection()) { - pcl.ownBonuses(); + pcl.ownBonuses(owner); } } Modified: Trunk/pcgen/code/src/java/pcgen/gui/converter/loader/ClassLoader.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/converter/loader/ClassLoader.java 2009-07-05 16:49:28 UTC (rev 10013) +++ Trunk/pcgen/code/src/java/pcgen/gui/converter/loader/ClassLoader.java 2009-07-05 16:51:59 UTC (rev 10014) @@ -103,7 +103,6 @@ obj.put(IntegerKey.LEVEL, 1); parent = context.ref.constructCDOMObject(buildParent, line + "Test" + tok); - obj.put(ObjectKey.PARENT, parent); obj.put(ObjectKey.TOKEN_PARENT, parent); } List<CDOMObject> injected = processToken(sb, obj, parent, token, Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/BonusLst.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/BonusLst.java 2009-07-05 16:49:28 UTC (rev 10013) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/BonusLst.java 2009-07-05 16:51:59 UTC (rev 10014) @@ -163,7 +163,7 @@ } try { - obj.ownBonuses(); + obj.ownBonuses(obj); } catch (CloneNotSupportedException e) { Modified: Trunk/pcgen/code/src/test/pcgen/core/PlayerCharacterTest.java =================================================================== --- Trunk/pcgen/code/src/test/pcgen/core/PlayerCharacterTest.java 2009-07-05 16:49:28 UTC (rev 10013) +++ Trunk/pcgen/code/src/test/pcgen/core/PlayerCharacterTest.java 2009-07-05 16:51:59 UTC (rev 10014) @@ -135,7 +135,7 @@ human = new Race(); final BonusObj humanRaceFeatBonus = Bonus.newBonus("FEAT|POOL|2"); human.addToListFor(ListKey.BONUS, humanRaceFeatBonus); - human.ownBonuses(); + human.ownBonuses(human); // Giant Race giantRace = new Race(); @@ -148,7 +148,7 @@ final BonusObj giantRaceFeatBonus = Bonus.newBonus("FEAT|POOL|1"); giantRace.addToListFor(ListKey.BONUS, giantRaceFeatBonus); - giantRace.ownBonuses(); + giantRace.ownBonuses(giantRace); context.ref.importObject(giantRace); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |