From: <th...@us...> - 2009-02-27 01:25:21
|
Revision: 9505 http://pcgen.svn.sourceforge.net/pcgen/?rev=9505&view=rev Author: thpr Date: 2009-02-27 01:25:11 +0000 (Fri, 27 Feb 2009) Log Message: ----------- Bug fix - FAVCLASS has .MOD problems Modified Paths: -------------- Trunk/pcgen/code/src/java/plugin/lsttokens/race/FavclassToken.java Trunk/pcgen/code/src/java/plugin/lsttokens/template/FavoredclassToken.java Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/race/FavclassToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/race/FavclassToken.java 2009-02-27 01:23:16 UTC (rev 9504) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/race/FavclassToken.java 2009-02-27 01:25:11 UTC (rev 9505) @@ -73,6 +73,10 @@ { return false; } + context.getObjectContext().remove(race, ObjectKey.ANY_FAVORED_CLASS); + context.getObjectContext().removeList(race, ListKey.FAVORED_CLASS); + context.getObjectContext().removeFromList(race, ListKey.CHOOSE_ACTOR, this); + context.getObjectContext().remove(race, ObjectKey.FAVCLASS_CHOICE); if (value.startsWith(Constants.LST_CHOOSE)) { @@ -210,7 +214,8 @@ if (foundAny && foundOther) { Logging.errorPrint("Non-sensical " + getTokenName() - + ": Contains ANY and a specific reference: " + value); + + ": Contains HIGHESTLEVELCLASS and a specific reference: " + + value); return false; } return true; Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/template/FavoredclassToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/lsttokens/template/FavoredclassToken.java 2009-02-27 01:23:16 UTC (rev 9504) +++ Trunk/pcgen/code/src/java/plugin/lsttokens/template/FavoredclassToken.java 2009-02-27 01:25:11 UTC (rev 9505) @@ -135,7 +135,8 @@ if (foundAny && foundOther) { Logging.errorPrint("Non-sensical " + getTokenName() - + ": Contains ANY and a specific reference: " + value); + + ": Contains HIGHESTLEVELCLASS and a specific reference: " + + value); return false; } return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |