[pcgen-commit-svn] SF.net SVN: pcgen: [531] Trunk/pcgen/code/src/java/pcgen/core

[<nu...@us...>]

Revision: 531
Author:   nuance
Date:     2006-03-30 12:09:44 -0800 (Thu, 30 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/pcgen/?rev=531&view=rev

Log Message:
-----------
Remove some useless parameters

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/PObject.java
    Trunk/pcgen/code/src/java/pcgen/core/PObjectUtilities.java
    Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbility.java
    Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilityList.java
    Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSpecialAbilities.java
Modified: Trunk/pcgen/code/src/java/pcgen/core/PObject.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PObject.java	2006-03-30 20:03:40 UTC (rev 530)
+++ Trunk/pcgen/code/src/java/pcgen/core/PObject.java	2006-03-30 20:09:44 UTC (rev 531)
@@ -1824,17 +1824,34 @@
 	/**
 	 * Get the choices for this PC
 	 * @param aChoice
-	 * @param selectedBonusList
 	 * @param aPC
 	 */
-	public final void getChoices(final String aChoice, final List selectedBonusList, final PlayerCharacter aPC)
+	public final void getChoices(
+			final String          aChoice,
+			final PlayerCharacter aPC)
 	{
 		final List availableList = new ArrayList();
-		final List selectedList = new ArrayList();
-		ChooserUtilities.getChoices(this, aChoice, selectedBonusList, availableList, selectedList, true, aPC);
+		final List selectedList  = new ArrayList();
+		ChooserUtilities.getChoices(this, aChoice, availableList, selectedList, aPC);
 	}
 
 	/**
+	 * Get the choices for this PC
+	 * @param aChoice
+	 * @param availableList
+	 * @param selectedList
+	 * @param aPC
+	 */
+	final void getChoices(
+			final String          aChoice, 
+			final List            availableList,
+			final List            selectedList,
+			final PlayerCharacter aPC)
+	{
+		ChooserUtilities.getChoices(this, aChoice, availableList, selectedList, aPC);
+	}
+
+	/**
 	 * Set the DR
 	 * @param drString
 	 */
@@ -2968,7 +2985,7 @@
 	 */
 	public void makeChoices(final PlayerCharacter aPC)
 	{
-		getChoices(getChoiceString(), null, aPC);
+		getChoices(getChoiceString(), aPC);
 	}
 
 	/**
@@ -3667,11 +3684,6 @@
 		}
 	}
 
-	final void getChoices(final String aChoice, final List selectedBonusList, final List availableList, final List selectedList, final PlayerCharacter aPC)
-	{
-		ChooserUtilities.getChoices(this, aChoice, selectedBonusList, availableList, selectedList, true, aPC);
-	}
-
 	final void setPreReq(final int index, final Prerequisite aString)
 	{
 		preReqList.set(index, aString);

Modified: Trunk/pcgen/code/src/java/pcgen/core/PObjectUtilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PObjectUtilities.java	2006-03-30 20:03:40 UTC (rev 530)
+++ Trunk/pcgen/code/src/java/pcgen/core/PObjectUtilities.java	2006-03-30 20:09:44 UTC (rev 531)
@@ -122,7 +122,7 @@
 			aChoiceString.startsWith("ARMORPROF|")  ||
 			aChoiceString.startsWith("SHIELDPROF|"))
 		{
-			obj.getChoices(aChoiceString, null, availableList, selectedList, aPC);
+			obj.getChoices(aChoiceString, availableList, selectedList, aPC);
 
 			return false;
 		}

Modified: Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbility.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbility.java	2006-03-30 20:03:40 UTC (rev 530)
+++ Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbility.java	2006-03-30 20:09:44 UTC (rev 531)
@@ -232,7 +232,7 @@
 			aBonusList.add(aTok.nextToken());
 		}
 
-		getChoices(choices, aBonusList, aPC);
+		getChoices(choices, aPC);
 	}
 
 	/**

Modified: Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilityList.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilityList.java	2006-03-30 20:03:40 UTC (rev 530)
+++ Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilityList.java	2006-03-30 20:09:44 UTC (rev 531)
@@ -116,7 +116,7 @@
 
 			if ((theChoice != null) && (theChoice.length() > 0))
 			{
-				owner.getChoices(theChoice, selectedBonusList, aPC);
+				owner.getChoices(theChoice, aPC);
 			}
 			else if (selectedBonusList.size() > 0)
 			{

Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSpecialAbilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSpecialAbilities.java	2006-03-30 20:03:40 UTC (rev 530)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSpecialAbilities.java	2006-03-30 20:09:44 UTC (rev 531)
@@ -701,7 +701,7 @@
 				if (profBonusObject instanceof CharacterDomain)
 				{
 					final Domain aDomain = ((CharacterDomain) profBonusObject).getDomain();
-					aDomain.getChoices(aDomain.getChoiceString(), new ArrayList(), pc);
+					aDomain.getChoices(aDomain.getChoiceString(), pc);
 				}
 				else
 				{
@@ -712,21 +712,21 @@
 						profWeapons = ((PCClass) profBonusObject).getWeaponProfBonus();
 						((PCClass) profBonusObject).getChoices("WEAPONPROF|1|"
 						    + CoreUtility.join(profWeapons, "[WEAPONPROF]|")
-						    + PropertyFactory.getString("in_proficiency"), new ArrayList(), pc);
+						    + PropertyFactory.getString("in_proficiency"), pc);
 					}
 					else if (profBonusObject instanceof Race)
 					{
 						profWeapons = ((Race) profBonusObject).getWeaponProfBonus();
 						((Race) profBonusObject).getChoices("WEAPONPROF|1|"
 						    + CoreUtility.join(profWeapons, "[WEAPONPROF]|")
-						    + PropertyFactory.getString("in_proficiency"), new ArrayList(), pc);
+						    + PropertyFactory.getString("in_proficiency"), pc);
 					}
 					else if (profBonusObject instanceof PCTemplate)
 					{
 						profWeapons = ((PCTemplate) profBonusObject).getWeaponProfBonus();
 						((PCTemplate) profBonusObject).getChoices("WEAPONPROF|1|"
 						    + CoreUtility.join(profWeapons, "[WEAPONPROF]|")
-						    + PropertyFactory.getString("in_proficiency"), new ArrayList(), pc);
+						    + PropertyFactory.getString("in_proficiency"), pc);
 					}
 				}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.