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

[<jde...@us...>]

Revision: 1747
          http://svn.sourceforge.net/pcgen/?rev=1747&view=rev
Author:   jdempsey
Date:     2006-12-09 14:22:52 -0800 (Sat, 09 Dec 2006)

Log Message:
-----------
Fix bug #1488700 - Need VISION on Templates

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java
    Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java	2006-12-09 21:35:03 UTC (rev 1746)
+++ Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java	2006-12-09 22:22:52 UTC (rev 1747)
@@ -34,6 +34,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
+
 import pcgen.core.levelability.LevelAbility;
 import pcgen.core.prereq.PrereqHandler;
 import pcgen.core.prereq.Prerequisite;
@@ -1406,7 +1407,8 @@
 			aTemp.hitDiceStrings = new ArrayList<String>(hitDiceStrings);
 		}
 
-		if (abilityCatStore != null) {
+		if (abilityCatStore != null && !abilityCatStore.isEmpty())
+		{
 			aTemp.abilityCatStore = new AbilityStore();
 			aTemp.abilityCatStore.addAbilityInfo(
 					abilityCatStore.getParsableStringRepresentation(), "", "|", false, false);

Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java	2006-12-09 21:35:03 UTC (rev 1746)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java	2006-12-09 22:22:52 UTC (rev 1747)
@@ -911,6 +911,13 @@
 				cmv.setMoveRatesFlag(pnlMovement.getMoveRateType());
 				thisPCTemplate.setMovement(cmv);
 
+				thisPCTemplate.clearVisionList();
+				List<Vision> tplVisionList = pnlVision.getVision();
+				for (Vision vis : tplVisionList) 
+				{
+					thisPCTemplate.addVision(vis);
+				}
+
 				//
 				// Save granted templates
 				//
@@ -1171,7 +1178,7 @@
 		List selectedList2 = new ArrayList();
 		List aList;
 		List movementValues;
-		List visionValues;
+		List<String> visionValues;
 		List<Vision> vision;
 		List naturalAttacks;
 
@@ -1539,20 +1546,7 @@
 				// Populate the vision panel
 				//
 				vision = thisPObject.getVision();
-
-				visionValues = new ArrayList();
-
-				if (vision != null)
-				{
-					for (Vision vis : vision)
-					{
-						final StringBuffer visionString = new StringBuffer(25);
-						visionString.append(vis.getType());
-						visionString.append(',').append(vis.getDistance());
-						visionValues.add(visionString.toString());
-					}
-				}
-
+				visionValues = buildVisionValues(vision);
 				pnlVision.setSelectedList(visionValues);
 
 				//
@@ -1914,6 +1908,13 @@
 				pnlMovement.setSelectedList(movementValues);
 
 				//
+				// Populate the vision panel
+				//
+				vision = thisPObject.getVision();
+				visionValues = buildVisionValues(vision);
+				pnlVision.setSelectedList(visionValues);
+
+				//
 				// Populate the specialabilities panel
 				//
 				selectedList.clear();
@@ -2290,6 +2291,30 @@
 	}
 
 	/**
+	 * Build up a list of the vision strings based on a list of 
+	 * vision objects. 
+	 * @param vision The vision objects
+	 * @return List of vision strings
+	 */
+	private List<String> buildVisionValues(List<Vision> vision)
+	{
+		List<String> visionValues;
+		visionValues = new ArrayList<String>();
+
+		if (vision != null)
+		{
+			for (Vision vis : vision)
+			{
+				final StringBuffer visionString = new StringBuffer(25);
+				visionString.append(vis.getType());
+				visionString.append(',').append(vis.getDistance());
+				visionValues.add(visionString.toString());
+			}
+		}
+		return visionValues;
+	}
+
+	/**
 	 * Move the named Weapon Proficiency from the available list to the
 	 * selected list.
 	 * @param availableList The list of available weapon prof names
@@ -2524,6 +2549,7 @@
 				break;
 
 			case EditorConstants.EDIT_TEMPLATE:
+				pnlVision = new VisionPanel();
 				pnlMovement = new MovementPanel(false);
 				pnlLevelAbilities = new LevelAbilitiesPanel();
 				pnlLanguages = new AvailableSelectedPanel(true);


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