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

[<za...@us...>]

Revision: 2200
          http://svn.sourceforge.net/pcgen/?rev=2200&view=rev
Author:   zaister
Date:     2007-02-23 05:19:17 -0800 (Fri, 23 Feb 2007)

Log Message:
-----------
[ 1585680 ] Chooser and Skill conditionals support
No longer showing VISIBLE:NO/EXPORT skills in skill choosers

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java
    Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java
    Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillsNamedChoiceManager.java
    Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManager.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java	2007-02-23 13:16:28 UTC (rev 2199)
+++ Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java	2007-02-23 13:19:17 UTC (rev 2200)
@@ -31,6 +31,7 @@
 import pcgen.core.PObject;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.Skill;
+import pcgen.util.enumeration.Visibility;
 
 /**
  * This is one of the choosers that deals with choosing a skill.
@@ -89,7 +90,7 @@
 
 		else // if it was LIST
 		{
-			for ( Skill skill : Globals.getSkillList() )
+			for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) )
 			{
 				final String rootName = skill.getRootName();
 				final int rootNameLength = rootName.length();
@@ -136,7 +137,7 @@
 			Ability ability = (Ability) pobject;
 			if (rootArrayList.contains(item))
 			{
-				for ( Skill skill : Globals.getSkillList() )
+				for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) )
 				{
 					if (skill.getRootName().equalsIgnoreCase(item))
 					{

Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java	2007-02-23 13:16:28 UTC (rev 2199)
+++ Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java	2007-02-23 13:19:17 UTC (rev 2200)
@@ -29,6 +29,7 @@
 import pcgen.core.PObject;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.Skill;
+import pcgen.util.enumeration.Visibility;
 
 /**
  * This is one of the choosers that deals with choosing a skill.
@@ -84,7 +85,7 @@
 
 		else // if it was LIST
 		{
-			for ( Skill skill : Globals.getSkillList() )
+			for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) )
 			{
 				if ((skill.costForPCClassList(aPc.getClassList(), aPc) == Globals.getGameModeSkillCost_Class()) || skill.isExclusive())
 				{

Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillsNamedChoiceManager.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillsNamedChoiceManager.java	2007-02-23 13:16:28 UTC (rev 2199)
+++ Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillsNamedChoiceManager.java	2007-02-23 13:19:17 UTC (rev 2200)
@@ -28,6 +28,7 @@
 import pcgen.core.PObject;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.Skill;
+import pcgen.util.enumeration.Visibility;
 
 /**
  * This is the chooser that deals with choosing a skill.
@@ -73,7 +74,7 @@
 
 			if (token.startsWith("TYPE.") || token.startsWith("TYPE="))
 			{
-				for ( Skill skill : Globals.getSkillList() )
+				for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) )
 				{
 					if (skill.isType(token.substring(5)))
 					{
@@ -84,7 +85,7 @@
 
 			if ("ALL".equals(token))
 			{
-				for ( Skill skill : Globals.getSkillList() )
+				for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) )
 				{
 					availableList.add(skill.getKeyName());
 				}
@@ -92,7 +93,7 @@
 
 			if ("CLASS".equals(token))
 			{
-				for ( Skill skill : Globals.getSkillList() )
+				for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) )
 				{
 					if (skill.costForPCClassList(aPc.getClassList(), aPc) == Globals.getGameModeSkillCost_Class())
 					{
@@ -103,7 +104,7 @@
 
 			if ("CROSSCLASS".equals(token))
 			{
-				for ( Skill skill : Globals.getSkillList() )
+				for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) )
 				{
 					if (skill.costForPCClassList(aPc.getClassList(), aPc) > Globals.getGameModeSkillCost_Class())
 					{
@@ -114,7 +115,7 @@
 
 			if ("EXCLUSIVE".equals(token))
 			{
-				for ( Skill skill : Globals.getSkillList() )
+				for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) )
 				{
 					if (skill.costForPCClassList(aPc.getClassList(), aPc) == Globals.getGameModeSkillCost_Exclusive())
 					{
@@ -125,7 +126,7 @@
 
 			if ("NORANK".equals(token))
 			{
-				for ( Skill skill : Globals.getSkillList() )
+				for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) )
 				{
 					final Skill pcSkill = aPc.getSkillKeyed(skill.getKeyName());
 
@@ -142,7 +143,7 @@
 				token = token.substring(0, token.length() - 1);
 			}
 
-			for ( Skill skill : Globals.getSkillList() )
+			for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) )
 			{
 				if (skill.getKeyName().equals(token) || (startsWith && skill.getKeyName().startsWith(token)))
 				{

Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManager.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManager.java	2007-02-23 13:16:28 UTC (rev 2199)
+++ Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManager.java	2007-02-23 13:19:17 UTC (rev 2200)
@@ -28,6 +28,7 @@
 import pcgen.core.PObject;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.Skill;
+import pcgen.util.enumeration.Visibility;
 
 /**
  * This is the chooser that deals with choosing a skill.
@@ -73,7 +74,7 @@
 		if (pobject != null && pobject instanceof Ability)
 		{
 			Ability anAbility = (Ability) pobject;
-			for ( Skill skill : Globals.getSkillList() )
+			for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) )
 			{
 				if (skill.getRootName().equalsIgnoreCase(item))
 				{


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