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

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

Revision: 16357
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16357&view=rev
Author:   zaister
Date:     2012-02-29 15:43:57 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Abilities, etc missing total granted / spent 
Issue#: CODE-1297

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/facade/CharacterFacade.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
    Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ability/CategoryTableModel.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/facade/CharacterFacade.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/facade/CharacterFacade.java	2012-02-29 15:31:42 UTC (rev 16356)
+++ Trunk/pcgen/code/src/java/pcgen/core/facade/CharacterFacade.java	2012-02-29 15:43:57 UTC (rev 16357)
@@ -165,6 +165,8 @@
 	 */
 	public int getClassLevel(ClassFacade c);
 
+	public int getTotalSelections(AbilityCategoryFacade category);
+
 	public int getRemainingSelections(AbilityCategoryFacade category);
 
 	public void setRemainingSelection(AbilityCategoryFacade category,

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java	2012-02-29 15:31:42 UTC (rev 16356)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java	2012-02-29 15:43:57 UTC (rev 16357)
@@ -682,6 +682,24 @@
 	}
 
 	/**
+	 * Get the total number of selections for this category.
+	 * @param categoryFacade The ability category to be retrieved.
+	 * @return The total number of choices.
+	 */
+	public int getTotalSelections(AbilityCategoryFacade categoryFacade)
+	{
+		if (categoryFacade == null
+			|| !(categoryFacade instanceof AbilityCategory))
+		{
+			return 0;
+		}
+
+		AbilityCategory category = (AbilityCategory) categoryFacade;
+		BigDecimal pool = theCharacter.getTotalAbilityPool(category);
+		return pool.intValue();
+	}
+
+	/**
 	 * Get the number of selections that are remaining for this category.
 	 * @param categoryFacade The ability category to be retrieved.
 	 * @return The number of choices left.

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2012-02-29 15:31:42 UTC (rev 16356)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2012-02-29 15:43:57 UTC (rev 16357)
@@ -567,6 +567,14 @@
 	}
 	
 	/* (non-Javadoc)
+	 * @see pcgen.core.facade.CharacterFacade#getTotalSelections(pcgen.core.facade.AbilityCategoryFacade)
+	 */
+	public int getTotalSelections(AbilityCategoryFacade category)
+	{
+		return characterAbilities.getTotalSelections(category);
+	}
+
+	/* (non-Javadoc)
 	 * @see pcgen.core.facade.CharacterFacade#getRemainingSelections(pcgen.core.facade.AbilityCategoryFacade)
 	 */
 	public int getRemainingSelections(AbilityCategoryFacade category)

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ability/CategoryTableModel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ability/CategoryTableModel.java	2012-02-29 15:31:42 UTC (rev 16356)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ability/CategoryTableModel.java	2012-02-29 15:43:57 UTC (rev 16357)
@@ -51,13 +51,13 @@
 
 	public int getColumnCount()
 	{
-		return 2;
+		return 3;
 	}
 
 	@Override
 	public boolean isCellEditable(int rowIndex, int columnIndex)
 	{
-		if (columnIndex == 1)
+		if (columnIndex == 2)
 		{
 			return true;
 		}
@@ -74,21 +74,27 @@
 	@Override
 	public String getColumnName(int column)
 	{
-		if (column == 0)
+		switch (column)
 		{
-			return "Category";
+			case 0:
+				return "Category";
+			case 1:
+				return "Total";
+			case 2:
+				return "Remaining";
+			default:
+				throw new IndexOutOfBoundsException();
 		}
-		return "Remaining";
 	}
 
 	@Override
 	public Class<?> getColumnClass(int columnIndex)
 	{
-		if (columnIndex == 1)
+		if (columnIndex == 0)
 		{
-			return Integer.class;
+			return Object.class;
 		}
-		return Object.class;
+		return Integer.class;
 	}
 
 	@Override
@@ -99,6 +105,8 @@
 			case 0:
 				return category;
 			case 1:
+				return character.getTotalSelections(category);
+			case 2:
 				return character.getRemainingSelections(category);
 			default:
 				throw new IndexOutOfBoundsException();

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