From: <th...@us...> - 2008-10-08 21:27:53
|
Revision: 7996 http://pcgen.svn.sourceforge.net/pcgen/?rev=7996&view=rev Author: thpr Date: 2008-10-08 21:27:27 +0000 (Wed, 08 Oct 2008) Log Message: ----------- remove dead code Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/chooser/ChooserUtilities.java Trunk/pcgen/code/src/test/pcgen/core/AllJUnitTests.java Removed Paths: ------------- Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListCrossClassChoiceManager.java Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillListCrossClassChoiceManagerTest.java Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/ChooserUtilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/chooser/ChooserUtilities.java 2008-10-08 21:16:18 UTC (rev 7995) +++ Trunk/pcgen/code/src/java/pcgen/core/chooser/ChooserUtilities.java 2008-10-08 21:27:27 UTC (rev 7996) @@ -399,8 +399,6 @@ // // -- Zaister, 2007/02/23 // - classLookup.put("SKILLIST", SkillListChoiceManager.class.getName()); - classLookup.put("CCSKILLIST", SkillListCrossClassChoiceManager.class.getName()); classLookup.put("NONCLASSSKILLLIST", SkillListNonClassChoiceManager.class.getName()); mapconstructed = true; Deleted: Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListCrossClassChoiceManager.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListCrossClassChoiceManager.java 2008-10-08 21:16:18 UTC (rev 7995) +++ Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListCrossClassChoiceManager.java 2008-10-08 21:27:27 UTC (rev 7996) @@ -1,55 +0,0 @@ -/** - * SkillListCrossClassChoiceManager.java - * - * 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 Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Current Version: $Revision: 285 $ - * Last Editor: $Author: nuance $ - * Last Edited: $Date: 2006-03-17 15:19:49 +0000 (Fri, 17 Mar 2006) $ - * - * Copyright 2006 Andrew Wilson <nu...@so...> - */ -package pcgen.core.chooser; - -import pcgen.core.Ability; -import pcgen.core.PObject; -import pcgen.core.PlayerCharacter; - -/** - * This is one of the choosers that deals with choosing a skill. - */ -public class SkillListCrossClassChoiceManager extends SkillListChoiceManager { - - /** - * Make a new Skill List chooser. - * - * @param aPObject - * @param choiceString - * @param aPC - */ - public SkillListCrossClassChoiceManager( - PObject aPObject, - String choiceString, - PlayerCharacter aPC) - { - super(aPObject, choiceString, aPC); - } - - @Override - protected void addSkillToAbility( final Ability anAbility, final String aSkillKey ) - { - anAbility.addCcSkill( aSkillKey ); - } -} Modified: Trunk/pcgen/code/src/test/pcgen/core/AllJUnitTests.java =================================================================== --- Trunk/pcgen/code/src/test/pcgen/core/AllJUnitTests.java 2008-10-08 21:16:18 UTC (rev 7995) +++ Trunk/pcgen/code/src/test/pcgen/core/AllJUnitTests.java 2008-10-08 21:27:27 UTC (rev 7996) @@ -111,8 +111,6 @@ suite.addTest(new TestSuite( pcgen.core.chooser.SkillListChoiceManagerTest.class)); suite.addTest(new TestSuite( - pcgen.core.chooser.SkillListCrossClassChoiceManagerTest.class)); - suite.addTest(new TestSuite( pcgen.core.chooser.SkillListNonClassChoiceManagerTest.class)); suite.addTest(new TestSuite( pcgen.core.chooser.SkillsChoiceManagerTest.class)); Deleted: Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillListCrossClassChoiceManagerTest.java =================================================================== --- Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillListCrossClassChoiceManagerTest.java 2008-10-08 21:16:18 UTC (rev 7995) +++ Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillListCrossClassChoiceManagerTest.java 2008-10-08 21:27:27 UTC (rev 7996) @@ -1,92 +0,0 @@ -/* - * SkillListCrossClassChoiceManagerTest.java - * Copyright 2005 (C) Andrew Wilson <nu...@so...> - * - * 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 Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Created on Oct 7, 2005 - * - * $Author: nuance $ - * $Date: 2006-03-26 08:00:03 +0100 (Sun, 26 Mar 2006) $ - * $Revision: 471 $ - * - */ -package pcgen.core.chooser; - -import java.lang.reflect.Field; -import java.util.List; - -import pcgen.AbstractCharacterTestCase; -import pcgen.core.PObject; -import pcgen.core.PlayerCharacter; -import pcgen.util.TestHelper; - -/** - * {@code SkillListCrossClassChoiceManagerTest} test that the SkillListCrossClassChoiceManager class is functioning correctly. - * - * @author Andrew Wilson <nu...@so...> - */ - -public class SkillListCrossClassChoiceManagerTest extends - AbstractCharacterTestCase -{ - - /** - * Constructs a new {@code SkillListCrossClassChoiceManagerTest}. - */ - public SkillListCrossClassChoiceManagerTest() - { - // Do Nothing - } - - /** - * Test the constructor - */ - public void test001() - { - PObject pObj = new PObject(); - pObj.setName("My PObject"); - pObj.setChoiceString("NUMCHOICES=3|CCSKILLIST|Foo,Bar,Baz,Qux"); - is(pObj.getChoiceString(), - strEq("NUMCHOICES=3|CCSKILLIST|Foo,Bar,Baz,Qux")); - - PlayerCharacter aPC = getCharacter(); - - ChoiceManagerList choiceManager = - ChooserUtilities.getChoiceManager(pObj, null, aPC); - is(choiceManager, not(eq(null)), "Found the chooser"); - - is(choiceManager.typeHandled(), strEq("CCSKILLIST"), - "got expected chooser"); - - try - { - Class cMClass = choiceManager.getClass(); - - Field aField = - (Field) TestHelper.findField(cMClass, "numberOfChoices"); - is(aField.get(choiceManager), eq(3)); - - aField = (Field) TestHelper.findField(cMClass, "choices"); - List choices = (List) aField.get(choiceManager); - is(choices.size(), eq(1)); - is(choices.get(0), strEq("Foo,Bar,Baz,Qux")); - } - catch (IllegalAccessException e) - { - System.out.println(e); - } - } -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |