PCGen :: An RPG Character Generator

Revision: 18976
          http://sourceforge.net/p/pcgen/code/18976
Author:   thpr
Date:     2013-01-02 22:46:48 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
Some Facet cleanup, ensuring .equals() in various classes to allow PlayerCharacter cache comparison

Issue#: CODE-1975

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/base/AbstractListFacet.java
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/base/AbstractSourcedListFacet.java
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/fact/RegionFacet.java
    Trunk/pcgen/code/src/java/pcgen/core/NoteItem.java

Added Paths:
-----------
    Trunk/pcgen/code/src/java/pcgen/base/lang/ObjectUtil.java

Added: Trunk/pcgen/code/src/java/pcgen/base/lang/ObjectUtil.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/base/lang/ObjectUtil.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/pcgen/base/lang/ObjectUtil.java	2013-01-02 22:46:48 UTC (rev 18976)
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2013 (C) Tom Parker <thpr@...>
+ * 
+ * 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
+ */
+package pcgen.base.lang;
+
+public class ObjectUtil
+{
+
+	public static <T> boolean compareWithNull(T o1, T o2)
+	{
+		return (o1 == o2) || ((o1 != null) && o1.equals(o2));
+	}
+
+}

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/base/AbstractListFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/base/AbstractListFacet.java	2013-01-02 22:45:30 UTC (rev 18975)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/base/AbstractListFacet.java	2013-01-02 22:46:48 UTC (rev 18976)
@@ -126,6 +126,10 @@
 			{
 				fireDataFacetChangeEvent(id, obj,
 						DataFacetChangeEvent.DATA_REMOVED);
+				if (componentSet.isEmpty())
+				{
+					removeCache(id, thisClass);
+				}
 			}
 		}
 	}

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/base/AbstractSourcedListFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/base/AbstractSourcedListFacet.java	2013-01-02 22:45:30 UTC (rev 18975)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/base/AbstractSourcedListFacet.java	2013-01-02 22:46:48 UTC (rev 18976)
@@ -494,6 +494,10 @@
 		{
 			componentMap.remove(obj);
 			fireDataFacetChangeEvent(id, obj, DataFacetChangeEvent.DATA_REMOVED);
+			if (componentMap.isEmpty())
+			{
+				removeCache(id, getClass());
+			}
 		}
 		return returnVal;
 	}
@@ -529,6 +533,10 @@
 							DataFacetChangeEvent.DATA_REMOVED);
 				}
 			}
+			if (componentMap.isEmpty())
+			{
+				removeCache(id, getClass());
+			}
 		}
 	}
 

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/fact/RegionFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/fact/RegionFacet.java	2013-01-02 22:45:30 UTC (rev 18975)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/fact/RegionFacet.java	2013-01-02 22:46:48 UTC (rev 18976)
@@ -17,6 +17,7 @@
  */
 package pcgen.cdom.facet.fact;
 
+import pcgen.base.lang.ObjectUtil;
 import pcgen.cdom.base.Constants;
 import pcgen.cdom.enumeration.CharID;
 import pcgen.cdom.enumeration.ObjectKey;
@@ -358,6 +359,32 @@
 		public Region region;
 
 		public SubRegion subregion;
+		
+		@Override
+		public String toString()
+		{
+			return region + " " + subregion + " " + cachedRegion;
+		}
+		
+		@Override
+		public int hashCode()
+		{
+			return (region == null ? -1 : region.hashCode());
+		}
+		
+		@Override
+		public boolean equals(Object o)
+		{
+			if (o instanceof RegionCacheInfo)
+			{
+				RegionCacheInfo other = (RegionCacheInfo) o;
+				return ObjectUtil.compareWithNull(region, other.region)
+					&& ObjectUtil.compareWithNull(subregion, other.subregion)
+					&& ObjectUtil.compareWithNull(cachedRegion, other.cachedRegion);
+			}
+			return false;
+		}
+
 	}
 
 	/**

Modified: Trunk/pcgen/code/src/java/pcgen/core/NoteItem.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/NoteItem.java	2013-01-02 22:45:30 UTC (rev 18975)
+++ Trunk/pcgen/code/src/java/pcgen/core/NoteItem.java	2013-01-02 22:46:48 UTC (rev 18976)
@@ -148,4 +148,23 @@
 			return null;
 		}
 	}
+
+	@Override
+	public int hashCode()
+	{
+		return 17 * id_value ^ 23 * id_parent;
+	}
+
+	@Override
+	public boolean equals(Object o)
+	{
+		if (o instanceof NoteItem)
+		{
+			NoteItem other = (NoteItem) o;
+			return (id_parent == other.id_parent)
+				&& (id_value == other.id_value) && (name.equals(other.name))
+				&& (value.equals(other.value)) && (required == other.required);
+		}
+		return false;
+	}
 }

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

Revision: 18981
          http://sourceforge.net/p/pcgen/code/18981
Author:   thpr
Date:     2013-01-03 04:14:11 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
.equals and .hashCode in the core, for facet comparison

Issue#: CODE-1975

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/analysis/LevelFacet.java
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/model/ClassFacet.java
    Trunk/pcgen/code/src/java/pcgen/core/PObject.java
    Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/analysis/LevelFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/analysis/LevelFacet.java	2013-01-02 23:43:32 UTC (rev 18980)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/analysis/LevelFacet.java	2013-01-03 04:14:11 UTC (rev 18981)
@@ -206,6 +206,24 @@
 	{
 		public int monsterLevels;
 		public int nonMonsterLevels;
+		
+		@Override
+		public int hashCode()
+		{
+			return monsterLevels * nonMonsterLevels;
+		}
+		
+		@Override
+		public boolean equals(Object o)
+		{
+			if (o instanceof LevelCacheInfo)
+			{
+				LevelCacheInfo other = (LevelCacheInfo) o;
+				return monsterLevels == other.monsterLevels
+					&& nonMonsterLevels == other.nonMonsterLevels;
+			}
+			return false;
+		}
 	}
 
 	@Override

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/model/ClassFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/model/ClassFacet.java	2013-01-02 23:43:32 UTC (rev 18980)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/model/ClassFacet.java	2013-01-03 04:14:11 UTC (rev 18981)
@@ -567,6 +567,23 @@
 		{
 			return map.containsKey(pcc);
 		}
+
+		@Override
+		public int hashCode()
+		{
+			return map.hashCode();
+		}
+
+		@Override
+		public boolean equals(Object o)
+		{
+			if (o instanceof ClassInfo)
+			{
+				ClassInfo other = (ClassInfo) o;
+				return map.equals(other.map) && levelmap.equals(other.levelmap);
+			}
+			return false;
+		}
 	}
 
 	@Override

Modified: Trunk/pcgen/code/src/java/pcgen/core/PObject.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PObject.java	2013-01-02 23:43:32 UTC (rev 18980)
+++ Trunk/pcgen/code/src/java/pcgen/core/PObject.java	2013-01-03 04:14:11 UTC (rev 18981)
@@ -134,6 +134,12 @@
 		return thisKey.equalsIgnoreCase( otherKey );
 	}
 
+	@Override
+	public int hashCode()
+	{
+		return getKeyName().hashCode();
+	}
+
 	/**
 	 * Set the name (sets keyname also)
 	 * @param aString

Modified: Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java	2013-01-02 23:43:32 UTC (rev 18980)
+++ Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java	2013-01-03 04:14:11 UTC (rev 18981)
@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import pcgen.base.lang.ObjectUtil;
 import pcgen.core.Globals;
 import pcgen.core.PCClass;
 import pcgen.core.PCStat;
@@ -348,4 +349,29 @@
 	{
 		skillPointsGained = arg;
 	}
+
+	@Override
+	public int hashCode()
+	{
+		return classLevel * 17 + classKeyName.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object o)
+	{
+		if (o instanceof PCLevelInfo)
+		{
+			PCLevelInfo other = (PCLevelInfo) o;
+			return classLevel == other.classLevel
+				&& skillPointsGained == other.skillPointsGained
+				&& skillPointsRemaining == other.skillPointsRemaining
+				&& classKeyName.equals(other.classKeyName)
+				&& ObjectUtil.compareWithNull(statsPreModified,
+					other.statsPreModified)
+				&& ObjectUtil.compareWithNull(statsPreModified,
+					other.statsPreModified);
+		}
+		return false;
+	}
+
 }

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

Revision: 18989
          http://sourceforge.net/p/pcgen/code/18989
Author:   jdempsey
Date:     2013-01-03 06:32:17 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
Fix bug: Errors Creating Blackguard
Issue#: CODE-1970

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
    Trunk/pcgen/code/src/java/pcgen/core/analysis/ExchangeLevelApplication.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java	2013-01-03 06:31:38 UTC (rev 18988)
+++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java	2013-01-03 06:32:17 UTC (rev 18989)
@@ -2157,6 +2157,11 @@
 				if (pcc != null)
 				{
 					Double curRank = getSkillRankForClass(aSkill, pcc);
+					if (curRank == null)
+					{
+						Logging.errorPrint("Got null on ranks for " + aSkill + " in class " + pcc);
+						curRank = 0.0d;
+					}
 					// Only add the cost for skills associated with a class.
 					// Skill ranks from feats etc are free.
 					final int cost = getSkillCostForClass(aSkill, pcc).getCost();
@@ -6475,12 +6480,17 @@
 		final int toLevel = getLevel(toClass);
 
 		//Capture necessary information
-		Integer[] hpArray = new Integer[iCount];
+		Integer[] hpArray = new Integer[iCount+toLevel];
 		for (int i = 0; i < iCount; i++)
 		{
-			PCClassLevel frompcl = getActiveClassLevel(fromClass, i);
+			PCClassLevel frompcl = getActiveClassLevel(fromClass, i+iFromLevel);
 			hpArray[i] = getHP(frompcl);
 		}
+		for (int i = 0; i < toLevel; i++)
+		{
+			PCClassLevel topcl = getActiveClassLevel(toClass, i);
+			hpArray[i+iCount] = getHP(topcl);
+		}
 
 		for (int i = 0; i < iCount; i++)
 		{
@@ -6492,7 +6502,7 @@
 		toClass.setLevel(toLevel + iCount, this);
 
 		//Restore capture info to new class
-		for (int i = 0; i < iCount; i++)
+		for (int i = 0; i < iCount+toLevel; i++)
 		{
 			PCClassLevel topcl = getActiveClassLevel(toClass, i);
 			setHP(topcl, hpArray[i]);

Modified: Trunk/pcgen/code/src/java/pcgen/core/analysis/ExchangeLevelApplication.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/analysis/ExchangeLevelApplication.java	2013-01-03 06:31:38 UTC (rev 18988)
+++ Trunk/pcgen/code/src/java/pcgen/core/analysis/ExchangeLevelApplication.java	2013-01-03 06:32:17 UTC (rev 18989)
@@ -51,15 +51,15 @@
 	
 				if (aClass != null)
 				{
-					final int iLevel = aPC.getLevel(aClass);
+					final int iNumOrigClassLevel = aPC.getLevel(aClass);
 	
-					if (iLevel >= iMinLevel)
+					if (iNumOrigClassLevel >= iMinLevel)
 					{
-						iMaxDonation = Math.min(iMaxDonation, iLevel - iLowest);
+						iMaxDonation = Math.min(iMaxDonation, iNumOrigClassLevel - iLowest + 1);
 						if (newcl.hasMaxLevel())
 						{
 							iMaxDonation =
-									Math.min(iMaxDonation, newcl.getSafe(IntegerKey.LEVEL_LIMIT) - 1);
+									Math.min(iMaxDonation, newcl.getSafe(IntegerKey.LEVEL_LIMIT) - aPC.getLevel(newcl));
 						}
 	
 						if (iMaxDonation > 0)

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2013-01-03 06:31:38 UTC (rev 18988)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2013-01-03 06:32:17 UTC (rev 18989)
@@ -713,6 +713,7 @@
 		//SettingsHandler.setShowStatDialogAtLevelUp(false);
 
 		int oldLevel = charLevelsFacade.getSize();
+		boolean needFullRefresh = false;
 
 		for (ClassFacade classFacade : classes)
 		{
@@ -732,6 +733,10 @@
 					// The level change was rejected - no further processing needed.
 					return;
 				}
+				if (((PCClass) classFacade).containsKey(ObjectKey.EXCHANGE_LEVEL))
+				{
+					needFullRefresh = true;
+				}
 			}
 			if (!pcClasses.contains(classFacade))
 			{
@@ -746,7 +751,11 @@
 		
 		// Calculate any active bonuses
 		theCharacter.calcActiveBonuses();
-		
+
+		if (needFullRefresh)
+		{
+			refreshClassLevelModel();
+		}
 		postLevellingUpdates();
 		delegate.showLevelUpInfo(this, oldLevel);
 	}

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

Revision: 18993
          http://sourceforge.net/p/pcgen/code/18993
Author:   jdempsey
Date:     2013-01-04 02:09:09 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Numerically sort CHOOSE choosers
* Implemented for equipment modifiers.
Issue#: CODE-701

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/EquipmentChoice.java
    Trunk/pcgen/code/src/java/pcgen/core/EquipmentList.java
    Trunk/pcgen/code/src/java/pcgen/core/analysis/EquipmentChoiceDriver.java
    Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChooserFacadeImpl.java
    Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties

Added Paths:
-----------
    Trunk/pcgen/code/src/java/pcgen/util/SignedInteger.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/EquipmentChoice.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/EquipmentChoice.java	2013-01-04 02:03:03 UTC (rev 18992)
+++ Trunk/pcgen/code/src/java/pcgen/core/EquipmentChoice.java	2013-01-04 02:09:09 UTC (rev 18993)
@@ -35,6 +35,7 @@
 import pcgen.rules.context.ReferenceContext;
 import pcgen.util.Delta;
 import pcgen.util.Logging;
+import pcgen.util.SignedInteger;
 import pcgen.util.enumeration.Visibility;
 
 /**
@@ -69,7 +70,7 @@
 	private int pool = 0;
 	private String title = null;
 
-	private List<String> availableList = new ArrayList<String>();
+	private List<Object> availableList = new ArrayList<Object>();
 
 	/**
 	 * Default constructor for the equipment choice class.
@@ -97,19 +98,19 @@
 	{
 		if (neverEmpty && availableList.isEmpty())
 		{
-			final List<String> temp = new ArrayList<String>();
+			final List<Object> temp = new ArrayList<Object>();
 			temp.add("");
 			return new EquipChoiceIterator(temp);
 		}
-		final List<String> finalList;
+		final List<Object> finalList;
 
 		// Account for secondary values (sent as <primary>|<secondary>)
 		if (getMinValue() < getMaxValue())
 		{
-			finalList = new ArrayList<String>();
+			finalList = new ArrayList<Object>();
 			for (int i = 0; i < availableList.size(); i++)
 			{
-				final String choice = availableList.get(i);
+				final String choice = String.valueOf(availableList.get(i));
 				if (choice.indexOf('|') < 0)
 				{
 					for (int j = getMinValue(); j <= getMaxValue(); j += getIncValue())
@@ -164,7 +165,7 @@
 	/**
 	 * @return Returns the availableList.
 	 */
-	public final List<String> getAvailableList()
+	public final List<Object> getAvailableList()
 	{
 		return availableList;
 	}
@@ -687,13 +688,13 @@
 			{
 				if (!skipZero || j != 0)
 				{
-					if (this.isNoSign() && (j >= 0))
+					if (this.isNoSign())
 					{
-						this.getAvailableList().add(Integer.toString(j));
+						this.getAvailableList().add(j);
 					}
 					else
 					{
-						this.getAvailableList().add(Delta.toString(j));
+						this.getAvailableList().add(new SignedInteger(j));
 					}
 				}
 			}
@@ -702,12 +703,12 @@
 		}
 	}
 
-	private static class EquipChoiceIterator implements Iterator<String>
+	private static class EquipChoiceIterator implements Iterator<Object>
 	{
-		List<String> choiceList;
+		List<Object> choiceList;
 		int currPos;
 
-		EquipChoiceIterator(final List<String> list)
+		EquipChoiceIterator(final List<Object> list)
 		{
 			choiceList = list;
 			currPos=0;
@@ -726,7 +727,7 @@
 		 * @see java.util.Iterator#next()
 		 */
         @Override
-		public String next()
+		public Object next()
 		{
 			return choiceList.get(currPos++);
 		}

Modified: Trunk/pcgen/code/src/java/pcgen/core/EquipmentList.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/EquipmentList.java	2013-01-04 02:03:03 UTC (rev 18992)
+++ Trunk/pcgen/code/src/java/pcgen/core/EquipmentList.java	2013-01-04 02:09:09 UTC (rev 18993)
@@ -452,9 +452,9 @@
 					final EquipmentChoice equipChoice = EquipmentChoiceDriver.buildEquipmentChoice(0, eq, eqMod, false, false, 0, null);
 
 					// Iterate over list, creating an item for each choice.
-					final Iterator<String> equipIter = equipChoice.getChoiceIterator(true);
+					final Iterator<Object> equipIter = equipChoice.getChoiceIterator(true);
 					for (; equipIter.hasNext();) {
-						final String mwChoice = equipIter.next();
+						final String mwChoice = String.valueOf(equipIter.next());
 						eq = eq.clone();
 						eq.addEqModifier(eqMod, true, null, mwChoice, equipChoice);
 
@@ -502,9 +502,9 @@
 				final EquipmentChoice equipChoice = EquipmentChoiceDriver.buildEquipmentChoice(0, eq, eqMasterwork, false, false, 0, null);
 
 				// Iterate over list, creating an item for each choice.
-				final Iterator<String> equipIter = equipChoice.getChoiceIterator(true);
+				final Iterator<Object> equipIter = equipChoice.getChoiceIterator(true);
 				for (; equipIter.hasNext();) {
-					final String choice = equipIter.next();
+					final String choice = String.valueOf(equipIter.next());
 					createItem(eq, eqMasterwork, null, choice, equipChoice);
 				}
 			}

Modified: Trunk/pcgen/code/src/java/pcgen/core/analysis/EquipmentChoiceDriver.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/analysis/EquipmentChoiceDriver.java	2013-01-04 02:03:03 UTC (rev 18992)
+++ Trunk/pcgen/code/src/java/pcgen/core/analysis/EquipmentChoiceDriver.java	2013-01-04 02:09:09 UTC (rev 18993)
@@ -26,11 +26,12 @@
 import pcgen.core.Equipment;
 import pcgen.core.EquipmentChoice;
 import pcgen.core.EquipmentModifier;
-import pcgen.core.Globals;
 import pcgen.core.PlayerCharacter;
-import pcgen.util.Delta;
+import pcgen.core.chooser.CDOMChooserFacadeImpl;
+import pcgen.core.facade.ChooserFacade.ChooserTreeViewType;
+import pcgen.system.LanguageBundle;
+import pcgen.util.SignedInteger;
 import pcgen.util.chooser.ChooserFactory;
-import pcgen.util.chooser.ChooserInterface;
 
 public class EquipmentChoiceDriver
 {
@@ -56,10 +57,7 @@
 			return true;
 		}
 
-		final ChooserInterface chooser = ChooserFactory.getChooserInstance();
-		chooser.setPoolFlag(false);
-		chooser.setVisible(false);
-		List<String> selectedList = parent.getAssociationList(eqMod);
+		List<Object> selectedList = new ArrayList<Object>(parent.getAssociationList(eqMod));
 
 		final EquipmentChoice equipChoice = buildEquipmentChoice(
 				pool,
@@ -70,24 +68,29 @@
 				selectedList.size(),
 				pc);
 
+		int effectiveChoices;
 		if (equipChoice.isBAdd())
 		{
-			chooser.setTotalChoicesAvail(selectedList.size() + equipChoice.getMaxSelect());
+			effectiveChoices = selectedList.size() + equipChoice.getMaxSelect();
 		}
 		else
 		{
-			chooser.setTotalChoicesAvail(selectedList.size());
+			effectiveChoices = selectedList.size();
 		}
 
-		chooser.setAllowsDups(equipChoice.isAllowDuplicates());
-		chooser.setSelectedListTerminator("|");
-		chooser.setTitle("Select " + equipChoice.getTitle() + " (" + eqMod.getDisplayName() + ")");
-		Globals.sortChooserLists(equipChoice.getAvailableList(), selectedList);
-		chooser.setAvailableList(equipChoice.getAvailableList());
-		chooser.setSelectedList(selectedList);
-		chooser.setVisible(true);
+		String title =
+				LanguageBundle.getFormattedString("in_equipChoiceMod", //$NON-NLS-1$
+					equipChoice.getTitle(), eqMod.getDisplayName(), "|");
+		CDOMChooserFacadeImpl<Object> chooserFacade =
+				new CDOMChooserFacadeImpl<Object>(
+						title, equipChoice.getAvailableList(), 
+					selectedList, effectiveChoices);
+		chooserFacade.setDefaultView(ChooserTreeViewType.NAME);
+		chooserFacade.setAllowsDups(equipChoice.isAllowDuplicates());
+		ChooserFactory.getDelegate().showGeneralChooser(chooserFacade);
+		
+		selectedList =  chooserFacade.getFinalSelected();
 
-		selectedList = chooser.getSelectedList();
 		setChoice(parent, eqMod, selectedList, equipChoice);
 
 		return parent.hasAssociations(eqMod);
@@ -95,18 +98,18 @@
 
 	public static void setChoice(Equipment parent, EquipmentModifier eqMod, final String choice, final EquipmentChoice equipChoice)
 	{
-		final List<String> tempList = new ArrayList<String>();
+		final List<Object> tempList = new ArrayList<Object>();
 		tempList.add(choice);
 		setChoice(parent, eqMod, tempList, equipChoice);
 	}
 
-	private static void setChoice(Equipment parent, EquipmentModifier eqMod, final List<String> selectedList, final EquipmentChoice equipChoice)
+	private static void setChoice(Equipment parent, EquipmentModifier eqMod, final List<Object> selectedList, final EquipmentChoice equipChoice)
 	{
 		parent.removeAllAssociations(eqMod);
 
 		for (int i = 0; i < selectedList.size(); i++)
 		{
-			String aString = selectedList.get(i);
+			String aString = String.valueOf(selectedList.get(i));
 
 			if (equipChoice.getMinValue() < equipChoice.getMaxValue())
 			{
@@ -114,7 +117,7 @@
 
 				if (idx < 0)
 				{
-					final List<String> secondaryChoice = new ArrayList<String>();
+					final List<SignedInteger> secondaryChoice = new ArrayList<SignedInteger>();
 
 					for (
 						int j = equipChoice.getMinValue();
@@ -123,25 +126,29 @@
 					{
 						if (j != 0)
 						{
-							secondaryChoice.add(Delta.toString(j));
+							secondaryChoice.add(new SignedInteger(j));
 						}
 					}
 
-					final ChooserInterface chooser = ChooserFactory.getChooserInstance();
-					chooser.setPoolFlag(false);
-					chooser.setVisible(false);
-					chooser.setTitle("Select modifier (" + aString + ")");
-					chooser.setAvailableList(secondaryChoice);
-					chooser.setSelectedList(new ArrayList<Object>());
-					chooser.setTotalChoicesAvail(1);
-					chooser.setVisible(true);
+					String title =
+							LanguageBundle.getFormattedString(
+								"in_equipChoiceSelectMod", aString); //$NON-NLS-1$
+					CDOMChooserFacadeImpl<SignedInteger> chooserFacade =
+							new CDOMChooserFacadeImpl<SignedInteger>(title,
+								secondaryChoice,
+								new ArrayList<SignedInteger>(), 1);
+					chooserFacade.setDefaultView(ChooserTreeViewType.NAME);
+					chooserFacade.setAllowsDups(equipChoice.isAllowDuplicates());
+					ChooserFactory.getDelegate().showGeneralChooser(chooserFacade);
+					
+					List<SignedInteger> chosenList =  chooserFacade.getFinalSelected();
 
-					if (chooser.getSelectedList().size() == 0)
+					if (chosenList.size() == 0)
 					{
 						continue;
 					}
 
-					aString += ('|' + ((String) chooser.getSelectedList().get(0)));
+					aString += ('|' + chosenList.get(0).toString());
 				}
 			}
 

Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChooserFacadeImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChooserFacadeImpl.java	2013-01-04 02:03:03 UTC (rev 18992)
+++ Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChooserFacadeImpl.java	2013-01-04 02:09:09 UTC (rev 18993)
@@ -22,9 +22,13 @@
  */
 package pcgen.core.chooser;
 
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
+
 import pcgen.base.lang.StringUtil;
 import pcgen.cdom.base.CDOMObject;
 import pcgen.cdom.enumeration.ListKey;
@@ -40,6 +44,7 @@
 import pcgen.core.facade.util.DefaultListFacade;
 import pcgen.core.facade.util.ListFacade;
 import pcgen.system.LanguageBundle;
+import pcgen.util.SortKeyAware;
 
 /**
  * The Class <code>GeneraChooserFacadeBase</code> is a base from which a 
@@ -83,6 +88,8 @@
 	private boolean dupsAllowed = false;
 
 	private boolean requireCompleteSelection;
+
+	private final String stringDelimiter;
 	
 	/**
 	 * Create a new instance of GeneraChooserFacadeBase with default localised 
@@ -102,8 +109,31 @@
 			LanguageBundle.getString("in_selected"),  //$NON-NLS-1$
 			LanguageBundle.getString("in_selRemain"),  //$NON-NLS-1$
 			LanguageBundle.getString("in_add"), //$NON-NLS-1$
-			LanguageBundle.getString("in_remove")); //$NON-NLS-1$
+			LanguageBundle.getString("in_remove"), null); //$NON-NLS-1$
 	}
+	
+	/**
+	 * Create a new instance of GeneraChooserFacadeBase with default localised 
+	 * text for the chooser. Note none of the supplied lists will be directly 
+	 * modified.   
+	 * 
+	 * @param name The title of the chooser.
+	 * @param available The list of items to select from.
+	 * @param selected The list of items already selected. The user may choose to deselect items from this list.
+	 * @param maxNewSelections The number of selections the user may make in addition to those in the selected list.
+	 * @param stringDelimiter A string used to split the user viewable part of a string option from the full string. 
+	 */
+	public CDOMChooserFacadeImpl(String name, List<T> available,
+		List<T> selected, int maxNewSelections, String stringDelimiter)
+	{
+		this(name, available, selected, maxNewSelections, 
+			LanguageBundle.getString("in_available"), //$NON-NLS-1$
+			LanguageBundle.getString("in_typeName"), //$NON-NLS-1$
+			LanguageBundle.getString("in_selected"),  //$NON-NLS-1$
+			LanguageBundle.getString("in_selRemain"),  //$NON-NLS-1$
+			LanguageBundle.getString("in_add"), //$NON-NLS-1$
+			LanguageBundle.getString("in_remove"), stringDelimiter); //$NON-NLS-1$
+	}
 
 	/**
 	 * Create a new instance of GeneraChooserFacadeBase with supplied text for 
@@ -119,12 +149,14 @@
 	 * @param selectionCountName The label for the number of selections remaining.
 	 * @param addButtonName The label for the add button.
 	 * @param removeButtonName The label for the remove button.
+	 * @param stringDelimiter A string used to split the user viewable part of a string option from the full string. 
 	 */
 	public CDOMChooserFacadeImpl(String name, List<T> available,
 		List<T> selected, int maxNewSelections,
 		String availableTableTitle, String availableTableTypeNameTitle, 
 		String selectedTableTitle,
-		String selectionCountName, String addButtonName, String removeButtonName)
+		String selectionCountName, String addButtonName, String removeButtonName, 
+		String stringDelimiter)
 	{
 		this.name = name;
 		this.origAvailable = available;
@@ -136,15 +168,16 @@
 		this.selectionCountName = selectionCountName;
 		this.addButtonName = addButtonName;
 		this.removeButtonName = removeButtonName;
+		this.stringDelimiter = stringDelimiter;
 				
 		// Build working content
-		availableList = new DefaultListFacade<InfoFacade>(createInfoFacadeList(origAvailable));
-		selectedList = new DefaultListFacade<InfoFacade>(createInfoFacadeList(origSelected));
+		availableList = new DefaultListFacade<InfoFacade>(createInfoFacadeList(origAvailable, stringDelimiter));
+		selectedList = new DefaultListFacade<InfoFacade>(createInfoFacadeList(origSelected, stringDelimiter));
 		numSelectionsRemain = new DefaultReferenceFacade<Integer>(maxNewSelections);
 		finalSelected = new ArrayList<T>(origSelected);
 	}
 
-	private List<InfoFacade> createInfoFacadeList(List<T> origAvailable2)
+	private List<InfoFacade> createInfoFacadeList(List<T> origAvailable2, String stringDelimiter)
 	{
 		List<InfoFacade> infoFacadeList = new ArrayList<InfoFacade>(origAvailable2.size());
 		for (T object : origAvailable2)
@@ -158,6 +191,14 @@
 				CDOMInfoWrapper wrapper = new CDOMInfoWrapper((CDOMObject) object);
 				infoFacadeList.add(wrapper);
 			}
+			else if (!StringUtils.isEmpty(stringDelimiter)
+				&& (object instanceof String))
+			{
+				DelimitedStringInfoWrapper wrapper =
+						new DelimitedStringInfoWrapper((String) object,
+							stringDelimiter);
+				infoFacadeList.add(wrapper);
+			}
 			else
 			{
 				InfoWrapper wrapper = new InfoWrapper(object);
@@ -258,8 +299,8 @@
 	@Override
 	public final void rollback()
 	{
-		availableList.setContents(createInfoFacadeList(origAvailable));
-		selectedList.setContents(createInfoFacadeList(origSelected));
+		availableList.setContents(createInfoFacadeList(origAvailable, stringDelimiter));
+		selectedList.setContents(createInfoFacadeList(origSelected, stringDelimiter));
 		numSelectionsRemain.setReference(maxNewSelections);
 		finalSelected.clear();
 		finalSelected.addAll(origSelected);
@@ -459,8 +500,11 @@
 		}
 	}
 
-	private class InfoWrapper implements InfoFacade
+	private static class InfoWrapper implements InfoFacade, SortKeyAware
 	{
+		private static final NumberFormat SORTABLE_NUMBER_FORMAT =
+				new DecimalFormat("0000000000.00000");
+
 		private final Object obj;
 
 		public InfoWrapper(Object cdomObj)
@@ -535,5 +579,102 @@
 			}
 			return "";
 		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public String getSortKey()
+		{
+			if (obj instanceof Number)
+			{
+				return SORTABLE_NUMBER_FORMAT.format(100000d + ((Number) obj)
+					.doubleValue());
+			}
+			return toString();
+		}
 	}
+
+	private class DelimitedStringInfoWrapper implements InfoFacade
+	{
+		private final String string;
+		private final String delimiter;
+
+		public DelimitedStringInfoWrapper(String string, String delimiter)
+		{
+			this.string = string;
+			this.delimiter = StringUtils.trimToNull(delimiter);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public String toString()
+		{
+			if (delimiter != null)
+			{
+				final int idx = string.indexOf(delimiter);
+
+				if (idx > -1)
+				{
+					return string.substring(0, idx);
+				}
+			}
+			return string;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public String getSource()
+		{
+			return "";
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public String getSourceForNodeDisplay()
+		{
+			return "";
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public String getKeyName()
+		{
+			return string;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public boolean isNamePI()
+		{
+	    	return false;
+		}
+
+		/**
+		 * @return the obj
+		 */
+		public Object getObj()
+		{
+			return string;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public String getType()
+		{
+			return "";
+		}
+	}
 }

Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-01-04 02:03:03 UTC (rev 18992)
+++ Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-01-04 02:09:09 UTC (rev 18993)
@@ -2125,6 +2125,9 @@
 
 in_exchangeLevelsChoice=Select number of levels to convert from {0} to {1}
 
+in_equipChoiceMod=Select {0} ({1})
+in_equipChoiceSelectMod=Select modifier ({0})
+
 # House Rules/PRERULE lines
 
 InfoSpells.caster.type=Spell&nbsp;Caster&nbsp;Type

Added: Trunk/pcgen/code/src/java/pcgen/util/SignedInteger.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/SignedInteger.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/pcgen/util/SignedInteger.java	2013-01-04 02:09:09 UTC (rev 18993)
@@ -0,0 +1,159 @@
+/*
+ * SignedInteger.java
+ * Copyright James Dempsey, 2013
+ *
+ * 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 04/01/2013 11:26:33 AM
+ *
+ * $Id$
+ */
+package pcgen.util;
+
+/**
+ * The Class <code>SignedInteger</code> provides a number which always carries a 
+ * leading sign in its string representation. It is currently used for displaying 
+ * numerically sorted lists of modifiers in choosers.
+ *
+ * <br/>
+ * Last Editor: $Author$
+ * Last Edited: $Date$
+ * 
+ * @author James Dempsey <jdempsey@...>
+ * @version $Revision$
+ */
+public class SignedInteger extends Number implements Comparable<SignedInteger>
+{
+
+	/** Version for serialisation. */
+	private static final long serialVersionUID = 3744855657358887537L;
+	
+	/** The integer value being represented. */
+	private final int value;
+
+	/**
+	 * Create a new instance of SignedInteger
+	 * @param value The integer value to be represented.
+	 */
+	public SignedInteger(int value)
+	{
+		this.value = value;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public double doubleValue()
+	{
+		return value;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public float floatValue()
+	{
+		return value;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int intValue()
+	{
+		return value;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public long longValue()
+	{
+		return value;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString()
+	{
+		if (value > 0)
+		{
+			return "+" + value;
+		}
+		return String.valueOf(value);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int compareTo(SignedInteger arg0)
+	{
+		if (value == arg0.value)
+		{
+			return 0;
+		}
+		if (value > arg0.value)
+		{
+			return 1;
+		}
+		return -1;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + value;
+		return result;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		if (obj == null)
+		{
+			return false;
+		}
+		if (!(obj instanceof SignedInteger))
+		{
+			return false;
+		}
+		SignedInteger other = (SignedInteger) obj;
+		if (value != other.value)
+		{
+			return false;
+		}
+		return true;
+	}
+
+}


Property changes on: Trunk/pcgen/code/src/java/pcgen/util/SignedInteger.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Revision Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19022
          http://sourceforge.net/p/pcgen/code/19022
Author:   thpr
Date:     2013-01-05 21:46:31 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
Fix: Seeing an NPE relating to Skills
Issue#: CODE-1984

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/display/SkillCostDisplay.java
    Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillpointsToken.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/display/SkillCostDisplay.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/display/SkillCostDisplay.java	2013-01-05 19:35:17 UTC (rev 19021)
+++ Trunk/pcgen/code/src/java/pcgen/core/display/SkillCostDisplay.java	2013-01-05 21:46:31 UTC (rev 19022)
@@ -232,7 +232,8 @@
 			}
 			sb.append(pcc == null ? "None" : pcc.getKeyName());
 			sb.append(':');
-			sb.append(pc.getSkillRankForClass(sk, pcc));
+			Double rank = pc.getSkillRankForClass(sk, pcc);
+			sb.append(rank == null ? 0 : rank);
 			needComma = true;
 		}
 		double bonus = SkillRankControl.getSkillRankBonusTo(pc, sk);

Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillpointsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillpointsToken.java	2013-01-05 19:35:17 UTC (rev 19021)
+++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillpointsToken.java	2013-01-05 21:46:31 UTC (rev 19022)
@@ -180,6 +180,10 @@
 			for (PCClass pcc : pc.getSkillRankClasses(aSkill))
 			{
 				Double rank = pc.getSkillRankForClass(aSkill, pcc);
+				if (rank == null)
+				{
+					rank = Double.valueOf(0.0d);
+				}
 				SkillCost skillCost = pc.getSkillCostForClass(aSkill, pcc);
 				usedPoints += (rank * skillCost.getCost());
 			}
@@ -209,6 +213,10 @@
 				|| (outputIndex != null && outputIndex != 0))
 			{
 				Double rank = pc.getSkillRankForClass(aSkill, targetClass);
+				if (rank == null)
+				{
+					rank = Double.valueOf(0.0d);
+				}
 				SkillCost skillCost =
 						pc.getSkillCostForClass(aSkill, targetClass);
 				usedPoints += (rank * skillCost.getCost());

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

Revision: 19024
          http://sourceforge.net/p/pcgen/code/19024
Author:   thpr
Date:     2013-01-05 22:10:13 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
Fix:  Domains do not save ADD information 
Issue#: CODE-1985

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java
    Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java
    Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties

Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java	2013-01-05 21:55:13 UTC (rev 19023)
+++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java	2013-01-05 22:10:13 UTC (rev 19024)
@@ -1160,6 +1160,7 @@
 			//			buffer.append('|');
 			//			buffer.append(TAG_DOMAINSPELLS).append(':');
 			//			buffer.append(aDomain.getSpellList());
+			appendAddTokenInfo(buffer, domain);
 			buffer.append(LINE_SEP);
 
 			/*

Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java	2013-01-05 21:55:13 UTC (rev 19023)
+++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java	2013-01-05 22:10:13 UTC (rev 19024)
@@ -2400,14 +2400,11 @@
 			return;
 		}
 
-		PCGElement element;
-		String tag;
-
 		final Iterator<PCGElement> it = tokens.getElements().iterator();
 
 		if (it.hasNext())
 		{
-			element = it.next();
+			PCGElement element = it.next();
 
 			// the first element defines the domain name
 			final String domainKey = EntityEncoder.decode(element.getText());
@@ -2438,7 +2435,7 @@
 				while (it.hasNext())
 				{
 					element = it.next();
-					tag = element.getName();
+					String tag = element.getName();
 
 					if (TAG_SOURCE.equals(tag))
 					{
@@ -2454,6 +2451,14 @@
 						}
 						fullassoc = EntityEncoder.decode(element.getText());
 					}
+					else if (!tag.equals(TAG_ADDTOKEN))
+					{
+						final String msg =
+								LanguageBundle.getFormattedString(
+									"Warnings.PCGenParser.UnknownDomainInfo", //$NON-NLS-1$
+									tag + ":" + element.getText());
+						warnings.add(msg);
+					}
 				}
 				if (source == null)
 				{
@@ -2465,6 +2470,28 @@
 					domainInputFacet.importSelection(thePC.getCharID(), aDomain, fullassoc, source);
 					DomainApplication.applyDomain(thePC, aDomain);
 				}
+				try
+				{
+					//Must process ADD after DOMAIN is added to the PC
+					for (PCGElement e : new PCGTokenizer(line).getElements())
+					{
+						String tag = e.getName();
+						if (tag.equals(TAG_ADDTOKEN))
+						{
+							parseAddTokenInfo(e, aDomain);
+						}
+					}
+				}
+				catch (PCGParseException pcgpex)
+				{
+					final String msg =
+							LanguageBundle.getFormattedString(
+								"Warnings.PCGenParser.IllegalDomain", //$NON-NLS-1$
+								line, pcgpex.getMessage());
+					warnings.add(msg);
+
+					return;
+				}
 			}
 			else
 			{

Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-01-05 21:55:13 UTC (rev 19023)
+++ Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-01-05 22:10:13 UTC (rev 19024)
@@ -2595,6 +2595,9 @@
 Warnings.PCGenParser.UnknownRaceInfo=Ignoring unknown race info: {0}.
 
 # 0 - Tag data
+Warnings.PCGenParser.UnknownDomainInfo=Ignoring unknown domain info: {0}.
+
+# 0 - Tag data
 Warnings.PCGenParser.UnknownTemplateInfo=Ignoring unknown template info: {0}.
 
 # 0 - Object name

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

Revision: 19028
          http://sourceforge.net/p/pcgen/code/19028
Author:   jdempsey
Date:     2013-01-06 01:50:21 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
Move default choosers to use new UI choosers
* Migrate subclass chooser to new dialog
* Add info panel to chooser dialogs with info to show.
Issue#: CODE-1852

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/AddedTemplateFacet.java
    Trunk/pcgen/code/src/java/pcgen/core/Globals.java
    Trunk/pcgen/code/src/java/pcgen/core/analysis/SubClassApplication.java
    Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChoiceManager.java
    Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChooserFacadeImpl.java
    Trunk/pcgen/code/src/java/pcgen/core/facade/ChooserFacade.java
    Trunk/pcgen/code/src/java/pcgen/core/facade/InfoFactory.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitAbilities.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitAlignment.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitBio.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitDeity.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitGear.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitProf.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitSkill.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitSpells.java
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterUtils.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/GeneralChooserFacadeBase.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/TempBonusHelper.java
    Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/AddedTemplateFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/AddedTemplateFacet.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/AddedTemplateFacet.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -174,7 +174,7 @@
 			title += " (" + anOwner.getDisplayName() + ")";
 		}
 		Globals.getChoiceFromList(title, availableList, selectedList, 1,
-				forceChoice);
+				forceChoice, trackingFacet.getPC(id));
 		if (selectedList.size() == 1)
 		{
 			return selectedList.get(0);

Modified: Trunk/pcgen/code/src/java/pcgen/core/Globals.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Globals.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/Globals.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -72,6 +72,7 @@
 import pcgen.core.spell.Spell;
 import pcgen.core.utils.CoreUtility;
 import pcgen.core.utils.MessageType;
+import pcgen.gui2.facade.Gui2InfoFactory;
 import pcgen.persistence.PersistenceManager;
 import pcgen.rules.context.ConsolidatedListCommitStrategy;
 import pcgen.rules.context.LoadContext;
@@ -1405,16 +1406,19 @@
 	}
 
 	/**
-	 * Geta choice from a list
-	 * @param title
-	 * @param choiceList
-	 * @param selectedList
-	 * @param pool
+	 * Get a choice from a list
+	 * @param title The title of the chooser dialog.
+	 * @param choiceList The list of possible choices.
+	 * @param selectedList The values already selected (none of which should be in the available list).
+	 * @param pool The number of choices the user can make.
+	 * @param pc The character the choice is being made for.
 	 * @return a choice
 	 */
-	public static <T> List<T> getChoiceFromList(final String title, final List<T> choiceList, final List<T> selectedList, final int pool)
+	public static <T> List<T> getChoiceFromList(final String title,
+		final List<T> choiceList, final List<T> selectedList, final int pool,
+		PlayerCharacter pc)
 	{
-		return getChoiceFromList(title, choiceList, selectedList, pool, false);
+		return getChoiceFromList(title, choiceList, selectedList, pool, false, pc);
 	}
 
 	/**
@@ -1424,9 +1428,12 @@
 	 * @param selectedList The values already selected (none of which should be in the available list).
 	 * @param pool The number of choices the user can make.
 	 * @param forceChoice true if the user will be forced to make all choices.
+	 * @param pc The character the choice is being made for.
 	 * @return The list of choices made by the user.
 	 */
-	public static <T> List<T> getChoiceFromList(final String title, final List<T> choiceList, final List<T> selectedList, final int pool, final boolean forceChoice)
+	public static <T> List<T> getChoiceFromList(final String title,
+		final List<T> choiceList, final List<T> selectedList, final int pool,
+		final boolean forceChoice, PlayerCharacter pc)
 	{
 		List<T> startingSelectedList = new ArrayList<T>();
 		if (selectedList != null)
@@ -1440,6 +1447,7 @@
 						startingSelectedList, pool);
 		chooserFacade.setAllowsDups(false);
 		chooserFacade.setRequireCompleteSelection(forceChoice);
+		chooserFacade.setInfoFactory(new Gui2InfoFactory(pc));
 		ChooserFactory.getDelegate().showGeneralChooser(chooserFacade);
 		
 		return chooserFacade.getFinalSelected();

Modified: Trunk/pcgen/code/src/java/pcgen/core/analysis/SubClassApplication.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/analysis/SubClassApplication.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/analysis/SubClassApplication.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -20,9 +20,6 @@
 package pcgen.core.analysis;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
 import java.util.List;
 
 import pcgen.cdom.base.Constants;
@@ -34,9 +31,13 @@
 import pcgen.core.PlayerCharacter;
 import pcgen.core.SpellProhibitor;
 import pcgen.core.SubClass;
+import pcgen.core.chooser.CDOMChooserFacadeImpl;
+import pcgen.core.facade.ChooserFacade.ChooserTreeViewType;
 import pcgen.core.prereq.PrereqHandler;
+import pcgen.gui2.facade.Gui2InfoFactory;
+import pcgen.system.LanguageBundle;
+import pcgen.util.Logging;
 import pcgen.util.chooser.ChooserFactory;
-import pcgen.util.chooser.ChooserInterface;
 import pcgen.util.enumeration.ProhibitedSpellType;
 
 public class SubClassApplication
@@ -50,12 +51,7 @@
 			return;
 		}
 	
-		List<String> columnNames = new ArrayList<String>(3);
-		columnNames.add("Name");
-		columnNames.add("Cost");
-		columnNames.add("Other");
-	
-		List<List> choiceList = new ArrayList<List>();
+		List<PCClass> availableList = new ArrayList<PCClass>();
 		String subClassKey = aPC.getSubClassName(cl);
 		boolean subClassSelected = subClassKey != null
 				&& !subClassKey.equals(Constants.NONE)
@@ -67,108 +63,68 @@
 			{
 				continue;
 			}
-	
-			final List<Object> columnList = new ArrayList<Object>(3);
-	
-			columnList.add(sc);
-			columnList.add(Integer.toString(sc.getSafe(IntegerKey.COST)));
-			columnList.add(SubClassApplication.getSupplementalDisplayInfo(sc));
-	
+				
 			// If a subclass has already been selected, only add that one
 			if (!subClassSelected
 					|| sc.getKeyName().equals(
 							aPC.getSubClassName(cl)))
 			{
-				choiceList.add(columnList);
+				availableList.add(sc);
 			}
 		}
 	
-		Collections.sort(choiceList, new Comparator<List>()
-		{
-            @Override
-			public int compare(List o1, List o2)
-			{
-				try
-				{
-					PCClass class1 = ((List<PCClass>) o1).get(0);
-					PCClass class2 = ((List<PCClass>) o2).get(0);
-					return class1.compareTo(class2);
-				}
-				catch (RuntimeException e)
-				{
-					return 0;
-				}
-			}
-		});
-	
-		// add base class to the chooser at the TOP
+		// add base class to the chooser
 		if (cl.getSafe(ObjectKey.ALLOWBASECLASS)
 				&& (!subClassSelected || cl.getKeyName().equals(
 						aPC.getSubClassName(cl))))
 		{
-			final List<Object> columnList2 = new ArrayList<Object>(3);
-			columnList2.add(cl);
-			columnList2.add("0");
-			columnList2.add("");
-			choiceList.add(0, columnList2);
+			availableList.add(0, cl);
 		}
 	
 		/*
 		 * REFACTOR This makes an assumption that SubClasses are ONLY Schools, which may
 		 * not be a fabulous assumption
 		 */
-		final ChooserInterface c = ChooserFactory.getChooserInstance();
-	
-		c.setTitle("School Choice (Specialisation)");
-		c
-			.setMessageText("Make a selection.  The cost column indicates the cost of that selection. "
-				+ "If this cost is non-zero, you will be asked to also "
-				+ "select items from this list to give up to cover that cost.");
-		c.setTotalChoicesAvail(1);
-		c.setPoolFlag(false);
-	
-		// c.setCostColumnNumber(1); // Allow 1 choice, regardless of
-		// cost...cost will be applied in second phase
-		c.setAvailableColumnNames(columnNames);
-		c.setAvailableList(choiceList);
-	
-		if (choiceList.size() == 1)
+		List<PCClass> selectedSubClasses;
+		CDOMChooserFacadeImpl<PCClass> chooserFacade =
+				new CDOMChooserFacadeImpl<PCClass>(
+					LanguageBundle.getString("in_schoolSpecChoice"), availableList, //$NON-NLS-1$
+					new ArrayList<PCClass>(), 1);
+		chooserFacade.setDefaultView(ChooserTreeViewType.NAME);
+		chooserFacade.setInfoFactory(new Gui2InfoFactory(aPC));
+		
+		if (availableList.size() == 1)
 		{
-			c.setSelectedList(choiceList);
+			selectedSubClasses = availableList;
 		}
-		else if (choiceList.size() != 0)
+		else if (availableList.size() == 0)
 		{
-			c.setVisible(true);
+			Logging.log(Logging.WARNING, "No subclass choices avaialble for " + cl);
+			return;
 		}
+		else
+		{
+			ChooserFactory.getDelegate().showGeneralChooser(chooserFacade);
+			selectedSubClasses = chooserFacade.getFinalSelected();
+		}
 	
-		List<List<PCClass>> selectedList;
 		if (!cl.getSafe(ObjectKey.ALLOWBASECLASS))
 		{
-			while (c.getSelectedList().size() == 0)
+			while (selectedSubClasses.size() == 0)
 			{
-				c.setVisible(true);
+				ChooserFactory.getDelegate().showGeneralChooser(chooserFacade);
+				selectedSubClasses = chooserFacade.getFinalSelected();
 			}
-			selectedList = c.getSelectedList();
-	
 		}
-		else
-		{
-			selectedList = c.getSelectedList();
-		}
 	
-		if (selectedList.size() == 0)
+		if (selectedSubClasses.size() == 0)
 		{
 			return;
 		}
 	
-		List<PCClass> selectedRow = selectedList.get(0);
-		if (selectedRow.size() == 0)
-		{
-			return;
-		}
-		PCClass subselected = selectedRow.get(0);
+		PCClass subselected = selectedSubClasses.get(0);
 	
-		if (!selectedList.isEmpty() && subselected instanceof SubClass)
+		if (subselected instanceof SubClass)
 		{
 			aPC.removeProhibitedSchools(cl);
 			/*
@@ -178,8 +134,8 @@
 	
 			SubClass sc = (SubClass) subselected;
 	
-			choiceList = new ArrayList<List>();
-	
+			availableList.clear();
+
 			for (SubClass sub : subClassList)
 			{
 				if (sub.equals(sc))
@@ -192,20 +148,13 @@
 					continue;
 				}
 	
-				final List<Object> columnList = new ArrayList<Object>(3);
-	
 				int displayedCost = sub.getProhibitCost();
 				if (displayedCost == 0)
 				{
 					continue;
 				}
 	
-				columnList.add(sub);
-				columnList.add(Integer.toString(displayedCost));
-				columnList.add(SubClassApplication.getSupplementalDisplayInfo(sub));
-				columnList.add(sub.getChoice());
-	
-				choiceList.add(columnList);
+				availableList.add(sub);
 			}
 	
 			setSubClassKey(aPC, cl, sc.getKeyName());
@@ -215,29 +164,22 @@
 				aPC.setAssoc(cl, AssociationKey.SPECIALTY, sc.getChoice());
 			}
 	
-			columnNames.add("Specialty");
-	
 			if (sc.getSafe(IntegerKey.COST) != 0)
 			{
-				final ChooserInterface c1 = ChooserFactory.getChooserInstance();
-				c1.setTitle("School Choice (Prohibited)");
-				c1.setAvailableColumnNames(columnNames);
-				c1.setAvailableList(choiceList);
-				c1
-					.setMessageText("Make a selection.  You must make as many selections "
-						+ "necessary to cover the cost of your previous selections.");
-				c1.setTotalChoicesAvail(sc.getSafe(IntegerKey.COST));
-				c1.setPoolFlag(true);
-				c1.setCostColumnNumber(1);
-				c1.setNegativeAllowed(true);
-				c1.setVisible(true);
-				selectedList = c1.getSelectedList();
-	
-				for (Iterator<List<PCClass>> i = selectedList.iterator(); i
-					.hasNext();)
+				chooserFacade =
+						new CDOMChooserFacadeImpl<PCClass>(
+							LanguageBundle.getString("in_schoolProhibitChoice"), //$NON-NLS-1$
+							availableList, new ArrayList<PCClass>(), sc
+								.getSafe(IntegerKey.COST));
+				chooserFacade.setDefaultView(ChooserTreeViewType.NAME);
+				chooserFacade.setInfoFactory(new Gui2InfoFactory(aPC));
+				chooserFacade.setRequireCompleteSelection(true);
+				ChooserFactory.getDelegate().showGeneralChooser(chooserFacade);
+				selectedSubClasses = chooserFacade.getFinalSelected();
+
+				for (PCClass choice : chooserFacade.getFinalSelected())
 				{
-					final List columns = i.next();
-					sc = (SubClass) columns.get(0);
+					sc = (SubClass) choice;
 					SpellProhibitor prohibSchool = new SpellProhibitor();
 					prohibSchool.setType(ProhibitedSpellType.SCHOOL);
 					prohibSchool.addValue(sc.getChoice());
@@ -272,27 +214,4 @@
 		}
 	}
 
-	private static String getSupplementalDisplayInfo(SubClass sc) {
-		boolean added = false;
-		StringBuilder displayInfo = new StringBuilder();
-		if (sc.getSafe(IntegerKey.KNOWN_SPELLS_FROM_SPECIALTY) != 0) {
-			displayInfo.append("SPECIALTY SPELLS:").append(
-					sc.getSafe(IntegerKey.KNOWN_SPELLS_FROM_SPECIALTY));
-			added = true;
-		}
-	
-		if (sc.getSpellBaseStat() != null) {
-			if (added) {
-				displayInfo.append(" ");
-			}
-			displayInfo.append("SPELL BASE STAT:").append(sc.getSpellBaseStat());
-			added = true;
-		}
-	
-		if (!added) {
-			displayInfo.append(' ');
-		}
-		return displayInfo.toString();
-	}
-
 }

Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChoiceManager.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChoiceManager.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChoiceManager.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -10,6 +10,7 @@
 import pcgen.core.Globals;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.facade.ChooserFacade.ChooserTreeViewType;
+import pcgen.gui2.facade.Gui2InfoFactory;
 import pcgen.system.LanguageBundle;
 import pcgen.util.Logging;
 import pcgen.util.chooser.ChooserFactory;
@@ -163,6 +164,7 @@
 					selectedList, effectiveChoices);
 		chooserFacade.setDefaultView(ChooserTreeViewType.NAME);
 		chooserFacade.setAllowsDups(dupsAllowed);
+		chooserFacade.setInfoFactory(new Gui2InfoFactory(aPc));
 		ChooserFactory.getDelegate().showGeneralChooser(chooserFacade);
 		
 		return chooserFacade.getFinalSelected();

Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChooserFacadeImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChooserFacadeImpl.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/chooser/CDOMChooserFacadeImpl.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -40,6 +40,7 @@
 import pcgen.core.facade.ChooserFacade;
 import pcgen.core.facade.DefaultReferenceFacade;
 import pcgen.core.facade.InfoFacade;
+import pcgen.core.facade.InfoFactory;
 import pcgen.core.facade.ReferenceFacade;
 import pcgen.core.facade.util.DefaultListFacade;
 import pcgen.core.facade.util.ListFacade;
@@ -91,6 +92,10 @@
 
 	private final String stringDelimiter;
 	
+	private boolean infoAvailable = false;
+
+	private InfoFactory infoFactory = null;
+	
 	/**
 	 * Create a new instance of GeneraChooserFacadeBase with default localised 
 	 * text for the chooser. Note none of the supplied lists will be directly 
@@ -185,6 +190,7 @@
 			if (object instanceof InfoFacade)
 			{
 				infoFacadeList.add((InfoFacade) object);
+				infoAvailable = true;
 			}
 			else if (object instanceof CDOMObject)
 			{
@@ -424,6 +430,31 @@
 		return requireCompleteSelection;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isInfoAvailable()
+	{
+		return infoAvailable;
+	}
+
+	/**
+	 * @return the infoFactory
+	 */
+	public InfoFactory getInfoFactory()
+	{
+		return infoFactory;
+	}
+
+	/**
+	 * @param infoFactory the infoFactory to set
+	 */
+	public void setInfoFactory(InfoFactory infoFactory)
+	{
+		this.infoFactory = infoFactory;
+	}
+
 	private class CDOMInfoWrapper implements InfoFacade
 	{
 		private final CDOMObject cdomObj;

Modified: Trunk/pcgen/code/src/java/pcgen/core/facade/ChooserFacade.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/facade/ChooserFacade.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/facade/ChooserFacade.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -155,4 +155,15 @@
 	 * @return true if the chooser needs to have 0 remaining selections before being committed.
 	 */
 	public boolean isRequireCompleteSelection();
+
+	/**
+	 * @return Do the items in this chooser have extra info above a name.
+	 */
+	public boolean isInfoAvailable();
+
+	/**
+	 * Retrieve the factory which provides descriptions for items.
+	 * @return The info factory.  
+	 */
+	public InfoFactory getInfoFactory();
 }

Modified: Trunk/pcgen/code/src/java/pcgen/core/facade/InfoFactory.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/facade/InfoFactory.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/facade/InfoFactory.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -96,6 +96,13 @@
 	public String getHTMLInfo(TempBonusFacade tempBonusFacade);
 
 	/**
+	 * Produce the HTML information string for a facade.
+	 * @param facade The object to be described.
+	 * @return The HTML information string
+	 */
+	public String getHTMLInfo(InfoFacade facade);
+
+	/**
 	 * Produce the HTML information string for spell book or spell list.
 	 * @param name The spell book or spell list.
 	 * @return The HTML information string

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitAbilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitAbilities.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitAbilities.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -199,7 +199,7 @@
 				selected =
 						Globals.getChoiceFromList("Choose abilities",
 							available, new ArrayList<AbilitySelection>(),
-							numberOfChoices);
+							numberOfChoices, aPC);
 
 				if (selected.size() != 0)
 				{

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitAlignment.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitAlignment.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitAlignment.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -74,7 +74,7 @@
 			{
 				List<PCAlignment> sel = new ArrayList<PCAlignment>(1);
 				Globals.getChoiceFromList("Choose alignment", alignments, sel,
-					1);
+					1, aPC);
 				if (sel.size() == 1)
 				{
 					align = sel.get(0);

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitBio.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitBio.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitBio.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -110,7 +110,7 @@
 			{
 				List<Gender> selList = new ArrayList<Gender>(1);
 				Globals.getChoiceFromList("Choose Gender", theGenders, selList,
-					1);
+					1, aPC);
 				if (selList.size() == 1)
 				{
 					selectedGender = selList.get(0);

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitDeity.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitDeity.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitDeity.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -175,7 +175,7 @@
 				xs =
 						Globals.getChoiceFromList("Choose Domains", theDomains,
 							new ArrayList<CDOMSingleRef<Domain>>(),
-							numberOfChoices);
+							numberOfChoices, aPC);
 
 				if (xs.size() != 0)
 				{

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitGear.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitGear.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitGear.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -209,7 +209,7 @@
 		else
 		{
 			List<Equipment> selected = new ArrayList<Equipment>(1);
-			Globals.getChoiceFromList("Choose equipment", eqList, selected, 1);
+			Globals.getChoiceFromList("Choose equipment", eqList, selected, 1, aPC);
 			if (selected.size() == 1)
 			{
 				theEquipment = selected.get(0);

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitProf.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitProf.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitProf.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -218,7 +218,7 @@
 						Globals
 							.getChoiceFromList("Choose Proficiencies",
 								aProfList, new ArrayList<WeaponProf>(),
-								numberOfChoices);
+								numberOfChoices, aPC);
 
 				if (xs.size() != 0)
 				{

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitSkill.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitSkill.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitSkill.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -141,7 +141,7 @@
 		List<String> warnings)
 	{
 		skillsToAdd = new ArrayList<KitSkillAdd>();
-		List<Skill> skillChoices = getSkillChoices();
+		List<Skill> skillChoices = getSkillChoices(aPC);
 
 		if (skillChoices == null || skillChoices.size() == 0)
 		{
@@ -301,7 +301,7 @@
 		return "Skills";
 	}
 
-	private List<Skill> getSkillChoices()
+	private List<Skill> getSkillChoices(PlayerCharacter aPC)
 	{
 		final List<Skill> skillsOfType = new ArrayList<Skill>();
 
@@ -321,7 +321,7 @@
 
 		List<Skill> skillChoices = new ArrayList<Skill>();
 		Globals.getChoiceFromList("Select skill", skillsOfType, skillChoices,
-			getSafeCount());
+			getSafeCount(), aPC);
 
 		return skillChoices;
 	}

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitSpells.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitSpells.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitSpells.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -202,7 +202,7 @@
 			{
 				xs = Globals.getChoiceFromList("Choose " + aClass.getKeyName()
 						+ " spell(s) for " + workingBook, aSpellList,
-						new ArrayList<KitSpellBookEntry>(), numberOfChoices);
+						new ArrayList<KitSpellBookEntry>(), numberOfChoices, aPC);
 
 				if (xs.size() != 0)
 				{

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -45,16 +45,20 @@
 import javax.swing.JSplitPane;
 import javax.swing.ListSelectionModel;
 import javax.swing.WindowConstants;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 
 import pcgen.core.facade.ChooserFacade;
 import pcgen.core.facade.ChooserFacade.ChooserTreeViewType;
 import pcgen.core.facade.InfoFacade;
+import pcgen.core.facade.InfoFactory;
 import pcgen.core.facade.event.ReferenceEvent;
 import pcgen.core.facade.event.ReferenceListener;
 import pcgen.core.facade.util.DefaultListFacade;
 import pcgen.core.facade.util.DelegatingListFacade;
 import pcgen.core.facade.util.ListFacade;
 import pcgen.gui2.tools.Icons;
+import pcgen.gui2.tools.InfoPane;
 import pcgen.gui2.util.FacadeListModel;
 import pcgen.gui2.util.JListEx;
 import pcgen.gui2.util.JTreeViewTable;
@@ -82,7 +86,7 @@
  * @version $Revision$
  */
 @SuppressWarnings("serial")
-public class ChooserDialog extends JDialog implements ActionListener, ReferenceListener<Integer>
+public class ChooserDialog extends JDialog implements ActionListener, ReferenceListener<Integer>, ListSelectionListener
 {
 
 	private final ChooserFacade chooser;
@@ -91,6 +95,7 @@
 	private final GeneralTreeViewModel treeViewModel;
 	private final FacadeListModel<InfoFacade> listModel;
 	private final JListEx list;
+	private final InfoPane infoPane;
 	private boolean committed;
 
 	/**
@@ -107,6 +112,7 @@
 		this.treeViewModel = new GeneralTreeViewModel();
 		this.list = new JListEx();
 		this.listModel = new FacadeListModel<InfoFacade>();
+		this.infoPane = new InfoPane();
 
 		treeViewModel.setDelegate(chooser.getAvailableList());
 		listModel.setListFacade(chooser.getSelectedList());
@@ -177,7 +183,19 @@
 		rightPane.add(buttonPane2, BorderLayout.SOUTH);
 
 		split.setRightComponent(rightPane);
-		pane.add(split, BorderLayout.CENTER);
+		
+		if (chooser.isInfoAvailable())
+		{
+			JSplitPane infoSplit = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+			infoSplit.setTopComponent(split);
+			infoSplit.setBottomComponent(infoPane);
+			pane.add(infoSplit, BorderLayout.CENTER);
+			availTable.getSelectionModel().addListSelectionListener(this);
+		}
+		else
+		{
+			pane.add(split, BorderLayout.CENTER);
+		}
 		JPanel bottomPane = new JPanel(new FlowLayout());
 		JButton button = new JButton("Ok");
 		button.setActionCommand("OK");
@@ -197,6 +215,23 @@
 	}
 
 	@Override
+	public void valueChanged(ListSelectionEvent e)
+	{
+		if (!e.getValueIsAdjusting())
+		{
+			if (e.getSource() == availTable.getSelectionModel())
+			{
+				InfoFacade target = (InfoFacade) availTable.getSelectedObject();
+				InfoFactory factory = chooser.getInfoFactory();
+				if (factory != null && target!=null)
+				{
+					infoPane.setText(factory.getHTMLInfo(target));
+				}
+			}
+		}		
+	}
+	
+	@Override
 	public void actionPerformed(ActionEvent e)
 	{
 		if (e.getActionCommand().equals("ADD") || e.getSource() == availTable)

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -1216,7 +1216,7 @@
 		Equipment aEq = null;
 		Object target = 
 				TempBonusHelper.getTempBonusTarget(originObj,
-					theCharacter, delegate);
+					theCharacter, delegate, infoFactory);
 		if (target == null)
 		{
 			return;

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterUtils.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterUtils.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterUtils.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -11,8 +11,8 @@
 import pcgen.core.RuleConstants;
 import pcgen.core.SizeAdjustment;
 import pcgen.core.utils.CoreUtility;
+import pcgen.system.LanguageBundle;
 import pcgen.util.Logging;
-import pcgen.system.LanguageBundle;
 
 public class CharacterUtils
 {
@@ -70,10 +70,9 @@
 				}
 
 				List<Equipment> selectedClothes = new ArrayList<Equipment>();
-				Globals
-					.getChoiceFromList(
-						LanguageBundle
-							.getString("in_sumSelectAFreeSetOfClothing"), clothes, selectedClothes, 1); //$NON-NLS-1$
+				Globals.getChoiceFromList(
+					LanguageBundle.getString("in_sumSelectAFreeSetOfClothing"), //$NON-NLS-1$ 
+					clothes, selectedClothes, 1, aPC);
 
 				if (selectedClothes.size() != 0)
 				{

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/GeneralChooserFacadeBase.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/GeneralChooserFacadeBase.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/GeneralChooserFacadeBase.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -30,6 +30,7 @@
 import pcgen.core.facade.ChooserFacade;
 import pcgen.core.facade.DefaultReferenceFacade;
 import pcgen.core.facade.InfoFacade;
+import pcgen.core.facade.InfoFactory;
 import pcgen.core.facade.ReferenceFacade;
 import pcgen.core.facade.util.DefaultListFacade;
 import pcgen.core.facade.util.ListFacade;
@@ -72,6 +73,8 @@
 			ChooserTreeViewType.TYPE_NAME;
 
 	private boolean requireCompleteSelection;
+
+	private final InfoFactory infoFactory;
 	
 	/**
 	 * Create a new instance of GeneraChooserFacadeBase with default localised 
@@ -82,8 +85,10 @@
 	 * @param available The list of items to select from.
 	 * @param selected The list of items already selected. The user may choose to deselect items from this list.
 	 * @param maxNewSelections The number of selections the user may make in addition to those in the selected list.
+	 * @param infoFactory The factory which provides descriptions for items. 
 	 */
-	GeneralChooserFacadeBase(String name, List<InfoFacade> available, List<InfoFacade> selected, int maxNewSelections)
+	GeneralChooserFacadeBase(String name, List<InfoFacade> available, List<InfoFacade> selected, int maxNewSelections, 
+		InfoFactory infoFactory)
 	{
 		this(name, available, selected, maxNewSelections, 
 			LanguageBundle.getString("in_available"), //$NON-NLS-1$
@@ -91,7 +96,8 @@
 			LanguageBundle.getString("in_selected"),  //$NON-NLS-1$
 			LanguageBundle.getString("in_selRemain"),  //$NON-NLS-1$
 			LanguageBundle.getString("in_add"), //$NON-NLS-1$
-			LanguageBundle.getString("in_remove")); //$NON-NLS-1$
+			LanguageBundle.getString("in_remove"), //$NON-NLS-1$ 
+			infoFactory); 
 	}
 
 	/**
@@ -108,12 +114,14 @@
 	 * @param selectionCountName The label for the number of selections remaining.
 	 * @param addButtonName The label for the add button.
 	 * @param removeButtonName The label for the remove button.
+	 * @param infoFactory The factory which provides descriptions for items. 
 	 */
 	GeneralChooserFacadeBase(String name, List<InfoFacade> available,
 		List<InfoFacade> selected, int maxNewSelections,
 		String availableTableTitle, String availableTableTypeNameTitle, 
 		String selectedTableTitle,
-		String selectionCountName, String addButtonName, String removeButtonName)
+		String selectionCountName, String addButtonName, String removeButtonName, 
+		InfoFactory infoFactory)
 	{
 		this.name = name;
 		this.origAvailable = available;
@@ -125,6 +133,7 @@
 		this.selectionCountName = selectionCountName;
 		this.addButtonName = addButtonName;
 		this.removeButtonName = removeButtonName;
+		this.infoFactory = infoFactory;
 				
 		// Build working content
 		availableList = new DefaultListFacade<InfoFacade>(origAvailable);
@@ -305,4 +314,22 @@
 		return requireCompleteSelection;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isInfoAvailable()
+	{
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public InfoFactory getInfoFactory()
+	{
+		return infoFactory;
+	}
+	
 }

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -95,6 +95,7 @@
 import pcgen.core.facade.DeityFacade;
 import pcgen.core.facade.DomainFacade;
 import pcgen.core.facade.EquipmentFacade;
+import pcgen.core.facade.InfoFacade;
 import pcgen.core.facade.InfoFactory;
 import pcgen.core.facade.KitFacade;
 import pcgen.core.facade.RaceFacade;
@@ -109,6 +110,7 @@
 import pcgen.gui2.util.HtmlInfoBuilder;
 import pcgen.system.LanguageBundle;
 import pcgen.system.PCGenSettings;
+import pcgen.util.Delta;
 import pcgen.util.Logging;
 import pcgen.util.enumeration.Tab;
 
@@ -148,7 +150,7 @@
 	public Gui2InfoFactory(PlayerCharacter pc)
 	{
 		this.pc = pc;
-		this.charDisplay = pc.getDisplay();
+		this.charDisplay = pc ==  null ? null : pc.getDisplay();
 	}
 
 	/* (non-Javadoc)
@@ -162,7 +164,7 @@
 			return EMPTY_STRING;
 		}
 		String[] favClass = Globals.getContext().unparseSubtoken((Race)race, "FAVCLASS");
-		return StringUtil.join(favClass, EMPTY_STRING);
+		return StringUtil.join(favClass, ", ");
 	}
 
 	/* (non-Javadoc)
@@ -252,7 +254,7 @@
 
 		String aString;
 		boolean isSubClass = aClass instanceof SubClass;
-		if (isSubClass)
+		if (isSubClass && parentClassFacade != null)
 		{
 			parentClass = (PCClass) parentClassFacade;
 		}
@@ -262,6 +264,13 @@
 					.piString(aClass, false));
 		b.appendLineBreak();
 
+		// Subclass cost - at the top to make choices easier
+		if (isSubClass && aClass.getSafe(IntegerKey.COST) != 0)
+		{
+			b.appendI18nElement("in_clInfoCost", String.valueOf(aClass.getSafe(IntegerKey.COST))); //$NON-NLS-1$
+			b.appendLineBreak();
+		}
+		
 		// Type
 		aString = aClass.getType();
 		if (isSubClass && (aString.length() == 0))
@@ -329,6 +338,16 @@
 			b.appendI18nElement("in_requirements", aString); //$NON-NLS-1$
 		}
 
+		// Sub class extra info
+		if (isSubClass)
+		{
+			int specialtySpells = aClass.getSafe(IntegerKey.KNOWN_SPELLS_FROM_SPECIALTY);
+			b.appendLineBreak();
+			b.appendI18nElement("in_clSpecialtySpells", Delta.toString(specialtySpells)); //$NON-NLS-1$
+			b.appendSpacer();
+			b.appendI18nElement("in_clSpecialty", ((SubClass) aClass).getChoice()); //$NON-NLS-1$
+		}
+		
 		// Source
 		aString = aClass.getSource();
 		if (isSubClass && (aString.length() == 0))
@@ -1076,7 +1095,7 @@
 			return EMPTY_STRING;
 		}
 
-		if (!(tempBonusFacade instanceof TempBonusFacade))
+		if (!(tempBonusFacade instanceof TempBonusFacadeImpl))
 		{
 			final HtmlInfoBuilder infoText = new HtmlInfoBuilder();
 			infoText.appendTitleElement(tempBonusFacade.toString());
@@ -1189,6 +1208,80 @@
 		return infoText.toString();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getHTMLInfo(InfoFacade facade)
+	{
+		if (facade == null)
+		{
+			return EMPTY_STRING;
+		}
+		
+		// Use a more detailed info if we can
+		if (facade instanceof AbilityFacade)
+		{
+			return getHTMLInfo((AbilityFacade) facade);
+		}
+		if (facade instanceof ClassFacade)
+		{
+			return getHTMLInfo((ClassFacade) facade, null);
+		}
+		if (facade instanceof DeityFacade)
+		{
+			return getHTMLInfo((DeityFacade) facade);
+		}
+		if (facade instanceof DomainFacade)
+		{
+			return getHTMLInfo((DomainFacade) facade);
+		}
+		if (facade instanceof EquipmentFacade)
+		{
+			return getHTMLInfo((EquipmentFacade) facade);
+		}
+		if (facade instanceof KitFacade)
+		{
+			return getHTMLInfo((KitFacade) facade);
+		}
+		if (facade instanceof RaceFacade)
+		{
+			return getHTMLInfo((RaceFacade) facade);
+		}
+		if (facade instanceof SkillFacade)
+		{
+			return getHTMLInfo((SkillFacade) facade);
+		}
+		if (facade instanceof SpellFacade)
+		{
+			return getHTMLInfo((SpellFacade) facade);
+		}
+		if (facade instanceof TempBonusFacade)
+		{
+			return getHTMLInfo((TempBonusFacade) facade);
+		}
+		if (facade instanceof TemplateFacade)
+		{
+			return getHTMLInfo((TemplateFacade) facade);
+		}
+
+		final HtmlInfoBuilder infoText = new HtmlInfoBuilder();
+		infoText.appendTitleElement(facade.toString());
+		infoText.appendLineBreak();
+
+		if (facade.getType().length() > 0)
+		{
+			infoText.appendI18nElement("in_irInfoType", facade.getType()); //$NON-NLS-1$
+			infoText.appendLineBreak();
+		}
+		
+		infoText.appendI18nElement(
+			"in_itmInfoLabelTextSource", //$NON-NLS-1$
+			facade.getSource());
+		
+		return infoText.toString();
+	}
+
 	private static class ObjectTypeComparator implements Comparator<BaseKit>
 	{
 		@Override

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -77,6 +77,7 @@
 import pcgen.core.facade.EquipmentListFacade.EquipmentListEvent;
 import pcgen.core.facade.EquipmentListFacade.EquipmentListListener;
 import pcgen.core.facade.InfoFacade;
+import pcgen.core.facade.InfoFactory;
 import pcgen.core.facade.SpellFacade;
 import pcgen.core.facade.SpellSupportFacade;
 import pcgen.core.facade.TodoFacade.CharacterTab;
@@ -129,6 +130,7 @@
 	private DefaultReferenceFacade<String> defaultSpellBook;
 	private TodoManager todoManager;
 	private CharacterFacade pcFacade;
+	private final InfoFactory infoFactory;
 	
 
 	/**
@@ -146,6 +148,7 @@
 		CharacterFacade pcFacade)
 	{
 		this.pc = pc;
+		this.infoFactory = pcFacade.getInfoFactory();
 		this.charDisplay = pc.getDisplay();
 		this.delegate = delegate;
 		this.dataSet = dataSet;
@@ -350,7 +353,9 @@
 		}
 		
 		final ArrayList<Ability> selectedList = new ArrayList<Ability>();
-		GeneralChooserFacadeBase chooserFacade = new GeneralChooserFacadeBase(label, availableList, new ArrayList<InfoFacade>(), 99)
+		GeneralChooserFacadeBase chooserFacade =
+				new GeneralChooserFacadeBase(label, availableList,
+					new ArrayList<InfoFacade>(), 99, infoFactory)
 		{
 			/**
 			 * {@inheritDoc}

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/TempBonusHelper.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/TempBonusHelper.java	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/TempBonusHelper.java	2013-01-06 01:50:21 UTC (rev 19028)
@@ -45,6 +45,7 @@
 import pcgen.core.display.CharacterDisplay;
 import pcgen.core.facade.ChooserFacade.ChooserTreeViewType;
 import pcgen.core.facade.InfoFacade;
+import pcgen.core.facade.InfoFactory;
 import pcgen.core.facade.UIDelegate;
 import pcgen.core.prereq.PrereqHandler;
 import pcgen.core.prereq.Prerequisite;
@@ -81,11 +82,13 @@
 	 * @param originObj The rules object providing the bonus.
 	 * @param theCharacter The target character.
 	 * @param delegate The user interface delegate which will provide the chooser.
+	 * @param infoFactory An object to provide formatted information about an object. 
 	 * @return The temporary equipment item, the character or null if the request 
 	 * was cancelled.
 	 */
-	static Object getTempBonusTarget(
-		CDOMObject originObj, PlayerCharacter theCharacter, UIDelegate delegate)
+	static Object getTempBonusTarget(CDOMObject originObj,
+		PlayerCharacter theCharacter, UIDelegate delegate,
+		InfoFactory infoFactory)
 	{
 		List<InfoFacade> possibleTargets =
 				getListOfApplicableEquipment(originObj, theCharacter);
@@ -111,7 +114,7 @@
 		final ArrayList<InfoFacade> selectedList = new ArrayList<InfoFacade>();
 		GeneralChooserFacadeBase chooserFacade =
 				new GeneralChooserFacadeBase(label, possibleTargets,
-					new ArrayList<InfoFacade>(), 1)
+					new ArrayList<InfoFacade>(), 1, infoFactory)
 				{
 					/**
 					 * {@inheritDoc}

Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-01-05 22:21:36 UTC (rev 19027)
+++ Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-01-06 01:50:21 UTC (rev 19028)
@@ -644,6 +644,8 @@
 
 in_clInfo=Class Info
 
+in_clInfoCost=Choice Cost
+
 in_clInfoType=Type
 
 in_clInfoHD=HD
@@ -652,6 +654,12 @@
 
 in_clInfoBaseStat=Base&nbsp;Stat
 
+in_clSubClassInfo=Subclass Info
+
+in_clSpecialty=Specialty
+
+in_clSpecialtySpells=Specialty Spells
+
 in_clYouAreNotQualifiedToTakeTheClass=You are not qualified to take the class 
 
 in_clTodoLevelUp=Select a class and add a level.
@@ -2128,6 +2136,9 @@
 in_equipChoiceMod=Select {0} ({1})
 in_equipChoiceSelectMod=Select modifier ({0})
 
+in_schoolSpecChoice=School Choice (Specialisation)
+in_schoolProhibitChoice=School Choice (Prohibited)
+
 # House Rules/PRERULE lines
 
 InfoSpells.caster.type=Spell&nbsp;Caster&nbsp;Type

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

Revision: 19029
          http://sourceforge.net/p/pcgen/code/19029
Author:   jdempsey
Date:     2013-01-06 03:55:04 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
Move default choosers to use new UI choosers
* Move substitution class choice to the new choosers.
Issue#: CODE-1852

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/analysis/SubstitutionClassApplication.java
    Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties

Modified: Trunk/pcgen/code/src/java/pcgen/core/analysis/SubstitutionClassApplication.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/analysis/SubstitutionClassApplication.java	2013-01-06 01:50:21 UTC (rev 19028)
+++ Trunk/pcgen/code/src/java/pcgen/core/analysis/SubstitutionClassApplication.java	2013-01-06 03:55:04 UTC (rev 19029)
@@ -27,9 +27,12 @@
 import pcgen.core.PCClass;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.SubstitutionClass;
+import pcgen.core.chooser.CDOMChooserFacadeImpl;
+import pcgen.core.facade.ChooserFacade.ChooserTreeViewType;
 import pcgen.core.prereq.PrereqHandler;
+import pcgen.gui2.facade.Gui2InfoFactory;
+import pcgen.system.LanguageBundle;
 import pcgen.util.chooser.ChooserFactory;
-import pcgen.util.chooser.ChooserInterface;
 
 public class SubstitutionClassApplication
 {
@@ -43,8 +46,6 @@
 		{
 			return;
 		}
-		List<String> columnNames = new ArrayList<String>(1);
-		columnNames.add("Name");
 
 		List<PCClass> choiceList = new ArrayList<PCClass>();
 		buildSubstitutionClassChoiceList(cl, choiceList, aPC.getLevel(cl), aPC);
@@ -55,20 +56,15 @@
 			// base class is chosen.
 		}
 
-		final ChooserInterface c = ChooserFactory.getChooserInstance();
-		c.setTitle("Substitution Levels");
-		c.setMessageText("Choose one of the listed substitution levels "
-				+ "or the base class(top entry).  "
-				+ "Pressing Close will take the standard class level.");
-		c.setTotalChoicesAvail(1);
-		c.setPoolFlag(false);
+		CDOMChooserFacadeImpl<PCClass> chooserFacade =
+				new CDOMChooserFacadeImpl<PCClass>(
+					LanguageBundle.getString("in_SubstLvlChoice"), choiceList, //$NON-NLS-1$
+					new ArrayList<PCClass>(), 1);
+		chooserFacade.setDefaultView(ChooserTreeViewType.NAME);
+		chooserFacade.setInfoFactory(new Gui2InfoFactory(aPC));
+		ChooserFactory.getDelegate().showGeneralChooser(chooserFacade);
 
-		c.setAvailableColumnNames(columnNames);
-		c.setAvailableList(choiceList);
-
-		c.setVisible(true);
-
-		List<PCClass> selectedList = c.getSelectedList();
+		List<PCClass> selectedList = chooserFacade.getFinalSelected();
 		PCClass selected = null;
 		if (!selectedList.isEmpty())
 		{

Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-01-06 01:50:21 UTC (rev 19028)
+++ Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-01-06 03:55:04 UTC (rev 19029)
@@ -2139,6 +2139,8 @@
 in_schoolSpecChoice=School Choice (Specialisation)
 in_schoolProhibitChoice=School Choice (Prohibited)
 
+in_substLvlChoice=Substitution Levels
+
 # House Rules/PRERULE lines
 
 InfoSpells.caster.type=Spell&nbsp;Caster&nbsp;Type

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

Revision: 19038
          http://sourceforge.net/p/pcgen/code/19038
Author:   thpr
Date:     2013-01-06 16:48:07 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
Fix: DOMAIN from PCClass/PCClassLevel can be ignored under certain conditions & handle remove poorly

Issue#: CODE-1989

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/model/ClassFacet.java
    Trunk/pcgen/code/src/java/pcgen/core/PCClass.java
    Trunk/pcgen/code/src/java/pcgen/core/analysis/DomainApplication.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/model/ClassFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/model/ClassFacet.java	2013-01-06 07:12:35 UTC (rev 19037)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/model/ClassFacet.java	2013-01-06 16:48:07 UTC (rev 19038)
@@ -166,11 +166,12 @@
 		ClassInfo info = getClassInfo(id);
 		if (info != null)
 		{
-			if (info.removeClass(obj))
+			if (info.containsClass(obj))
 			{
+				setLevel(id, obj, 0);
+				info.removeClass(obj);
 				fireDataFacetChangeEvent(id, obj,
 					DataFacetChangeEvent.DATA_REMOVED);
-				setLevel(id, obj, 0);
 			}
 			if (info.isEmpty())
 			{

Modified: Trunk/pcgen/code/src/java/pcgen/core/PCClass.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PCClass.java	2013-01-06 07:12:35 UTC (rev 19037)
+++ Trunk/pcgen/code/src/java/pcgen/core/PCClass.java	2013-01-06 16:48:07 UTC (rev 19038)
@@ -967,7 +967,7 @@
 
 		if (!aPC.isImporting())
 		{
-			DomainApplication.modDomainsForLevel(this, newLevel, true, aPC);
+			DomainApplication.addDomainsUpToLevel(this, newLevel, aPC);
 		}
 
 		int levelUpStats = 0;
@@ -1202,7 +1202,7 @@
 
 			doMinusLevelMods(aPC, newLevel + 1);
 
-			DomainApplication.modDomainsForLevel(this, newLevel, false, aPC);
+			DomainApplication.removeDomainsForLevel(this, newLevel + 1, aPC);
 
 			if (newLevel == 0)
 			{

Modified: Trunk/pcgen/code/src/java/pcgen/core/analysis/DomainApplication.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/analysis/DomainApplication.java	2013-01-06 07:12:35 UTC (rev 19037)
+++ Trunk/pcgen/code/src/java/pcgen/core/analysis/DomainApplication.java	2013-01-06 16:48:07 UTC (rev 19038)
@@ -245,37 +245,19 @@
 		}
 	}
 
-	private static void addDomain(final PlayerCharacter aPC, PCClass cl, Domain d,
-			final boolean adding)
+	private static void addDomain(final PlayerCharacter aPC, PCClass cl, Domain d)
 	{
 		if (d.qualifies(aPC, d))
 		{
-			if (adding)
-			{
-				ClassSource source = aPC.getDomainSource(d);
-				if (source != null
-						&& !cl.getKeyName().equals(
-								source.getPcclass().getKeyName()))
-				{
-					// TODO Not entirely correct, as this takes this level, not
-					// the level where BONUS DOMAINS was present
-					ClassSource cs = new ClassSource(cl, aPC
-							.getLevel(cl));
-					aPC.addDomain(d, cs);
-					applyDomain(aPC, d);
-				}
-			}
-			else
-			{
-				if (aPC.hasDomain(d))
-				{
-					aPC.removeDomain(d);
-				}
-			}
+			// TODO Not entirely correct, as this takes this level, not
+			// the level where BONUS DOMAINS was present
+			ClassSource cs = new ClassSource(cl, aPC.getLevel(cl));
+			aPC.addDomain(d, cs);
+			applyDomain(aPC, d);
 		}
 	}
 
-	public static void modDomainsForLevel(PCClass cl, final int aLevel, final boolean adding,
+	public static void addDomainsUpToLevel(PCClass cl, final int aLevel,
 		final PlayerCharacter aPC)
 	{
 	
@@ -299,7 +281,7 @@
 			CDOMSingleRef<Domain> ref = qo.getObject(aPC, cl);
 			if (ref != null)
 			{
-				addDomain(aPC, cl, ref.resolvesTo(), adding);
+				addDomain(aPC, cl, ref.resolvesTo());
 			}
 		}
 		for (int i = 0 ; i <= aLevel; i++)
@@ -313,10 +295,49 @@
 				CDOMSingleRef<Domain> ref = qo.getObject(aPC, cl);
 				if (ref != null)
 				{
-					addDomain(aPC, cl, ref.resolvesTo(), adding);
+					addDomain(aPC, cl, ref.resolvesTo());
 				}
 			}
 		}
 	}
 
+	public static void removeDomainsForLevel(PCClass cl, final int removedLevel,
+		final PlayerCharacter aPC)
+	{
+	
+		/*
+		 * Note this uses ALL of the domains up to and including this level,
+		 * because there is the possibility (albeit strange) that the PC was
+		 * qualified at a previous level change, but the PlayerCharacter is now
+		 * not qualified for the given Domain. Even this has quirks, since it is
+		 * only applied at the time of level increase, but I think that quirk
+		 * should be resolved by a CDOM system around 6.0 - thpr 10/23/06
+		 */
+		for (QualifiedObject<CDOMSingleRef<Domain>> qo : cl.getSafeListFor(ListKey.DOMAIN))
+		{
+			CDOMSingleRef<Domain> ref = qo.getObject(aPC, cl);
+			if (ref == null)
+			{
+				ref = qo.getRawObject();
+				aPC.removeDomain(ref.resolvesTo());
+			}
+		}
+		for (int i = 0 ; i <= removedLevel; i++)
+		{
+			// TODO This stinks for really high level characters - can this ever
+			// get null back?
+			PCClassLevel pcl = aPC.getActiveClassLevel(cl, i);
+			for (QualifiedObject<CDOMSingleRef<Domain>> qo : pcl
+					.getSafeListFor(ListKey.DOMAIN))
+			{
+				CDOMSingleRef<Domain> ref = qo.getObject(aPC, cl);
+				if ((ref == null) || (i == removedLevel))
+				{
+					ref = qo.getRawObject();
+					aPC.removeDomain(ref.resolvesTo());
+				}
+			}
+		}
+	}
+
 }

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

Revision: 19045
          http://sourceforge.net/p/pcgen/code/19045
Author:   thpr
Date:     2013-01-06 22:06:02 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
Eliminate accidental add of debugging into
Issue#: CODE-1974

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/AvailableSpellFacet.java
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/KnownSpellFacet.java
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/MasterAvailableSpellInitializationFacet.java
    Trunk/pcgen/code/src/java/pcgen/core/Globals.java
    Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
    Trunk/pcgen/code/src/java/pcgen/core/SpellSupportForPCClass.java
    Trunk/pcgen/code/src/java/pcgen/core/analysis/DomainApplication.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/AvailableSpellFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/AvailableSpellFacet.java	2013-01-06 21:25:11 UTC (rev 19044)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/AvailableSpellFacet.java	2013-01-06 22:06:02 UTC (rev 19045)
@@ -145,7 +145,6 @@
 				new DoubleKeyMapToList<Spell, CDOMList<Spell>, Integer>();
 		Map<CDOMList<Spell>, Map<Integer, Map<Spell, Set<Object>>>> listMap =
 				getCachedMap(id);
-System.err.println("$$" + listMap);
 		if (listMap == null)
 		{
 			return levelInfo;

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/KnownSpellFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/KnownSpellFacet.java	2013-01-06 21:25:11 UTC (rev 19044)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/KnownSpellFacet.java	2013-01-06 22:06:02 UTC (rev 19045)
@@ -89,30 +89,8 @@
 	}
 
 	@Override
-	public void addAll(CharID id, CDOMList<Spell> list, int level,
-		Collection<Spell> spells, Object source)
-	{
-		// TODO Auto-generated method stub
-		super.addAll(id, list, level, spells, source);
-System.err.println("!" + spells);
-Thread.dumpStack();
-	}
-
-	@Override
-	public void add(CharID id, CDOMList<Spell> list, int level, Spell spell,
-		Object cdo)
-	{
-		// TODO Auto-generated method stub
-		super.add(id, list, level, spell, cdo);
-System.err.println("@" + spell);
-Thread.dumpStack();
-	}
-
-	@Override
 	public void spellAdded(SpellChangeEvent sce)
 	{
-System.err.println(sce.getSpell());
-Thread.dumpStack();
 		add(sce.getCharID(), sce.getSpellList(), sce.getLevel(),
 			sce.getSpell(), sce.getSource());
 	}

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/MasterAvailableSpellInitializationFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/MasterAvailableSpellInitializationFacet.java	2013-01-06 21:25:11 UTC (rev 19044)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/MasterAvailableSpellInitializationFacet.java	2013-01-06 22:06:02 UTC (rev 19045)
@@ -50,7 +50,6 @@
 	 */
 	public void initialize(CharID id)
 	{
-Thread.dumpStack();
 		MasterListInterface masterLists = Globals.getMasterLists();
 		ArrayList<CDOMReference<CDOMList<Spell>>> useLists =
 				new ArrayList<CDOMReference<CDOMList<Spell>>>();

Modified: Trunk/pcgen/code/src/java/pcgen/core/Globals.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Globals.java	2013-01-06 21:25:11 UTC (rev 19044)
+++ Trunk/pcgen/code/src/java/pcgen/core/Globals.java	2013-01-06 22:06:02 UTC (rev 19045)
@@ -780,7 +780,6 @@
 	{
 		boolean allLevels = level == -1;
 		Set<Spell> spellList = new HashSet<Spell>();
-System.err.println("%%");
 		DoubleKeyMapToList<Spell, CDOMList<Spell>, Integer> dkmtl =
 				pc.getSpellLevelInfo();
 		for (Spell spell : dkmtl.getKeySet())

Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java	2013-01-06 21:25:11 UTC (rev 19044)
+++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java	2013-01-06 22:06:02 UTC (rev 19045)
@@ -5068,12 +5068,10 @@
 
 		for (PObject pObj : getSpellClassList())
 		{
-System.err.println(pObj);
 			for (int a = minLevel; a <= maxLevel; a++)
 			{
 				for (CharacterSpell cs : getCharacterSpells(pObj, a))
 				{
-System.err.println(cs);
 					final Spell aSpell = cs.getSpell();
 					SpellSchool ss = Globals.getContext().ref.silentlyGetConstructedCDOMObject(SpellSchool.class,
 							school);
@@ -9750,7 +9748,6 @@
 		DoubleKeyMapToList<Spell, CDOMList<Spell>, Integer> map = cache.get(ObjectKey.SPELL_PC_INFO);
 		if (map == null)
 		{
-System.err.println("%1");
 			map = availSpellFacet.getSpellLevelInfo(id);
 			cache.put(ObjectKey.SPELL_PC_INFO, map);
 		}
@@ -9810,10 +9807,8 @@
 			final int level)
 	{
 		List<CharacterSpell> csList = new ArrayList<CharacterSpell>(getCharacterSpells(spellSource));
-System.err.println("!@" + csList);
 		// Add in the spells granted by objects
 		addBonusKnownSpellsToList(spellSource, csList);
-System.err.println("!#" + csList);
 		final ArrayList<CharacterSpell> aList = new ArrayList<CharacterSpell>();
 		if (csList.size() == 0)
 		{
@@ -10573,7 +10568,6 @@
 		List<CharacterSpell> csList = new ArrayList<CharacterSpell>(getCharacterSpells(spellSource));
 		// Add in the spells granted by objects
 		addBonusKnownSpellsToList(spellSource, csList);
-System.err.println("!"+ csList);
 		ArrayList<CharacterSpell> aList = new ArrayList<CharacterSpell>();
 		for (CharacterSpell cs : csList)
 		{
@@ -10611,8 +10605,6 @@
 
 	public void addCharacterSpell(CDOMObject cdo, CharacterSpell cs)
 	{
-System.err.println("#$"+ cs);
-Thread.dumpStack();
 		activeSpellsFacet.add(id, cs, cdo);
 	}
 

Modified: Trunk/pcgen/code/src/java/pcgen/core/SpellSupportForPCClass.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/SpellSupportForPCClass.java	2013-01-06 21:25:11 UTC (rev 19044)
+++ Trunk/pcgen/code/src/java/pcgen/core/SpellSupportForPCClass.java	2013-01-06 22:06:02 UTC (rev 19045)
@@ -681,7 +681,6 @@
 
 	public void calculateKnownSpellsForClassLevel(PlayerCharacter aPC)
 	{
-System.err.println("@@" + source);
 		// If this class has at least one entry in the "Known spells" tag
 		// And we aer set up to automatically assign known spells...
 		if (source.containsListFor(ListKey.KNOWN_SPELLS) && !aPC.isImporting()
@@ -690,7 +689,6 @@
 			// Get every spell that can be cast by this class.
 			final List<Spell> cspelllist = Globals.getSpellsIn(-1, aPC
 					.getSpellLists(source), aPC);
-System.err.println("##" + cspelllist);
 			if (cspelllist.isEmpty())
 			{
 				return;

Modified: Trunk/pcgen/code/src/java/pcgen/core/analysis/DomainApplication.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/analysis/DomainApplication.java	2013-01-06 21:25:11 UTC (rev 19044)
+++ Trunk/pcgen/code/src/java/pcgen/core/analysis/DomainApplication.java	2013-01-06 22:06:02 UTC (rev 19045)
@@ -54,7 +54,6 @@
 	{
 		ClassSource source = pc.getDomainSource(d);
 		PCClass aClass = pc.getClassKeyed(source.getPcclass().getKeyName());
-System.err.println("%^" + aClass + " " + d);
 		if (aClass != null)
 		{
 			int maxLevel;
@@ -217,7 +216,6 @@
 		{
 			List<Spell> domainSpells = Globals.getSpellsIn(aLevel, Collections
 					.singletonList(d.get(ObjectKey.DOMAIN_SPELLLIST)), pc);
-System.err.println("^^" + domainSpells);
 			for (Spell spell : domainSpells)
 			{
 				List<CharacterSpell> slist =

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

Revision: 19185
          http://sourceforge.net/p/pcgen/code/19185
Author:   thpr
Date:     2013-01-18 03:39:25 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
Fix: CHOOSE:TEMPLATE and other items may not be applied
Issue#: CODE-2021

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/AddedTemplateFacet.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitAlignment.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitBio.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitGear.java
    Trunk/pcgen/code/src/java/pcgen/core/kit/KitSkill.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterUtils.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/AddedTemplateFacet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/AddedTemplateFacet.java	2013-01-18 03:36:26 UTC (rev 19184)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/AddedTemplateFacet.java	2013-01-18 03:39:25 UTC (rev 19185)
@@ -169,13 +169,13 @@
 		{
 			return null;
 		}
-		final List<PCTemplate> selectedList = new ArrayList<PCTemplate>(1);
+		List<PCTemplate> selectedList = new ArrayList<PCTemplate>(1);
 		String title = "Template Choice";
 		if (anOwner != null)
 		{
 			title += " (" + anOwner.getDisplayName() + ")";
 		}
-		Globals.getChoiceFromList(title, availableList, selectedList, 1,
+		selectedList = Globals.getChoiceFromList(title, availableList, selectedList, 1,
 				forceChoice, trackingFacet.getPC(id));
 		if (selectedList.size() == 1)
 		{

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitAlignment.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitAlignment.java	2013-01-18 03:36:26 UTC (rev 19184)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitAlignment.java	2013-01-18 03:39:25 UTC (rev 19185)
@@ -73,7 +73,7 @@
 			while (true)
 			{
 				List<PCAlignment> sel = new ArrayList<PCAlignment>(1);
-				Globals.getChoiceFromList("Choose alignment", alignments, sel,
+				sel = Globals.getChoiceFromList("Choose alignment", alignments, sel,
 					1, aPC);
 				if (sel.size() == 1)
 				{

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitBio.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitBio.java	2013-01-18 03:36:26 UTC (rev 19184)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitBio.java	2013-01-18 03:39:25 UTC (rev 19185)
@@ -109,7 +109,7 @@
 			if (theGenders.size() > 1)
 			{
 				List<Gender> selList = new ArrayList<Gender>(1);
-				Globals.getChoiceFromList("Choose Gender", theGenders, selList,
+				selList = Globals.getChoiceFromList("Choose Gender", theGenders, selList,
 					1, aPC);
 				if (selList.size() == 1)
 				{

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitGear.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitGear.java	2013-01-18 03:36:26 UTC (rev 19184)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitGear.java	2013-01-18 03:39:25 UTC (rev 19185)
@@ -209,7 +209,7 @@
 		else
 		{
 			List<Equipment> selected = new ArrayList<Equipment>(1);
-			Globals.getChoiceFromList("Choose equipment", eqList, selected, 1, aPC);
+			selected = Globals.getChoiceFromList("Choose equipment", eqList, selected, 1, aPC);
 			if (selected.size() == 1)
 			{
 				theEquipment = selected.get(0);

Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitSkill.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/kit/KitSkill.java	2013-01-18 03:36:26 UTC (rev 19184)
+++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitSkill.java	2013-01-18 03:39:25 UTC (rev 19185)
@@ -320,7 +320,7 @@
 		}
 
 		List<Skill> skillChoices = new ArrayList<Skill>();
-		Globals.getChoiceFromList("Select skill", skillsOfType, skillChoices,
+		skillChoices = Globals.getChoiceFromList("Select skill", skillsOfType, skillChoices,
 			getSafeCount(), aPC);
 
 		return skillChoices;

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterUtils.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterUtils.java	2013-01-18 03:36:26 UTC (rev 19184)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterUtils.java	2013-01-18 03:39:25 UTC (rev 19185)
@@ -70,7 +70,7 @@
 				}
 
 				List<Equipment> selectedClothes = new ArrayList<Equipment>();
-				Globals.getChoiceFromList(
+				selectedClothes = Globals.getChoiceFromList(
 					LanguageBundle.getString("in_sumSelectAFreeSetOfClothing"), //$NON-NLS-1$ 
 					clothes, selectedClothes, 1, aPC);
 

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

Revision: 19330
          http://sourceforge.net/p/pcgen/code/19330
Author:   jdempsey
Date:     2013-02-04 12:11:58 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
Allow user to choose sources when loading existing character 
Issue#: CODE-2044

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java
    Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java	2013-02-04 11:49:01 UTC (rev 19329)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java	2013-02-04 12:11:58 UTC (rev 19330)
@@ -654,6 +654,24 @@
 		return true;
 	}
 
+	private boolean checkGameModeEquality(SourceSelectionFacade source1, SourceSelectionFacade source2)
+	{
+		if (source1 == source2)
+		{
+			return true;
+		}
+		if (source1 == null ^ source2 == null)
+		{
+			return false;
+		}
+		//we use reference equality since GameModeFacades come from a fixed database
+		if (source1.getGameMode().getReference() != source2.getGameMode().getReference())
+		{
+			return false;
+		}
+		return true;
+	}
+
 	public boolean saveCharacter(CharacterFacade character)
 	{
 		if (!CharacterManager.characterFilenameValid(character))
@@ -1079,6 +1097,33 @@
 							.initBoolean(
 								PCGenSettings.OPTION_AUTOLOAD_SOURCES_WITH_PC,
 								true);
+			boolean sourcesSame = checkSourceEquality(sources,
+				currentSourceSelection.getReference());
+			boolean gameModesSame = checkGameModeEquality(sources,
+				currentSourceSelection.getReference());
+			if (!dontLoadSources && !sourcesSame && gameModesSame)
+			{
+				int choice =
+						JOptionPane.showOptionDialog(this, LanguageBundle
+							.getFormattedString("in_loadPcDiffSources",
+								getFormattedCampaigns(currentSourceSelection
+									.getReference()),
+								getFormattedCampaigns(sources)), LanguageBundle
+							.getString("in_loadPcSourcesLoadTitle"),
+							JOptionPane.YES_NO_CANCEL_OPTION,
+							JOptionPane.QUESTION_MESSAGE, null, null, null);
+				if (choice == JOptionPane.CANCEL_OPTION)
+				{
+					return;
+				}
+				if (choice == JOptionPane.NO_OPTION)
+				{
+					CharacterManager.openCharacter(pcgFile, PCGenFrame.this,
+						currentDataSetRef.getReference());
+					return;
+				}
+			}
+			
 			if (dontLoadSources)
 			{
 				if (!checkSourceEquality(sources,
@@ -1125,6 +1170,30 @@
 		}
 	}
 
+	private String getFormattedCampaigns(SourceSelectionFacade sources)
+	{
+		StringBuilder campList = new StringBuilder();
+		campList.append("<UL>");
+		int count = 0;
+		final int maxListLen = 5;
+		for (CampaignFacade facade : sources.getCampaigns())
+		{
+			campList.append("<li>");
+			if (count > maxListLen)
+			{
+				int numExtra = sources.getCampaigns().getSize()-maxListLen;
+				campList.append(String.valueOf(numExtra));
+				campList.append(" other sources</li>");
+				break;
+			}
+			campList.append(facade.toString());
+			campList.append("</li>");
+			count++;
+		}
+		campList.append("</UL>");
+		return campList.toString();
+	}
+	
 	/**
 	 * Asynchronously load the sources required for a character and then load the character.
 	 * @param pcgFile The character to be loaded.

Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-02-04 11:49:01 UTC (rev 19329)
+++ Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-02-04 12:11:58 UTC (rev 19330)
@@ -425,7 +425,11 @@
 in_loadPcNoSources=Could not find source files for character: {0}
 in_loadPcIncompatSource=Non-compatible sources are being loaded
 in_loadPcSourcesLoadQuery=<html>Source files could not be found for the character:<br> {0}<br>Do you still wish to load the character?</html>
+in_loadPcSourcesLoadTitle=Do you want to switch source files?
 
+in_loadPcDiffSourceTitle=Choose Sources
+in_loadPcDiffSources=<html>The following sources are already loaded: {0}<br>, but the character uses the sources: {1}.<br>Do you wish to switch sources?</html>
+
 in_loadPartyFailTtile=Unable To Load Party
 in_loadPartyInvalid=Invalid PCGen party file: {0}
 in_loadPartyNoRead=The party file {0} cannot be read.

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

Revision: 19332
          http://sourceforge.net/p/pcgen/code/19332
Author:   jdempsey
Date:     2013-02-05 07:59:32 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
Allow user to choose sources when loading existing character 
* Tidy up source list
Issue#: CODE-2044

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java
    Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java	2013-02-05 06:55:28 UTC (rev 19331)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java	2013-02-05 07:59:32 UTC (rev 19332)
@@ -1174,16 +1174,17 @@
 	{
 		StringBuilder campList = new StringBuilder();
 		campList.append("<UL>");
-		int count = 0;
-		final int maxListLen = 5;
+		int count = 1;
+		final int maxListLen = 6;
 		for (CampaignFacade facade : sources.getCampaigns())
 		{
 			campList.append("<li>");
-			if (count > maxListLen)
+			if (count >= maxListLen && sources.getCampaigns().getSize() > maxListLen)
 			{
-				int numExtra = sources.getCampaigns().getSize()-maxListLen;
-				campList.append(String.valueOf(numExtra));
-				campList.append(" other sources</li>");
+				int numExtra = sources.getCampaigns().getSize()-maxListLen+1;
+				campList.append(LanguageBundle.getFormattedString(
+					"in_loadPcDiffSourcesExcessSources",
+					String.valueOf(numExtra)));
 				break;
 			}
 			campList.append(facade.toString());

Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-02-05 06:55:28 UTC (rev 19331)
+++ Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-02-05 07:59:32 UTC (rev 19332)
@@ -429,6 +429,7 @@
 
 in_loadPcDiffSourceTitle=Choose Sources
 in_loadPcDiffSources=<html>The following sources are already loaded: {0}<br>, but the character uses the sources: {1}.<br>Do you wish to switch sources?</html>
+in_loadPcDiffSourcesExcessSources=and {0} other sources
 
 in_loadPartyFailTtile=Unable To Load Party
 in_loadPartyInvalid=Invalid PCGen party file: {0}

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

Revision: 19346
          http://sourceforge.net/p/pcgen/code/19346
Author:   cpmeister
Date:     2013-02-05 22:25:15 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
Added clear button in Log and Memory Window
Issue #: CODE-1642

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java
    Trunk/pcgen/code/src/java/pcgen/system/LoggingRecorder.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java	2013-02-05 22:12:49 UTC (rev 19345)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java	2013-02-05 22:25:15 UTC (rev 19346)
@@ -23,6 +23,8 @@
 import java.awt.BorderLayout;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.lang.management.ManagementFactory;
@@ -46,6 +48,7 @@
 import javax.swing.table.DefaultTableCellRenderer;
 import pcgen.gui2.PCGenFrame;
 import pcgen.gui2.tools.Utility;
+import pcgen.system.LanguageBundle;
 import pcgen.system.LoggingRecorder;
 import pcgen.util.Logging;
 
@@ -76,10 +79,29 @@
 	private void initComponents()
 	{
 		Container contentPane = getContentPane();
-		contentPane.setLayout(new BorderLayout());
+		contentPane.setLayout(new GridBagLayout());
 		initDebugLog();
-		contentPane.add(new JScrollPane(debuggingText), BorderLayout.CENTER);
-		contentPane.add(memoryPanel, BorderLayout.SOUTH);
+		GridBagConstraints gbc = new GridBagConstraints();
+		gbc.gridwidth = GridBagConstraints.REMAINDER;
+		gbc.weightx = 1;
+		gbc.weighty = 1;
+		gbc.fill = GridBagConstraints.BOTH;
+		contentPane.add(new JScrollPane(debuggingText), gbc);
+		JButton clearButton = new JButton("Clear");
+		clearButton.addActionListener(new ActionListener(){
+
+			@Override
+			public void actionPerformed(ActionEvent e)
+			{
+				LoggingRecorder.clearLogs();
+				debuggingText.setText("");
+			}
+			
+		});
+		
+		gbc.weighty = 0;
+		contentPane.add(clearButton, gbc);
+		contentPane.add(memoryPanel, gbc);
 		setDefaultCloseOperation(HIDE_ON_CLOSE);
 	}
 

Modified: Trunk/pcgen/code/src/java/pcgen/system/LoggingRecorder.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/system/LoggingRecorder.java	2013-02-05 22:12:49 UTC (rev 19345)
+++ Trunk/pcgen/code/src/java/pcgen/system/LoggingRecorder.java	2013-02-05 22:25:15 UTC (rev 19346)
@@ -51,4 +51,9 @@
 		return writer.toString();
 	}
 
+	public static void clearLogs()
+	{
+		writer.getBuffer().setLength(0);
+	}
+
 }

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

Revision: 19402
          http://sourceforge.net/p/pcgen/code/19402
Author:   jdempsey
Date:     2013-02-09 01:38:20 +0000 (Sat, 09 Feb 2013)
Log Message:
-----------
Limit Bypass Feat Prerequisites to Feats Only
Issue#: CODE-2056

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java
    Trunk/pcgen/code/src/java/pcgen/core/analysis/BonusCalc.java
    Trunk/pcgen/code/src/java/pcgen/core/prereq/PrereqHandler.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java	2013-02-09 01:37:39 UTC (rev 19401)
+++ Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java	2013-02-09 01:38:20 UTC (rev 19402)
@@ -390,4 +390,24 @@
 				|| (a.getSafe(ObjectKey.MULTIPLE_ALLOWED) && !pc
 						.containsAssociated(a, newAssociation));
 	}
+
+	/**
+	 * Identify if the object passed in is a feat.
+	 * @param obj The object to be checked.
+	 * @return true if this is a feat, false if not.
+	 */
+	public static boolean isFeat(Object obj)
+	{
+		if (!(obj instanceof Ability))
+		{
+			return false;
+		}
+		Ability ability = (Ability) obj;
+		if (ability.getCDOMCategory() == null)
+		{
+			return false;
+		}
+		return ability.getCDOMCategory() == AbilityCategory.FEAT
+			|| (ability.getCDOMCategory().getParentCategory() == AbilityCategory.FEAT);
+	}
 }

Modified: Trunk/pcgen/code/src/java/pcgen/core/analysis/BonusCalc.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/analysis/BonusCalc.java	2013-02-09 01:37:39 UTC (rev 19401)
+++ Trunk/pcgen/code/src/java/pcgen/core/analysis/BonusCalc.java	2013-02-09 01:38:20 UTC (rev 19402)
@@ -4,6 +4,7 @@
 import java.util.StringTokenizer;
 
 import pcgen.core.Ability;
+import pcgen.core.AbilityUtilities;
 import pcgen.core.AssociationStore;
 import pcgen.core.Equipment;
 import pcgen.core.Globals;
@@ -51,7 +52,9 @@
 	
 		final String aTypePlusName = new StringBuilder(aType).append('.').append(aName).append('.').toString();
 	
-		if (!BonusCalc.dontRecurse && (po instanceof Ability) && !Globals.checkRule(RuleConstants.FEATPRE))
+		if (!BonusCalc.dontRecurse && (po instanceof Ability)
+			&& (AbilityUtilities.isFeat(obj))
+			&& !Globals.checkRule(RuleConstants.FEATPRE))
 		{
 			// SUCK!  This is horrid, but bonusTo is actually recursive with respect to
 			// passesPreReqToGain and there is no other way to do this without decomposing the

Modified: Trunk/pcgen/code/src/java/pcgen/core/prereq/PrereqHandler.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/prereq/PrereqHandler.java	2013-02-09 01:37:39 UTC (rev 19401)
+++ Trunk/pcgen/code/src/java/pcgen/core/prereq/PrereqHandler.java	2013-02-09 01:38:20 UTC (rev 19402)
@@ -33,6 +33,7 @@
 import pcgen.cdom.base.CDOMObject;
 import pcgen.cdom.base.Constants;
 import pcgen.core.Ability;
+import pcgen.core.AbilityUtilities;
 import pcgen.core.Equipment;
 import pcgen.core.Globals;
 import pcgen.core.PCClass;
@@ -75,11 +76,13 @@
 			return true;
 		}
 
-		if ((caller instanceof PCClass) && Globals.checkRule(RuleConstants.CLASSPRE)) //$NON-NLS-1$
+		if ((caller instanceof PCClass)
+			&& Globals.checkRule(RuleConstants.CLASSPRE))
 		{
 			return true;
 		}
-		if ((caller instanceof Ability) && Globals.checkRule(RuleConstants.FEATPRE)) //$NON-NLS-1$
+		if ((caller instanceof Ability) && (AbilityUtilities.isFeat(caller))
+			&& Globals.checkRule(RuleConstants.FEATPRE))
 		{
 			return true;
 		}

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java	2013-02-09 01:37:39 UTC (rev 19401)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java	2013-02-09 01:38:20 UTC (rev 19402)
@@ -804,8 +804,10 @@
 		ability =
 				Globals.getContext().ref.silentlyGetConstructedCDOMObject(
 					Ability.class, theCategory, aKey);
-		if (ability != null && !ability.qualifies(theCharacter, ability)
-			&& !Globals.checkRule(RuleConstants.FEATPRE))
+		if (ability != null
+			&& !ability.qualifies(theCharacter, ability)
+			&& (!Globals.checkRule(RuleConstants.FEATPRE) || !AbilityUtilities
+				.isFeat(ability)))
 		{
 			delegate.showErrorMessage(Constants.APPLICATION_NAME, LanguageBundle
 				.getString("InfoAbility.Messages.NotQualified")); //$NON-NLS-1$

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

Revision: 19415
          http://sourceforge.net/p/pcgen/code/19415
Author:   jdempsey
Date:     2013-02-10 00:58:24 +0000 (Sun, 10 Feb 2013)
Log Message:
-----------
Fix bug: Familiars not being saved
Issue#: CODE-2057

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
    Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java	2013-02-09 23:54:17 UTC (rev 19414)
+++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java	2013-02-10 00:58:24 UTC (rev 19415)
@@ -11078,6 +11078,12 @@
 		skillRankFacet.set(id, sk, localClass, value);
 	}
 	
+	/**
+	 * Retrieve the classes that have ranks in this skill. NB: For granted ranks 
+	 * this may include null.
+	 * @param sk The skill to be checked.
+	 * @return The collection of classes with ranks - may include null as a PCClass.
+	 */
 	public Collection<PCClass> getSkillRankClasses(Skill sk)
 	{
 		return skillRankFacet.getClasses(id, sk);

Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java	2013-02-09 23:54:17 UTC (rev 19414)
+++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java	2013-02-10 00:58:24 UTC (rev 19415)
@@ -2027,23 +2027,27 @@
 
 				for (PCClass pcc : thePC.getSkillRankClasses(skill))
 				{
-					Double rank = thePC.getSkillRankForClass(skill, pcc);
-					buffer.append(TAG_CLASSBOUGHT).append(':');
-					buffer.append('[');
-					buffer.append(TAG_CLASS).append(':');
-					buffer.append(EntityEncoder.encode(pcc == null ? "None" : pcc.getKeyName()));
-					buffer.append('|');
-					buffer.append(TAG_RANKS).append(':');
-					buffer.append(rank);
-					buffer.append('|');
-					buffer.append(TAG_COST).append(':');
-					buffer.append(Integer.toString(thePC
-						.getSkillCostForClass(skill, pcc).getCost()));
-					buffer.append('|');
-					buffer.append(TAG_CLASSSKILL).append(':');
-					buffer.append((thePC.isClassSkill(skill, pcc))
-						? 'Y' : 'N');
-					buffer.append(']');
+					if (pcc != null)
+					{
+						Double rank = thePC.getSkillRankForClass(skill, pcc);
+						buffer.append(TAG_CLASSBOUGHT).append(':');
+						buffer.append('[');
+						buffer.append(TAG_CLASS).append(':');
+						buffer.append(EntityEncoder.encode(pcc == null ? "None"
+							: pcc.getKeyName()));
+						buffer.append('|');
+						buffer.append(TAG_RANKS).append(':');
+						buffer.append(rank);
+						buffer.append('|');
+						buffer.append(TAG_COST).append(':');
+						buffer.append(Integer.toString(thePC
+							.getSkillCostForClass(skill, pcc).getCost()));
+						buffer.append('|');
+						buffer.append(TAG_CLASSSKILL).append(':');
+						buffer.append((thePC.isClassSkill(skill, pcc)) ? 'Y'
+							: 'N');
+						buffer.append(']');
+					}
 				}
 
 				for (String assoc : thePC.getAssociationList(skill))

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

Revision: 19453
          http://sourceforge.net/p/pcgen/code/19453
Author:   jdempsey
Date:     2013-02-13 21:24:41 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
Data Converter - Remember settings between runs
Issue#: CODE-2070

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/CampaignPanel.java
    Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/GameModePanel.java
    Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/SourceSelectionPanel.java
    Trunk/pcgen/code/src/java/pcgen/system/PCGenSettings.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/CampaignPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/CampaignPanel.java	2013-02-13 20:19:39 UTC (rev 19452)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/CampaignPanel.java	2013-02-13 21:24:41 UTC (rev 19453)
@@ -38,6 +38,8 @@
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.AbstractTableModel;
 
+import org.apache.commons.lang.StringUtils;
+
 import pcgen.cdom.base.CDOMObject;
 import pcgen.cdom.enumeration.ListKey;
 import pcgen.cdom.enumeration.ObjectKey;
@@ -46,6 +48,7 @@
 import pcgen.core.Globals;
 import pcgen.gui2.converter.event.ProgressEvent;
 import pcgen.gui2.tools.Utility;
+import pcgen.system.PCGenSettings;
 
 /**
  * The Class <code>CampaignPanel</code> displays a panel allowing 
@@ -149,6 +152,7 @@
 					int[] selRows = table.getSelectedRows();
 					if (selRows.length == 0)
 					{
+						saveSourceSelection(pc);
 						fireProgressEvent(ProgressEvent.NOT_ALLOWED);
 					}
 					else
@@ -159,6 +163,7 @@
 									(Campaign) model.getValueAt(row, 0);
 							pc.addToListFor(ListKey.CAMPAIGN, selCampaign);
 						}
+						saveSourceSelection(pc);
 						fireProgressEvent(ProgressEvent.ALLOWED);
 					}
 				}
@@ -171,9 +176,48 @@
 		gbc.fill = GridBagConstraints.BOTH;
 		panel.add(listScroller, gbc);
 		
+		initSourceSelection(model, table);
 	}
 
 	/**
+	 * 
+	 */
+	private void initSourceSelection(CampaignTableModel model, JTable table)
+	{
+		// Select any previous selections
+		PCGenSettings context = PCGenSettings.getInstance();
+		String sourceString = context
+			.initProperty(PCGenSettings.CONVERT_SOURCES, "");
+		String sources[] = sourceString.split("\\|");
+		for (String srcName : sources)
+		{
+			for (Campaign camp : gameModeCampaigns)
+			{
+				if (camp.toString().equals(srcName))
+				{
+					for (int i = 0; i<model.getRowCount(); i++)
+					{
+						if (camp.equals(model.getValueAt(i, 0)))
+						{
+							table.getSelectionModel().addSelectionInterval(i, i);
+							break;
+						}
+					}
+					break;
+				}
+			}
+		}
+	}
+	
+	private void saveSourceSelection(CDOMObject pc)
+	{
+		List<Campaign> selCampaigns = pc.getSafeListFor(ListKey.CAMPAIGN);
+		PCGenSettings context = PCGenSettings.getInstance();
+		context
+			.setProperty(PCGenSettings.CONVERT_SOURCES, StringUtils.join(selCampaigns, "|"));
+	}
+
+	/**
 	 * The model of the campaign table.
 	 */
 	@SuppressWarnings("serial")

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/GameModePanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/GameModePanel.java	2013-02-13 20:19:39 UTC (rev 19452)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/GameModePanel.java	2013-02-13 21:24:41 UTC (rev 19453)
@@ -36,6 +36,7 @@
 import pcgen.gui2.util.JComboBoxEx;
 import pcgen.persistence.CampaignFileLoader;
 import pcgen.system.ConfigurationSettings;
+import pcgen.system.PCGenSettings;
 import pcgen.util.Logging;
 
 public class GameModePanel extends ConvertSubPanel
@@ -114,7 +115,11 @@
 
 	private void getSelection(CDOMObject pc)
 	{
-		pc.put(ObjectKey.GAME_MODE, (GameMode) gameModeCombo.getSelectedItem());
+		GameMode gameMode = (GameMode) gameModeCombo.getSelectedItem();
+		pc.put(ObjectKey.GAME_MODE, gameMode);
+
+		PCGenSettings context = PCGenSettings.getInstance();
+		context.setProperty(PCGenSettings.CONVERT_GAMEMODE, gameMode.getName());
 	}
 
 	@Override
@@ -140,12 +145,16 @@
 				saveGameMode(pc);
 			}
 		});
+		PCGenSettings context = PCGenSettings.getInstance();
+		SettingsHandler.setGame(context
+			.initProperty(PCGenSettings.CONVERT_GAMEMODE, SettingsHandler
+				.getGame().getName()));
 		GameMode currGame = SettingsHandler.getGame();
 		if (pc.get(ObjectKey.GAME_MODE) != null)
 		{
 			currGame = pc.get(ObjectKey.GAME_MODE);
 		}
-		gameModeCombo.setSelectedItem(currGame.getDisplayName());
+		gameModeCombo.setSelectedItem(currGame);
 		getSelection(pc);
 		saveGameMode(pc);
 

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/SourceSelectionPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/SourceSelectionPanel.java	2013-02-13 20:19:39 UTC (rev 19452)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/SourceSelectionPanel.java	2013-02-13 21:24:41 UTC (rev 19453)
@@ -38,6 +38,7 @@
 import pcgen.gui2.converter.event.ProgressEvent;
 import pcgen.gui2.tools.Utility;
 import pcgen.system.ConfigurationSettings;
+import pcgen.system.PCGenSettings;
 
 /**
  * The Class <code>SourceSelectionPanel</code> gathers the source 
@@ -162,6 +163,10 @@
 							path = fileToOpen;
 							SourceFolder.OTHER.setFile(fileToOpen);
 							pc.put(ObjectKey.DIRECTORY, path);
+							PCGenSettings context = PCGenSettings.getInstance();
+							context.setProperty(
+								PCGenSettings.CONVERT_INPUT_PATH,
+								path.getAbsolutePath());
 							JRadioButton button = radioButtons[SourceFolder.OTHER.ordinal()];
 							button.setSelected(true);
 							button.setText(buildFolderText(SourceFolder.OTHER, fileToOpen.getAbsolutePath()));
@@ -186,6 +191,12 @@
 		{
 			selectedPath = selectedFile.getAbsolutePath();
 		}
+		else
+		{
+			PCGenSettings context = PCGenSettings.getInstance();
+			selectedPath =
+					context.getProperty(PCGenSettings.CONVERT_INPUT_PATH, null);
+		}
 		ButtonGroup group = new ButtonGroup();
 		boolean haveSelected = false;
 		Font font = panel.getFont();
@@ -199,6 +210,9 @@
 				@Override
 				public void actionPerformed(ActionEvent e)
 				{
+					PCGenSettings context = PCGenSettings.getInstance();
+					context.setProperty(PCGenSettings.CONVERT_INPUT_PATH,
+						buttonFolder.getFile().getAbsolutePath());
 					pc.put(ObjectKey.DIRECTORY, buttonFolder.getFile());
 				}
 			});
@@ -255,8 +269,17 @@
 		
 		if (!haveSelected)
 		{
-			if (radioButtons[SourceFolder.VENDORDATA.ordinal()].isEnabled())
+			if (selectedPath != null)
 			{
+				JRadioButton btn = radioButtons[SourceFolder.OTHER.ordinal()];
+				btn.setSelected(true);
+				selectedFile = new File(selectedPath);
+				SourceFolder.OTHER.setFile(selectedFile);
+				path = selectedFile;
+				btn.setText(buildFolderText(SourceFolder.OTHER, selectedFile.getAbsolutePath()));				
+			}
+			else if (radioButtons[SourceFolder.VENDORDATA.ordinal()].isEnabled())
+			{
 				JRadioButton btn = radioButtons[SourceFolder.VENDORDATA.ordinal()];
 				btn.setSelected(true);
 				selectedFile = SourceFolder.VENDORDATA.getFile();

Modified: Trunk/pcgen/code/src/java/pcgen/system/PCGenSettings.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/system/PCGenSettings.java	2013-02-13 20:19:39 UTC (rev 19452)
+++ Trunk/pcgen/code/src/java/pcgen/system/PCGenSettings.java	2013-02-13 21:24:41 UTC (rev 19453)
@@ -63,12 +63,17 @@
 	public static final String CHAR_PORTRAITS_PATH = "pcgen.files.portaits";
 	public static final String BACKUP_PCG_PATH = "pcgen.files.characters.backup";
 	public static final String SELECTED_SPELL_SHEET_PATH = "pcgen.files.selectedSpellOutputSheet";
-	public static final String CONVERT_OUTPUT_SAVE_PATH = "pcgen.files.convertOutput";
 	public static final String RECENT_CHARACTERS = "recentCharacters";
 	public static final String RECENT_PARTIES = "recentParties";
 	public static final String LAST_LOADED_SOURCES = "lastLoadedSources";
 	public static final String LAST_LOADED_GAME = "lastLoadedGame";
 
+	/* Data converter saved choices. */
+	public static final String CONVERT_OUTPUT_SAVE_PATH = "pcgen.convert.outputPath";
+	public static final String CONVERT_INPUT_PATH = "pcgen.convert.inputPath";
+	public static final String CONVERT_GAMEMODE = "pcgen.convert.gamemode";
+	public static final String CONVERT_SOURCES = "pcgen.convert.sources";
+	
 	public static final PropertyContext GMGEN_OPTIONS_CONTEXT = instance.createChildContext("gmgen.options");
 	
 	private PCGenSettings()

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

Revision: 19486
          http://sourceforge.net/p/pcgen/code/19486
Author:   jdempsey
Date:     2013-02-17 01:33:11 +0000 (Sun, 17 Feb 2013)
Log Message:
-----------
Purchase Tab - Add 'Delete Custom Item' menu item
Issue#: CODE-2081

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/facade/CharacterFacade.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
    Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java
    Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties

Modified: Trunk/pcgen/code/src/java/pcgen/core/facade/CharacterFacade.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/facade/CharacterFacade.java	2013-02-16 22:26:55 UTC (rev 19485)
+++ Trunk/pcgen/code/src/java/pcgen/core/facade/CharacterFacade.java	2013-02-17 01:33:11 UTC (rev 19486)
@@ -839,4 +839,10 @@
 	 * @param targets The equipment to be updated.
 	 */
 	public void modifyCharges(List<EquipmentFacade> targets);
+
+	/**
+	 * Delete the custom equipment item, ignored if the equip is not custom.
+	 * @param equip The equipment item to be deleted.
+	 */
+	public void deleteCustomEquipment(EquipmentFacade equip);
 }

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2013-02-16 22:26:55 UTC (rev 19485)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2013-02-17 01:33:11 UTC (rev 19486)
@@ -3491,7 +3491,7 @@
 		if (updatedItem != null)
 		{
 			final double prevQty = (updatedItem.qty() < 0) ? 0 : updatedItem.qty();
-			final double newQty = prevQty - quantity;
+			final double newQty = Math.max(prevQty - quantity, 0);
 
 			if (newQty <= 0)
 			{
@@ -3533,6 +3533,44 @@
 		updateWealthFields();
 	}
 
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void deleteCustomEquipment(EquipmentFacade eqFacade)
+	{
+		if (eqFacade == null || !(eqFacade instanceof Equipment))
+		{
+			return;
+		}
+
+		Equipment itemToBeDeleted = (Equipment) eqFacade;
+		
+		if (!itemToBeDeleted.isType(Constants.TYPE_CUSTOM))
+		{
+			return;
+		}
+		
+		if (!delegate.showWarningConfirm(LanguageBundle
+			.getString("in_igDeleteCustomWarnTitle"),//$NON-NLS-1$
+			LanguageBundle.getFormattedString("in_igDeleteCustomWarning", //$NON-NLS-1$
+				itemToBeDeleted)))
+		{
+			return;
+		}
+		
+		removePurchasedEquipment(itemToBeDeleted, Integer.MAX_VALUE);
+		Globals.getContext().ref.forget(itemToBeDeleted);
+		
+		if (dataSet.getEquipment() instanceof DefaultListFacade<?>)
+		{
+			((DefaultListFacade<EquipmentFacade>) dataSet.getEquipment())
+				.removeElement(itemToBeDeleted);
+		}
+		
+	}
+	
 	/* (non-Javadoc)
 	 * @see pcgen.core.facade.CharacterFacade#isQualifiedFor(pcgen.core.facade.EquipmentFacade)
 	 */

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java	2013-02-16 22:26:55 UTC (rev 19485)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java	2013-02-17 01:33:11 UTC (rev 19486)
@@ -374,6 +374,7 @@
 		state.put(AddCustomAction.class, new AddCustomAction(character));
 		state.put(AddAction.class, new AddAction(character));
 		state.put(RemoveAction.class, new RemoveAction(character));
+		state.put(DeleteCustomAction.class, new DeleteCustomAction(character));
 		state.put(FundsAddAction.class, new FundsAddAction(character));
 		state.put(FundsSubtractAction.class, new FundsSubtractAction(character));
 		state.put(AllowDebtAction.class, new AllowDebtAction(character));
@@ -584,6 +585,42 @@
 
 	}
 
+	/**
+	 * The Class <code>DeleteCustomAction</code> defines an action to delete a 
+	 * custom equipment item.
+	 * 
+	 * @author James Dempsey <jdempsey@...>
+	 */
+	private class DeleteCustomAction extends AbstractAction
+	{
+
+		private CharacterFacade character;
+
+		public DeleteCustomAction(CharacterFacade character)
+		{
+			super(LanguageBundle.getString("in_igDeleteCustom")); //$NON-NLS-1$
+			this.character = character;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e)
+		{
+			List<?> data = availableTable.getSelectedData();
+			if (data != null)
+			{
+				for (Object object : data)
+				{
+					if (object instanceof EquipmentFacade)
+					{
+						EquipmentFacade equip = (EquipmentFacade) object;
+						character.deleteCustomEquipment(equip);
+					}
+				}
+			}
+		}
+
+	}
+
 	private class UseAutoResizeAction extends AbstractAction
 	{
 
@@ -1325,6 +1362,7 @@
 			popupMenu.add(new BuyNumMenuItem(character, targets, 0));
 			popupMenu.addSeparator();
 			popupMenu.add(new AddCustomAction(character));
+			popupMenu.add(new DeleteCustomAction(character));
 			popupMenu.show(e.getComponent(), e.getX(), e.getY());
 		}
 

Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-02-16 22:26:55 UTC (rev 19485)
+++ Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-02-17 01:33:11 UTC (rev 19486)
@@ -1409,6 +1409,12 @@
 
 in_igAddCustom=Add Custom
 
+in_igDeleteCustom=Delete Custom Item
+
+in_igDeleteCustomWarnTitle=Delete Custom Item
+
+in_igDeleteCustomWarning=Are you sure you want to delete the item {0}? 
+
 in_igInfoLabelTextType=Type
 
 in_igInfoLabelTextWield=Wield

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

Revision: 19491
          http://sourceforge.net/p/pcgen/code/19491
Author:   jdempsey
Date:     2013-02-17 04:41:46 +0000 (Sun, 17 Feb 2013)
Log Message:
-----------
Provide some more guidance for LST conversion
Allow the data changes file to be set via the options.ini file

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/RunConvertPanel.java
    Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/WriteDirectoryPanel.java
    Trunk/pcgen/code/src/java/pcgen/system/PCGenSettings.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/RunConvertPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/RunConvertPanel.java	2013-02-17 04:40:04 UTC (rev 19490)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/RunConvertPanel.java	2013-02-17 04:41:46 UTC (rev 19491)
@@ -74,6 +74,7 @@
 import pcgen.rules.context.EditorLoadContext;
 import pcgen.system.LanguageBundle;
 import pcgen.system.PCGenPropBundle;
+import pcgen.system.PCGenSettings;
 import pcgen.util.Logging;
 
 /**
@@ -100,11 +101,17 @@
 	private String lastNotifiedFilename = "";
 	private String currFilename = "";
 	private Component statusField;
+	private File changeLogFile;
 
 	public RunConvertPanel(Component statusField)
 	{
 		context = new EditorLoadContext();
 		this.statusField = statusField;
+		PCGenSettings context = PCGenSettings.getInstance();
+		String dataLogFileName =
+				context.initProperty(PCGenSettings.CONVERT_DATA_LOG_FILE,
+					"dataChanges.log");		 
+		changeLogFile = new File(dataLogFileName);
 	}
 	
 	/* (non-Javadoc)
@@ -162,7 +169,6 @@
 				Writer changeLogWriter;
 				try
 				{
-					File changeLogFile = new File("dataChanges.log");
 					changeLogWriter = new FileWriter(changeLogFile);
 
 					SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -256,6 +262,17 @@
 		gbc.insets = new Insets(0, 10, 5, 10);
 		panel.add(introLabel, gbc);
 
+
+		JLabel explainLabel = new JLabel("<html>The LST data is being converted. In the log, " +
+				"LSTERROR rows are errors that need to be manually corrected in the source data. " +
+				"LSTWARN rows indicate changes the converter is making. " + 
+				"See " + changeLogFile.getAbsolutePath() + " for a log of all data changes.</html>");
+		explainLabel.setFocusable(true);
+		Utility.buildRelativeConstraints(gbc, GridBagConstraints.REMAINDER, 1, 1.0, 0);
+		gbc.fill = GridBagConstraints.HORIZONTAL;
+		gbc.insets = new Insets(0, 10, 5, 10);
+		panel.add(explainLabel, gbc);
+		
         progressBar = getProgressBar();
         Dimension d = progressBar.getPreferredSize();
         d.width = 400;
@@ -585,6 +602,7 @@
 			campDisplay.append("\n");
 		}
 		Logging.log(Logging.INFO, "Sources: " + campDisplay.toString());
+		Logging.log(Logging.INFO, "Logging changes to " + changeLogFile.getAbsolutePath());
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/WriteDirectoryPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/WriteDirectoryPanel.java	2013-02-17 04:40:04 UTC (rev 19490)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/WriteDirectoryPanel.java	2013-02-17 04:41:46 UTC (rev 19491)
@@ -20,6 +20,9 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.swing.JButton;
 import javax.swing.JFileChooser;
@@ -28,10 +31,13 @@
 import javax.swing.JPanel;
 import javax.swing.SpringLayout;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.SystemUtils;
 
 import pcgen.cdom.base.CDOMObject;
+import pcgen.cdom.enumeration.ListKey;
 import pcgen.cdom.enumeration.ObjectKey;
+import pcgen.core.Campaign;
 import pcgen.gui2.converter.event.ProgressEvent;
 import pcgen.gui2.converter.event.TaskStrategyMessage;
 import pcgen.system.PCGenSettings;
@@ -44,10 +50,38 @@
 	private SpringLayout layout = new SpringLayout();
 
 	private final JLabel fileLabel;
+	private final JLabel warningLabel;
 
+	private FilenameFilter pccFileFilter = new FilenameFilter()
+	{
+
+        @Override
+		public boolean accept(File parentDir, String fileName)
+		{
+			/*
+			 * This is a specific "hack" in order to speed loading when
+			 * in a development (Subversion-based) environment - Tom
+			 * Parker 1/17/07
+			 */
+			if (".svn".equals(fileName))
+			{
+				return false;
+			}
+			if (StringUtils.endsWithIgnoreCase(fileName, ".pcc"))
+			{
+				return true;
+			}
+			return new File(parentDir, fileName).isDirectory();
+		}
+
+	};
+
+	private List<Campaign> campaignList;
+	
 	public WriteDirectoryPanel()
 	{
 		fileLabel = new JLabel();
+		warningLabel = new JLabel();
 	}
 
 	public String getPath()
@@ -59,6 +93,7 @@
 	public boolean performAnalysis(CDOMObject pc)
 	{
 		TaskStrategyMessage.sendStatus(this, "Finding Data Directories");
+		campaignList = pc.getListFor(ListKey.CAMPAIGN);
 		path = pc.get(ObjectKey.WRITE_DIRECTORY);
 		if (path != null)
 		{
@@ -128,6 +163,7 @@
 							context.setProperty(
 								PCGenSettings.CONVERT_OUTPUT_SAVE_PATH,
 								path.getAbsolutePath());
+							showWarning();
 							break;
 						}
 						JOptionPane.showMessageDialog(null,
@@ -145,6 +181,8 @@
 		panel.add(label);
 		panel.add(fileLabel);
 		panel.add(button);
+		panel.add(warningLabel);
+		showWarning();
 		layout.putConstraint(SpringLayout.NORTH, label, 50, SpringLayout.NORTH,
 				panel);
 		layout.putConstraint(SpringLayout.NORTH, fileLabel, 75 + label
@@ -157,6 +195,82 @@
 				SpringLayout.WEST, panel);
 		layout.putConstraint(SpringLayout.EAST, button, -50, SpringLayout.EAST,
 				panel);
+		layout.putConstraint(SpringLayout.NORTH, warningLabel, 20, SpringLayout.SOUTH,
+			fileLabel);
+		layout.putConstraint(SpringLayout.WEST, warningLabel, 25, SpringLayout.WEST,
+			panel);
+		
 		fileLabel.setText(path.getAbsolutePath());
 	}
+	
+	private void showWarning()
+	{
+		List<Campaign> existingCampaigns = getExistingPccs();
+		StringBuilder warning = new StringBuilder("<html>");
+		if (existingCampaigns.size() > 0)
+		{
+			int i= 1;
+			final int maxCampaigns = 15;
+			warning.append("<b>Warning</b>: Some converted campaigns already exist in this ");
+			warning.append("destination folder and will be skipped:\n<UL>");
+			for (Campaign camp : existingCampaigns)
+			{
+				if (i >= maxCampaigns && existingCampaigns.size() > maxCampaigns)
+				{
+					warning.append("<li>"
+						+ (existingCampaigns.size() - maxCampaigns + 1)
+						+ " more campaigns.</li>");
+					break;
+				}
+				warning.append("<li>");
+				warning.append(camp.getName());
+				warning.append("</li>");
+				i++;
+			}
+			warning.append("</ul>");
+		}
+		warning.append("</html>");
+		warningLabel.setText(warning.toString());
+	}
+	
+	private List<Campaign> getExistingPccs()
+	{
+		List<File> existingFiles = new ArrayList<File>();
+		findPCCFiles(path, existingFiles);
+		
+		List<Campaign> matchingCampaigns = new ArrayList<Campaign>();
+		
+		for (Campaign camp : campaignList)
+		{
+			File campFile = new File(camp.getSourceURI());
+			for (File file : existingFiles)
+			{
+				if (file.getName().equals(campFile.getName()))
+				{
+					matchingCampaigns.add(camp);
+					break;
+				}
+			}
+		}
+		
+		return matchingCampaigns;
+	}
+
+	private void findPCCFiles(File aDirectory, List<File> existingFiles)
+	{
+		if (!aDirectory.exists() || !aDirectory.isDirectory())
+		{
+			return;
+		}
+		for (File file : aDirectory.listFiles(pccFileFilter))
+		{
+			if (file.isDirectory())
+			{
+				findPCCFiles(file, existingFiles);
+				continue;
+			}
+			existingFiles.add(file);
+		}
+	}
+	
 }

Modified: Trunk/pcgen/code/src/java/pcgen/system/PCGenSettings.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/system/PCGenSettings.java	2013-02-17 04:40:04 UTC (rev 19490)
+++ Trunk/pcgen/code/src/java/pcgen/system/PCGenSettings.java	2013-02-17 04:41:46 UTC (rev 19491)
@@ -73,6 +73,7 @@
 	public static final String CONVERT_INPUT_PATH = "pcgen.convert.inputPath";
 	public static final String CONVERT_GAMEMODE = "pcgen.convert.gamemode";
 	public static final String CONVERT_SOURCES = "pcgen.convert.sources";
+	public static final String CONVERT_DATA_LOG_FILE = "pcgen.convert.dataLogFile";
 	
 	public static final PropertyContext GMGEN_OPTIONS_CONTEXT = instance.createChildContext("gmgen.options");
 	

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

Revision: 19688
          http://sourceforge.net/p/pcgen/code/19688
Author:   jdempsey
Date:     2013-03-23 04:11:39 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
Add info about advanced tab to the basic sources tab 
Issue#: CODE-2110

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java
    Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java	2013-03-23 03:15:52 UTC (rev 19687)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java	2013-03-23 04:11:39 UTC (rev 19688)
@@ -543,7 +543,6 @@
 			mainPane.setTopComponent(new JScrollPane(sourceList));
 			infoPane.setPreferredSize(new Dimension(800, 150));
 			mainPane.setBottomComponent(infoPane);
-			setLayout(new BorderLayout());
 			add(mainPane, BorderLayout.CENTER);
 		}
 

Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-03-23 03:15:52 UTC (rev 19687)
+++ Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2013-03-23 04:11:39 UTC (rev 19688)
@@ -2770,7 +2770,7 @@
 in_mnuSettingsSources=Load Sources
 in_mnuSettingsSourcesTip=Select the sources for your character from the most common options
 
-in_qsrc_intro=Select a Source to load, or define a new set of sources
+in_qsrc_intro=<html>Select a predefined source below to load, or use the <b>Advanced</b> tab to select from our huge list of supported sources.</html>
 
 in_source_info=Info
 

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

Revision: 19889
          http://sourceforge.net/p/pcgen/code/19889
Author:   jdempsey
Date:     2013-04-09 12:04:31 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
Import Chris Dolan's Memory and Lst Load Optimisations
* 1st attempt at memory optimization of the LST reader
Issue#: CODE-2126

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/converter/LSTConverter.java
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstFileLoader.java
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/LSTConverter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/converter/LSTConverter.java	2013-04-09 10:30:59 UTC (rev 19888)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/LSTConverter.java	2013-04-09 12:04:31 UTC (rev 19889)
@@ -309,8 +309,7 @@
 		StringBuilder resultBuffer = new StringBuilder(dataBuffer.length());
 		final String aString = dataBuffer.toString();
 
-		String[] fileLines = aString.replaceAll("\r\n", "\r").split(
-				LstFileLoader.LINE_SEPARATOR_REGEXP);
+		String[] fileLines = aString.split(LstFileLoader.LINE_SEPARATOR_REGEXP);
 		for (int line = 0; line < fileLines.length; line++)
 		{
 			String lineString = fileLines[line];

Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstFileLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstFileLoader.java	2013-04-09 10:30:59 UTC (rev 19888)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstFileLoader.java	2013-04-09 12:04:31 UTC (rev 19889)
@@ -24,6 +24,7 @@
  */
 package pcgen.persistence.lst;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -66,7 +67,7 @@
 	public static final char LINE_COMMENT_CHAR = '#'; //$NON-NLS-1$
 
 	/** The String that separates individual objects */
-	public static final String LINE_SEPARATOR_REGEXP = "(\r|\n)"; //$NON-NLS-1$
+	public static final String LINE_SEPARATOR_REGEXP = "(\r\n?|\n)"; //$NON-NLS-1$
 
 	/**
 	 * This method reads the given URL and stores its contents in the provided
@@ -88,7 +89,6 @@
 				"LstFileLoader.readFromURI() received a null uri parameter!");
 		}
 		
-		StringBuilder dataBuffer = new StringBuilder();
 		URL url;
 		try {
 			url = uri.toURL();
@@ -99,11 +99,26 @@
 		}
 		InputStream inputStream = null;
 
+		StringBuilder dataBuffer = null;
 		try
 		{
 			//only load local urls, unless loading of URLs is allowed
 			if (!CoreUtility.isNetURL(url) || SettingsHandler.isLoadURLs())
 			{
+				// try to make a buffer of sufficient size in one go to save on GC
+				int size = 2048;
+				if ("file".equals(url.getProtocol())) 
+				{
+					long fileSize = new File(url.getPath()).length();
+					if (fileSize > 0)
+					{
+						// this is an overestimate if the LST has wide 
+						// characters, but it's accurate for ASCII
+						size = (int) fileSize; 
+					}
+				}
+				dataBuffer = new StringBuilder(size);
+
 				// Get the URL and open the stream
 				inputStream = url.openStream();
 
@@ -169,6 +184,6 @@
 				}
 			}
 		}
-		return dataBuffer;
+		return dataBuffer == null ? new StringBuilder() : dataBuffer;
 	}
 }

Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java	2013-04-09 10:30:59 UTC (rev 19888)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java	2013-04-09 12:04:31 UTC (rev 19889)
@@ -366,8 +366,7 @@
 			aString = aString.replaceAll("\r?\n\t", "\t");
 		}
 		
-		String[] fileLines = aString.replaceAll("\r\n", "\r").split(
-				LstFileLoader.LINE_SEPARATOR_REGEXP);
+		String[] fileLines = aString.split(LstFileLoader.LINE_SEPARATOR_REGEXP);
 
 		for (int i = 0; i < fileLines.length; i++)
 		{

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

Revision: 20079
          http://sourceforge.net/p/pcgen/code/20079
Author:   jdempsey
Date:     2013-05-06 09:29:16 +0000 (Mon, 06 May 2013)
Log Message:
-----------
Handle the lack of preview templates a bit more gracefully.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java
    Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java	2013-05-05 22:37:32 UTC (rev 20078)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java	2013-05-06 09:29:16 UTC (rev 20079)
@@ -141,7 +141,7 @@
 
 	public void setCharacterSheet(File sheet)
 	{
-		handler = new ExportHandler(sheet);
+		handler = sheet == null ? null : new ExportHandler(sheet);
 	}
 
 	public void refresh()

Modified: Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java	2013-05-05 22:37:32 UTC (rev 20078)
+++ Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java	2013-05-06 09:29:16 UTC (rev 20079)
@@ -187,6 +187,11 @@
 	 */
 	public void write(PlayerCharacter aPC, BufferedWriter out)
 	{
+		if (templateFile == null)
+		{
+			throw new IllegalStateException("Template file must not be null");
+		}
+		
 		// TODO Not sure why this is here, it sets the outputfilter to 
 		// be that of the character sheet template, makes no sense?
 		FileAccess.setCurrentOutputFilter(templateFile.getName());

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

Revision: 20107
          http://sourceforge.net/p/pcgen/code/20107
Author:   jujutsunerd
Date:     2013-05-10 18:47:45 +0000 (Fri, 10 May 2013)
Log Message:
-----------
Cleaning up FOP use a bit before starting actual work on switching to FOP 1.1
Issue#: CODE-72

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java
    Trunk/pcgen/code/src/java/pcgen/system/BatchExporter.java
    Trunk/pcgen/code/src/java/pcgen/util/JEPResourceChecker.java
    Trunk/pcgen/code/src/java/pcgen/util/SkinLFResourceChecker.java

Added Paths:
-----------
    Trunk/pcgen/code/src/java/pcgen/util/ResourceChecker.java
    Trunk/pcgen/code/src/java/pcgen/util/fop/
    Trunk/pcgen/code/src/java/pcgen/util/fop/FOP0205HandlerImpl.java
    Trunk/pcgen/code/src/java/pcgen/util/fop/FOP11HandlerImpl.java
    Trunk/pcgen/code/src/java/pcgen/util/fop/FOPHandler.java
    Trunk/pcgen/code/src/java/pcgen/util/fop/FOPHandlerFactory.java

Removed Paths:
-------------
    Trunk/pcgen/code/src/java/pcgen/util/FOPHandler.java
    Trunk/pcgen/code/src/java/pcgen/util/FOPResourceChecker.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java	2013-05-10 15:20:49 UTC (rev 20106)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -36,9 +36,7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
-import java.awt.print.PageFormat;
-import java.awt.print.PrinterException;
-import java.awt.print.PrinterJob;
+import java.awt.print.*;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.BufferedWriter;
@@ -76,7 +74,6 @@
 import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.commons.io.filefilter.SuffixFileFilter;
 import org.apache.commons.io.filefilter.TrueFileFilter;
-import org.apache.fop.render.awt.AWTRenderer;
 import pcgen.cdom.base.Constants;
 import pcgen.core.facade.CharacterFacade;
 import pcgen.gui2.PCGenFrame;
@@ -84,7 +81,8 @@
 import pcgen.gui2.tools.Utility;
 import pcgen.io.ExportHandler;
 import pcgen.system.ConfigurationSettings;
-import pcgen.util.FOPHandler;
+import pcgen.util.fop.FOPHandler;
+import pcgen.util.fop.FOPHandlerFactory;
 import pcgen.util.Logging;
 
 /**
@@ -127,7 +125,7 @@
 		super(frame, true);
 		this.frame = frame;
 		this.character = frame.getSelectedCharacterRef().getReference();
-		this.handler = new FOPHandler();
+		this.handler = FOPHandlerFactory.createFOPHandlerImpl(true);
 		this.sheetPreview = new SheetPreview();
 		this.sheetBox = new JComboBox();
 		this.progressBar = new JProgressBar();
@@ -246,10 +244,10 @@
 		}
 		else if (PRINT_COMMAND.equals(e.getActionCommand()))
 		{
-			AWTRenderer renderer = sheetPreview.getRenderer();
+			Pageable renderer = sheetPreview.getPageable();
 			PrinterJob printerJob = PrinterJob.getPrinterJob();
-			printerJob.setPrintable(renderer);
-			printerJob.setPageable(renderer);
+			printerJob.setPageable(sheetPreview.getPageable());
+			//printerJob.setPageable((Pageable)sheetPreview.getPageable());
 			if (printerJob.printDialog())
 			{
 				try
@@ -362,7 +360,7 @@
 		private static final PageFormat format = new PageFormat();
 		private Image[] pageCache;
 		private double scaleFactor = .75;
-		private AWTRenderer renderer;
+		private Pageable renderer;
 		private Image previewImage;
 		private int currentPage;
 
@@ -421,12 +419,12 @@
 			repaint();
 		}
 
-		public AWTRenderer getRenderer()
+		public Pageable getPageable()
 		{
 			return renderer;
 		}
 
-		public void setRenderer(AWTRenderer renderer)
+		public void setRenderer(Pageable renderer)
 		{
 			this.renderer = renderer;
 			if (renderer.getNumberOfPages() > 0)
@@ -459,7 +457,8 @@
 				g2.scale(4, 4);
 				try
 				{
-					renderer.print(g, format, currentPage);
+					Printable printable = renderer.getPrintable(currentPage);
+					printable.print(g, format, currentPage);
 				}
 				catch (PrinterException ex)
 				{
@@ -501,7 +500,7 @@
 
 	}
 
-	private class PreviewLoader extends SwingWorker<AWTRenderer, Object>
+	private class PreviewLoader extends SwingWorker<Pageable, Object>
 	{
 
 		private URI uri;
@@ -516,7 +515,7 @@
 		}
 
 		@Override
-		protected AWTRenderer doInBackground() throws Exception
+		protected Pageable doInBackground() throws Exception
 		{
 			URI osPath = new File(ConfigurationSettings.getOutputSheetsDir()).toURI();
 			File xsltFile = new File(osPath.resolve(uri));
@@ -524,7 +523,7 @@
 			printToXMLFile(temp, character);
 			handler.setInputFile(temp, xsltFile);
 			handler.run();
-			return (AWTRenderer) handler.getRenderer();
+			return (Pageable) handler.getPageable();
 		}
 
 		@Override
@@ -535,7 +534,7 @@
 			enableEditGroup(true);
 			try
 			{
-				AWTRenderer renderer = get();
+				Pageable renderer = get();
 				sheetPreview.setRenderer(renderer);
 				pageBox.setModel(createPagesModel(renderer.getNumberOfPages()));
 			}

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java	2013-05-10 15:20:49 UTC (rev 20106)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -95,7 +95,8 @@
 import pcgen.system.BatchExporter;
 import pcgen.system.LanguageBundle;
 import pcgen.system.PCGenSettings;
-import pcgen.util.FOPHandler;
+import pcgen.util.fop.FOPHandler;
+import pcgen.util.fop.FOPHandlerFactory;
 import pcgen.util.Logging;
 
 /**
@@ -1530,7 +1531,7 @@
 	 */
 	private void pdfExport(final File outFile, File tmpFile, File xsltFile)
 	{
-		FOPHandler fh = new FOPHandler();
+		FOPHandler fh = FOPHandlerFactory.createFOPHandlerImpl(true);
 
 		// setting up pdf renderer
 		fh.setMode(FOPHandler.PDF_MODE);

Modified: Trunk/pcgen/code/src/java/pcgen/system/BatchExporter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/system/BatchExporter.java	2013-05-10 15:20:49 UTC (rev 20106)
+++ Trunk/pcgen/code/src/java/pcgen/system/BatchExporter.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -46,7 +46,8 @@
 import pcgen.io.ExportHandler;
 import pcgen.io.PCGFile;
 import pcgen.persistence.SourceFileLoader;
-import pcgen.util.FOPHandler;
+import pcgen.util.fop.FOPHandler;
+import pcgen.util.fop.FOPHandlerFactory;
 import pcgen.util.Logging;
 
 /**
@@ -225,7 +226,7 @@
 	{
 		String extension =
 				StringUtils.substringAfterLast(templateFile.getName(), ".");
-		FOPHandler handler = new FOPHandler();
+		FOPHandler handler = FOPHandlerFactory.createFOPHandlerImpl(true);
 		File tempFile = null;
 		try
 		{
@@ -370,7 +371,7 @@
 	{
 		String extension =
 				StringUtils.substringAfterLast(templateFile.getName(), ".");
-		FOPHandler handler = new FOPHandler();
+		FOPHandler handler = FOPHandlerFactory.createFOPHandlerImpl(true);
 		File tempFile = null;
 		try
 		{

Deleted: Trunk/pcgen/code/src/java/pcgen/util/FOPHandler.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/FOPHandler.java	2013-05-10 15:20:49 UTC (rev 20106)
+++ Trunk/pcgen/code/src/java/pcgen/util/FOPHandler.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -1,310 +0,0 @@
-/*
- * FOPHandler.java
- * Copyright 2001 (C) Bryan McRoberts <merton_monk@...>
- *
- * 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 April 21, 2001, 2:15 PM
- */
-package pcgen.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.fop.apps.Driver;
-import org.apache.fop.apps.FOInputHandler;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.InputHandler;
-import org.apache.fop.apps.XSLTInputHandler;
-import org.apache.fop.render.Renderer;
-import org.apache.fop.render.awt.AWTRenderer;
-import org.apache.fop.viewer.SecureResourceBundle;
-import org.xml.sax.XMLReader;
-
-import pcgen.cdom.base.Constants;
-
-/**
- * Title:        FOPHandler.java
- * Description:  Interface to the Apache FOP API (0.20.5);
- *               this class handles all the interaction
- * Copyright:    Copyright (c) 2001
- * Company:
- * @author Thomas Behr
- * @version $Revision$
- */
-public final class FOPHandler implements Runnable
-{
-	/** PDF_MODE = 0 */
-	public static final int PDF_MODE = 0;
-
-	/** AWT_MODE = 1 */
-	public static final int AWT_MODE = 1;
-
-	private Driver driver;
-	private File outFile;
-	private FileOutputStream fos;
-
-	private InputHandler inputHandler;
-	private Renderer renderer;
-	private StringBuilder errBuffer;
-	private int mode;
-
-	/**
-	 * Constructor, defaults us to PDF Mode
-	 */
-	public FOPHandler()
-	{
-		driver = new Driver();
-		inputHandler = null;
-		outFile = null;
-		mode = PDF_MODE;
-		errBuffer = new StringBuilder();
-		renderer = null;
-	}
-
-	/**
-	 * Get the error message
-	 * @return error message
-	 */
-	public String getErrorMessage()
-	{
-		return errBuffer.toString();
-	}
-
-	/**
-	 * Set the input file, e.g. immediately convert file into appropriate FOInputHandler type
-	 * 
-	 * @param in
-	 */
-	public void setInputFile(File in)
-	{
-		try
-		{
-			if (in == null)
-			{
-				throw new NullPointerException(
-					"XML file must be specified for the tranform mode");
-			}
-
-			if (!in.exists())
-			{
-				throw new FileNotFoundException("xml file "
-					+ in.getAbsolutePath() + " not found ");
-			}
-
-			inputHandler = new FOInputHandler(in);
-		}
-		catch (FileNotFoundException e)
-		{
-			errBuffer.append(e.getMessage()).append(Constants.LINE_SEPARATOR);
-			Logging.errorPrint("Exception in FOPHandler:setInputFile", e);
-		}
-	}
-
-	/**
-	 * Immediately convert file into appropriate InputHandler type
-	 * 
-	 * @param xmlFile
-	 * @param xsltFile
-	 */
-	public void setInputFile(File xmlFile, File xsltFile)
-	{
-		try
-		{
-			if (xmlFile == null)
-			{
-				throw new NullPointerException(
-					"XML file must be specified for the tranform mode");
-			}
-
-			if (xsltFile == null)
-			{
-				throw new NullPointerException(
-					"XSLT file must be specified for the tranform mode");
-			}
-
-			if (!xmlFile.exists())
-			{
-				throw new FileNotFoundException("xml file "
-					+ xmlFile.getAbsolutePath() + " not found ");
-			}
-
-			if (!xsltFile.exists())
-			{
-				throw new FileNotFoundException("xsl file "
-					+ xsltFile.getAbsolutePath() + " not found ");
-			}
-
-			inputHandler = new XSLTInputHandler(xmlFile, xsltFile);
-		}
-		catch (FileNotFoundException e)
-		{
-			errBuffer.append(e.getMessage()).append(Constants.LINE_SEPARATOR);
-			Logging.errorPrint("Exception in FOPHandler:setInputFile", e);
-		}
-		catch (NullPointerException e)
-		{
-			errBuffer.append(e.getMessage()).append(Constants.LINE_SEPARATOR);
-			Logging.errorPrint("Exception in FOPHandler:setInputFile", e);
-		}
-		catch (FOPException e)
-		{
-			errBuffer.append(e.getMessage()).append(Constants.LINE_SEPARATOR);
-			Logging.errorPrint("Exception in FOPHandler:setInputFile", e);
-		}
-	}
-
-	/**
-	 * Set the mode
-	 * @param m
-	 */
-	public void setMode(int m)
-	{
-		mode = m;
-	}
-
-	/**
-	 * Set the output file
-	 * @param out
-	 */
-	public void setOutputFile(File out)
-	{
-		outFile = out;
-	}
-
-	/**
-	 * Get the Renderer
-	 * @return Renderer
-	 */
-	public Renderer getRenderer()
-	{
-		return renderer;
-	}
-
-	/**
-	 * Run the FO to PDF/AWT conversion
-	 */
-    @Override
-	public void run()
-	{
-		errBuffer.delete(0, errBuffer.length());
-
-		if (inputHandler == null)
-		{
-			errBuffer.append("Export request failed. Please see console for details.").append(
-				Constants.LINE_SEPARATOR);
-			Logging.errorPrint("Error in FOPHandler:run - previous errors stopped intermediate file " +
-					"from being produced. Could not produce output.");
-			return;
-		}
-		
-		// Reset the driver from the last run
-		driver.reset();
-
-		// PDF Mode
-		if (mode == PDF_MODE)
-		{
-			fos = null;
-			renderer = null;
-			driver.setRenderer(Driver.RENDER_PDF);
-
-			/* 
-			 * Expanded functionality to be able to handle XSLT files.
-			 * Now operates based on InputHandlers.
-			 */
-			try
-			{
-				XMLReader parser = inputHandler.getParser();
-
-				Map<String, Boolean> rendererOptions =
-						new HashMap<String, Boolean>();
-				rendererOptions.put("fineDetail", Boolean.valueOf(false));
-				driver.getRenderer().setOptions(rendererOptions);
-				driver.getRenderer().setProducer("PC Gen Character Generator");
-				fos = new FileOutputStream(outFile);
-				driver.setOutputStream(fos);
-				driver.render(parser, inputHandler.getInputSource());
-			}
-			catch (FOPException fopex)
-			{
-				errBuffer.append(fopex.getMessage()).append(
-					Constants.LINE_SEPARATOR);
-				Logging.errorPrint("Exception in FOPHandler:run", fopex);
-			}
-			catch (FileNotFoundException fnfex)
-			{
-				errBuffer.append(fnfex.getMessage()).append(
-					Constants.LINE_SEPARATOR);
-				Logging
-					.errorPrint("Exception in FOPHandler:run, cannot find file: "
-						+ fnfex.getMessage());
-			}
-			finally
-			{
-				if (fos != null)
-				{
-					try
-					{
-						fos.close();
-					}
-					catch (IOException ioex)
-					{
-						errBuffer.append(ioex.getMessage()).append(
-							Constants.LINE_SEPARATOR);
-						Logging.errorPrint("Exception in FOPHandler:run", ioex);
-					}
-				}
-			}
-		}
-		else if (mode == AWT_MODE)
-		{
-			renderer = createAWTRenderer();
-			driver.setRenderer(renderer);
-			try
-			{
-				XMLReader parser;
-				parser = inputHandler.getParser();
-				driver.render(parser, inputHandler.getInputSource());
-			}
-			catch (FOPException fopex)
-			{
-				errBuffer.append(fopex.getMessage()).append(
-					Constants.LINE_SEPARATOR);
-				Logging.errorPrint("Exception in FOPHandler:run", fopex);
-			}
-		}
-		else
-		{
-			Logging.errorPrint("Unsupported mode for file export.");
-		}
-	}
-
-	/**
-	 * Get the AWT Renderer
-	 * @return AWTRenderer
-	 */
-	private static AWTRenderer createAWTRenderer()
-	{
-		final byte[] bytes = new byte[0];
-
-		return new AWTRenderer(new SecureResourceBundle(
-			new ByteArrayInputStream(bytes)));
-	}
-}

Deleted: Trunk/pcgen/code/src/java/pcgen/util/FOPResourceChecker.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/FOPResourceChecker.java	2013-05-10 15:20:49 UTC (rev 20106)
+++ Trunk/pcgen/code/src/java/pcgen/util/FOPResourceChecker.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -1,139 +0,0 @@
-/*
- * FOPResourceChecker.java
- * Copyright 2001 (C) Bryan McRoberts <merton_monk@...>
- *
- * 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 April 21, 2001, 2:15 PM
- */
-package pcgen.util;
-
-import pcgen.system.LanguageBundle;
-
-/**
- * This class checks that PCGen has the right resources in order to run Fop
- */
-public final class FOPResourceChecker
-{
-	/** Count of the number of missing resources */
-	private static int missingResourceCount;
-
-	/** A buffer containing the resources */
-	private static StringBuilder resourceBuffer;
-
-	/** String containing URL link if there are missing resources */
-	private static final String whereToGetIt =
-			"<a href=\"http://prdownloads.sourceforge.net/pcgen/pdf_new.zip\">pdf.zip</a>";
-
-	/** Handle to resource bundle message for where to get missing resources */
-	static final String getItHereMsg =
-			LanguageBundle.getString("in_FollowLink");
-
-	/** 
-	 * Handle to resource bundle message for when there is a missing resource
-	 *  
-	 * TODO Why does this have a hard coded line separator? JK070115
-	 */
-	static final String missingLibMsg =
-			LanguageBundle.getString("MissingLibMessage").replace('|', '\n');
-
-	// This will automatically run once when this class is referenced 
-	static
-	{
-		missingResourceCount = 0;
-		resourceBuffer = new StringBuilder(0);
-		checkResource();
-	}
-
-	/**
-	 * Get the missing resource count
-	 * @return missing resource count
-	 */
-	public static int getMissingResourceCount()
-	{
-		return missingResourceCount;
-	}
-
-	/**
-	 * Get the missing resource message
-	 * @return missing resource message
-	 */
-	public static String getMissingResourceMessage()
-	{
-		if (missingResourceCount != 0)
-		{
-			// TODO Why does this have hardcoded line separators? JK070115
-			return resourceBuffer.toString() + "\n" + getItHereMsg
-				+ whereToGetIt + "\n" + missingLibMsg;
-		}
-		return "";
-	}
-
-	/**
-	 * Return TRUE if the resource exists in the jar
-	 * 
-	 * @param resourceName
-	 * @param jarName
-	 * @param sb
-	 * @return TRUE if the resource exists in the jar
-	 */
-	public static boolean hasResource(final String resourceName,
-		final String jarName, StringBuilder sb)
-	{
-		try
-		{
-			Class.forName(resourceName);
-			return true;
-		}
-		catch (ClassNotFoundException cnfex)
-		{
-			// TODO Why does this have a hard coded line separator? JK070115
-			sb.append("Missing resource: ").append(jarName).append('\n');
-		}
-		catch (NoClassDefFoundError ncdfer)
-		{
-			// TODO Why does this have a hard coded line separator? JK070115
-			sb.append("Missing dependency of resource: ").append(jarName)
-				.append('\n');
-			Logging.errorPrint("Error loading class " + resourceName + ": "
-				+ ncdfer.toString(), ncdfer);
-		}
-		return false;
-	}
-
-	/**
-	 * Helper method, checks that the resources are in the corresponding jar file
-	 */
-	private static void checkResource()
-	{
-		final String[] resources =
-				{"org.apache.fop.apps.Fop", "fop.jar",
-					"org.apache.xalan.xslt.Process", "xalan-2.5.2.jar",
-					"org.apache.batik.dom.svg.SVGDocumentFactory", "batik.jar"};
-
-		String resource = null;
-		String jar = null;
-
-		for (int i = 0; i < (resources.length / 2); ++i)
-		{
-			resource = resources[i * 2];
-			jar = resources[(i * 2) + 1];
-			if (!hasResource(resource, jar, resourceBuffer))
-			{
-				++missingResourceCount;
-			}
-		}
-	}
-}

Modified: Trunk/pcgen/code/src/java/pcgen/util/JEPResourceChecker.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/JEPResourceChecker.java	2013-05-10 15:20:49 UTC (rev 20106)
+++ Trunk/pcgen/code/src/java/pcgen/util/JEPResourceChecker.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -32,8 +32,6 @@
 {
 	private static int missingResourceCount;
 	private static StringBuilder resourceBuffer;
-	private static final String whereToGetIt =
-			"<a href=\"http://svn.sourceforge.net/viewcvs.cgi/*checkout*/pcgen/Trunk/pcgen/lib/jep/jep-2.3.1.jar\">jep-2.3.1.jar</a>";
 
 	static
 	{
@@ -53,26 +51,10 @@
 		return missingResourceCount;
 	}
 
-	/**
-	 * Get the missing resource message
-	 * @return the missing resource message
-	 */
-	public static String getMissingResourceMessage()
-	{
-		if (missingResourceCount != 0)
-		{
-			return resourceBuffer.toString() + "\n"
-				+ FOPResourceChecker.getItHereMsg + whereToGetIt + "\n"
-				+ FOPResourceChecker.missingLibMsg;//TODO Why does this have hardcoded file separators? JK070115
-		}
-
-		return "";
-	}
-
 	private static void checkResource()
 	{
-		if (!FOPResourceChecker.hasResource("org.nfunk.jep.JEP",
-			"jep-2.3.1.jar", resourceBuffer))
+		if (!ResourceChecker.hasResource("org.nfunk.jep.JEP",
+				"jep-2.3.1.jar", resourceBuffer))
 		{
 			++missingResourceCount;
 		}

Added: Trunk/pcgen/code/src/java/pcgen/util/ResourceChecker.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/ResourceChecker.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/pcgen/util/ResourceChecker.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -0,0 +1,71 @@
+/*
+ * ResourceChecker.java
+ * Copyright 2001 (C) Bryan McRoberts <merton_monk@...>
+ *
+ * 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 April 21, 2001, 2:15 PM
+ */
+package pcgen.util;
+
+import pcgen.system.LanguageBundle;
+
+/**
+ * This utility class is used by the various resource checkers to see if pcgen has needed classes.
+ */
+public final class ResourceChecker
+{
+	/** Handle to resource bundle message for where to get missing resources */
+	static final String getItHereMsg =
+			LanguageBundle.getString("in_FollowLink");
+
+	/**
+	 * Handle to resource bundle message for when there is a missing resource
+	 *
+	 */
+	static final String missingLibMsg =
+			LanguageBundle.getString("MissingLibMessage").replace('|', '\n');
+
+	/**
+	 * Return TRUE if the resource exists in the jar
+	 *
+	 * @param resourceName
+	 * @param jarName
+	 * @param sb
+	 * @return TRUE if the resource exists in the jar
+	 */
+	public static boolean hasResource(final String resourceName,
+		final String jarName, StringBuilder sb)
+	{
+		try
+		{
+			Class.forName(resourceName);
+			return true;
+		}
+		catch (ClassNotFoundException cnfex)
+		{
+			sb.append("Missing resource: ").append(jarName).append('\n');
+		}
+		catch (NoClassDefFoundError ncdfer)
+		{
+			sb.append("Missing dependency of resource: ").append(jarName)
+				.append('\n');
+			Logging.errorPrint("Error loading class " + resourceName + ": "
+				+ ncdfer.toString(), ncdfer);
+		}
+		return false;
+	}
+
+}

Modified: Trunk/pcgen/code/src/java/pcgen/util/SkinLFResourceChecker.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/SkinLFResourceChecker.java	2013-05-10 15:20:49 UTC (rev 20106)
+++ Trunk/pcgen/code/src/java/pcgen/util/SkinLFResourceChecker.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -62,8 +62,8 @@
 		if (missingResourceCount != 0)
 		{
 			return resourceBuffer.toString() + "\n"
-				+ FOPResourceChecker.getItHereMsg + whereToGetIt + "\n"
-				+ FOPResourceChecker.missingLibMsg;//TODO Why does this have hardcoded file separators? JK070115
+				+ ResourceChecker.getItHereMsg + whereToGetIt + "\n"
+				+ ResourceChecker.missingLibMsg;//TODO Why does this have hardcoded file separators? JK070115
 		}
 
 		return "";
@@ -71,9 +71,9 @@
 
 	private static void checkResource()
 	{
-		if (!FOPResourceChecker.hasResource(
-			"com.l2fprod.gui.plaf.skin.SkinLookAndFeel", "skinlf.jar",
-			resourceBuffer))
+		if (!ResourceChecker.hasResource(
+				"com.l2fprod.gui.plaf.skin.SkinLookAndFeel", "skinlf.jar",
+				resourceBuffer))
 		{
 			++missingResourceCount;
 		}

Index: Trunk/pcgen/code/src/java/pcgen/util/fop
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/fop	2013-05-10 15:20:49 UTC (rev 20106)
+++ Trunk/pcgen/code/src/java/pcgen/util/fop	2013-05-10 18:47:45 UTC (rev 20107)

Property changes on: Trunk/pcgen/code/src/java/pcgen/util/fop
___________________________________________________________________
Added: bugtraq:url
## -0,0 +1 ##
+http://jira.pcgen.org/browse/%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+Issue#: %BUGID%
\ No newline at end of property
Added: bugtraq:number
## -0,0 +1 ##
+false
\ No newline at end of property
Added: Trunk/pcgen/code/src/java/pcgen/util/fop/FOP0205HandlerImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/fop/FOP0205HandlerImpl.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/pcgen/util/fop/FOP0205HandlerImpl.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -0,0 +1,310 @@
+/*
+ * FOPHandler.java
+ * Copyright 2001 (C) Bryan McRoberts <merton_monk@...>
+ *
+ * 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 April 21, 2001, 2:15 PM
+ */
+package pcgen.util.fop;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.fop.apps.Driver;
+import org.apache.fop.apps.FOInputHandler;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.InputHandler;
+import org.apache.fop.apps.XSLTInputHandler;
+import org.apache.fop.render.awt.AWTRenderer;
+import org.apache.fop.viewer.SecureResourceBundle;
+import org.xml.sax.XMLReader;
+
+import pcgen.cdom.base.Constants;
+import pcgen.util.Logging;
+
+/**
+ * Title:        FOPHandler.java
+ * Description:  Interface to the Apache FOP API (0.20.5);
+ *               this class handles all the interaction
+ * Copyright:    Copyright (c) 2001
+ * Company:
+ * @author Thomas Behr
+ * @version $Revision: 18335 $
+ */
+public final class FOP0205HandlerImpl implements FOPHandler {
+
+	private Driver driver;
+	private File outFile;
+	private FileOutputStream fos;
+
+	private InputHandler inputHandler;
+	private AWTRenderer renderer;
+	private StringBuilder errBuffer;
+	private int mode;
+
+	/**
+	 * Constructor, defaults us to PDF Mode
+	 */
+	FOP0205HandlerImpl()
+	{
+		driver = new Driver();
+		inputHandler = null;
+		outFile = null;
+		mode = PDF_MODE;
+		errBuffer = new StringBuilder();
+		renderer = null;
+	}
+
+	/**
+	 * Get the error message
+	 * @return error message
+	 */
+	@Override
+	public String getErrorMessage()
+	{
+		return errBuffer.toString();
+	}
+
+	/**
+	 * Set the input file, e.g. immediately convert file into appropriate FOInputHandler type
+	 * 
+	 * @param in
+	 */
+	@Override
+	public void setInputFile(File in)
+	{
+		try
+		{
+			if (in == null)
+			{
+				throw new NullPointerException(
+					"XML file must be specified for the tranform mode");
+			}
+
+			if (!in.exists())
+			{
+				throw new FileNotFoundException("xml file "
+					+ in.getAbsolutePath() + " not found ");
+			}
+
+			inputHandler = new FOInputHandler(in);
+		}
+		catch (FileNotFoundException e)
+		{
+			errBuffer.append(e.getMessage()).append(Constants.LINE_SEPARATOR);
+			Logging.errorPrint("Exception in FOPHandler:setInputFile", e);
+		}
+	}
+
+	/**
+	 * Immediately convert file into appropriate InputHandler type
+	 * 
+	 * @param xmlFile
+	 * @param xsltFile
+	 */
+	@Override
+	public void setInputFile(File xmlFile, File xsltFile)
+	{
+		try
+		{
+			if (xmlFile == null)
+			{
+				throw new NullPointerException(
+					"XML file must be specified for the tranform mode");
+			}
+
+			if (xsltFile == null)
+			{
+				throw new NullPointerException(
+					"XSLT file must be specified for the tranform mode");
+			}
+
+			if (!xmlFile.exists())
+			{
+				throw new FileNotFoundException("xml file "
+					+ xmlFile.getAbsolutePath() + " not found ");
+			}
+
+			if (!xsltFile.exists())
+			{
+				throw new FileNotFoundException("xsl file "
+					+ xsltFile.getAbsolutePath() + " not found ");
+			}
+
+			inputHandler = new XSLTInputHandler(xmlFile, xsltFile);
+		}
+		catch (FileNotFoundException e)
+		{
+			errBuffer.append(e.getMessage()).append(Constants.LINE_SEPARATOR);
+			Logging.errorPrint("Exception in FOPHandler:setInputFile", e);
+		}
+		catch (NullPointerException e)
+		{
+			errBuffer.append(e.getMessage()).append(Constants.LINE_SEPARATOR);
+			Logging.errorPrint("Exception in FOPHandler:setInputFile", e);
+		}
+		catch (FOPException e)
+		{
+			errBuffer.append(e.getMessage()).append(Constants.LINE_SEPARATOR);
+			Logging.errorPrint("Exception in FOPHandler:setInputFile", e);
+		}
+	}
+
+	/**
+	 * Set the mode
+	 * @param m
+	 */
+	@Override
+	public void setMode(int m)
+	{
+		mode = m;
+	}
+
+	/**
+	 * Set the output file
+	 * @param out
+	 */
+	@Override
+	public void setOutputFile(File out)
+	{
+		outFile = out;
+	}
+
+	/**
+	 * Get the Renderer
+	 * @return Renderer
+	 */
+	@Override
+	public AWTRenderer getPageable()
+	{
+		return renderer;
+	}
+
+	/**
+	 * Run the FO to PDF/AWT conversion
+	 */
+    @Override
+	public void run()
+	{
+		errBuffer.delete(0, errBuffer.length());
+
+		if (inputHandler == null)
+		{
+			errBuffer.append("Export request failed. Please see console for details.").append(
+				Constants.LINE_SEPARATOR);
+			Logging.errorPrint("Error in FOPHandler:run - previous errors stopped intermediate file " +
+					"from being produced. Could not produce output.");
+			return;
+		}
+		
+		// Reset the driver from the last run
+		driver.reset();
+
+		// PDF Mode
+		if (mode == PDF_MODE)
+		{
+			fos = null;
+			renderer = null;
+			driver.setRenderer(Driver.RENDER_PDF);
+
+			/* 
+			 * Expanded functionality to be able to handle XSLT files.
+			 * Now operates based on InputHandlers.
+			 */
+			try
+			{
+				XMLReader parser = inputHandler.getParser();
+
+				Map<String, Boolean> rendererOptions =
+						new HashMap<String, Boolean>();
+				rendererOptions.put("fineDetail", Boolean.valueOf(false));
+				driver.getRenderer().setOptions(rendererOptions);
+				driver.getRenderer().setProducer("PC Gen Character Generator");
+				fos = new FileOutputStream(outFile);
+				driver.setOutputStream(fos);
+				driver.render(parser, inputHandler.getInputSource());
+			}
+			catch (FOPException fopex)
+			{
+				errBuffer.append(fopex.getMessage()).append(
+					Constants.LINE_SEPARATOR);
+				Logging.errorPrint("Exception in FOPHandler:run", fopex);
+			}
+			catch (FileNotFoundException fnfex)
+			{
+				errBuffer.append(fnfex.getMessage()).append(
+					Constants.LINE_SEPARATOR);
+				Logging
+					.errorPrint("Exception in FOPHandler:run, cannot find file: "
+						+ fnfex.getMessage());
+			}
+			finally
+			{
+				if (fos != null)
+				{
+					try
+					{
+						fos.close();
+					}
+					catch (IOException ioex)
+					{
+						errBuffer.append(ioex.getMessage()).append(
+							Constants.LINE_SEPARATOR);
+						Logging.errorPrint("Exception in FOPHandler:run", ioex);
+					}
+				}
+			}
+		}
+		else if (mode == AWT_MODE)
+		{
+			renderer = createAWTRenderer();
+			driver.setRenderer(renderer);
+			try
+			{
+				XMLReader parser;
+				parser = inputHandler.getParser();
+				driver.render(parser, inputHandler.getInputSource());
+			}
+			catch (FOPException fopex)
+			{
+				errBuffer.append(fopex.getMessage()).append(
+					Constants.LINE_SEPARATOR);
+				Logging.errorPrint("Exception in FOPHandler:run", fopex);
+			}
+		}
+		else
+		{
+			Logging.errorPrint("Unsupported mode for file export.");
+		}
+	}
+
+	/**
+	 * Get the AWT Renderer
+	 * @return AWTRenderer
+	 */
+	private static AWTRenderer createAWTRenderer()
+	{
+		final byte[] bytes = new byte[0];
+
+		return new AWTRenderer(new SecureResourceBundle(
+			new ByteArrayInputStream(bytes)));
+	}
+}

Added: Trunk/pcgen/code/src/java/pcgen/util/fop/FOP11HandlerImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/fop/FOP11HandlerImpl.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/pcgen/util/fop/FOP11HandlerImpl.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -0,0 +1,82 @@
+/*
+ * FOP11HandlerImpl.java
+ * Copyright 2013 (C) Jonas Karlsson <jk@...>
+ *
+ * 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 April 21, 2001, 2:15 PM
+ */
+package pcgen.util.fop;
+
+
+import java.awt.print.Pageable;
+import java.io.File;
+import java.io.FileOutputStream;
+
+public class FOP11HandlerImpl implements FOPHandler {
+
+	private File outFile;
+	private FileOutputStream fos;
+
+	private StringBuilder errBuffer;
+	private int mode;
+
+	/**
+	 * Constructor, defaults us to PDF Mode
+	 */
+	FOP11HandlerImpl()
+	{
+		outFile = null;
+		mode = PDF_MODE;
+		errBuffer = new StringBuilder();
+	}
+
+
+	@Override
+	public String getErrorMessage() {
+		return errBuffer.toString();
+	}
+
+	@Override
+	public void setInputFile(File in) {
+		//TODO Unimplemented
+	}
+
+	@Override
+	public void setInputFile(File xmlFile, File xsltFile) {
+		//TODO Unimplemented
+	}
+
+	@Override
+	public void setMode(int m) {
+		//TODO Unimplemented
+	}
+
+	@Override
+	public void setOutputFile(File out) {
+		//TODO Unimplemented
+	}
+
+	@Override
+	@Deprecated
+	public Pageable getPageable() {
+		return null;
+	}
+
+	@Override
+	public void run() {
+		//TODO Unimplemented
+	}
+}

Added: Trunk/pcgen/code/src/java/pcgen/util/fop/FOPHandler.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/fop/FOPHandler.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/pcgen/util/fop/FOPHandler.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -0,0 +1,58 @@
+/*
+ * FOP11HandlerImpl.java
+ * Copyright 2013 (C) Jonas Karlsson <jk@...>
+ *
+ * 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 April 21, 2001, 2:15 PM
+ */
+package pcgen.util.fop;
+
+import java.awt.print.Pageable;
+import java.io.File;
+
+/*
+General plan (with - at least - a commit after each stage.) If I fail to complete all tasks below the FOP code will at least not be in a worse state than now.
+1) FopHandler > Interface, Factory and (current) FOP0205HandlerImpl.
+2) Add necessary libs for FOP 1.1, and change the build files to include them as well as create a non-working FOP11HandlerImpl and change factory to switch implementation based on property, add aforementioned property.
+3) This might be a good point to also add the config file support mentioned in a comment below.
+4) Convert a d20 pdf sheet (csheet_fantasy_simple_blackandwhite.xslt) to
+5) Work on FOP11HandlerImpl (and probably the sheet at the same time) until it seems to work for my selected example.
+7) Possibly convert more sheets. Unless conversion is found to be pretty much an easily discovered and fairly simple set of search and replace actions I'm unlikely to complete this, at least not unassisted. My graphic design skills are pretty much non-existent. :)
+
+ */
+
+
+public interface FOPHandler extends Runnable {
+	/** PDF_MODE = 0 */
+	int PDF_MODE = 0;
+	/** AWT_MODE = 1 */
+	int AWT_MODE = 1;
+
+	String getErrorMessage();
+
+	void setInputFile(File in);
+
+	void setInputFile(File xmlFile, File xsltFile);
+
+	void setMode(int m);
+
+	void setOutputFile(File out);
+
+	Pageable getPageable();
+
+	@Override
+	void run();
+}

Added: Trunk/pcgen/code/src/java/pcgen/util/fop/FOPHandlerFactory.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/fop/FOPHandlerFactory.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/pcgen/util/fop/FOPHandlerFactory.java	2013-05-10 18:47:45 UTC (rev 20107)
@@ -0,0 +1,33 @@
+/*
+ * FOP11HandlerImpl.java
+ * Copyright 2013 (C) Jonas Karlsson <jk@...>
+ *
+ * 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 April 21, 2001, 2:15 PM
+ */
+package pcgen.util.fop;
+
+public class FOPHandlerFactory {
+	public static FOPHandler createFOPHandlerImpl(boolean oldFop) {
+		if(oldFop) {
+			return new FOP0205HandlerImpl();
+		} else {
+			return new FOP11HandlerImpl();
+		}
+	}
+
+
+}

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

Revision: 20112
          http://sourceforge.net/p/pcgen/code/20112
Author:   jdempsey
Date:     2013-05-11 08:26:11 +0000 (Sat, 11 May 2013)
Log Message:
-----------
Allow items to be reordered in equipment sets 
* Add buttons for move up/down
* Fix some corner cases for move up/down
* Add sorting of container contents
* Show items not carried as not carried on output.
Issue#: CODE-1687

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/character/EquipSet.java
    Trunk/pcgen/code/src/java/pcgen/core/facade/EquipmentSetFacade.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java
    Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java
    Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/character/EquipSet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/character/EquipSet.java	2013-05-11 00:28:56 UTC (rev 20111)
+++ Trunk/pcgen/code/src/java/pcgen/core/character/EquipSet.java	2013-05-11 08:26:11 UTC (rev 20112)
@@ -121,7 +121,7 @@
 		}
 		catch (NullPointerException e)
 		{
-			Logging.errorPrint("Error in EquipSet.getId", e);
+			Logging.errorPrint("Error in EquipSet.getId " + path, e);
 		}
 
 		return id;
@@ -497,7 +497,33 @@
 		// it's inside a container, don't try to equip
 		if (aTok.countTokens() > Constants.ID_PATH_LENGTH_FOR_NON_CONTAINED)
 		{
-			eq_item.addEquipmentToLocation(qty, EquipmentLocation.CONTAINED, false, aPC);
+			// Get back to carried/equipped/not carried to determine correct location
+			StringBuilder rootPath = new StringBuilder(); 
+			for (int i = 0; i < Constants.ID_PATH_LENGTH_FOR_NON_CONTAINED; i++)
+			{
+				if (i > 0)
+				{
+					rootPath.append(".");
+				}
+				rootPath.append(aTok.nextToken());
+			}
+			EquipSet rootSet = aPC.getEquipSetByIdPath(rootPath.toString());
+			if (rootSet != null && rootSet.name.startsWith(Constants.EQUIP_LOCATION_CARRIED))
+			{
+				eq_item.addEquipmentToLocation(qty, EquipmentLocation.CARRIED_NEITHER, false, aPC);
+			}
+			else if (rootSet != null && rootSet.name.startsWith(Constants.EQUIP_LOCATION_NOTCARRIED))
+			{
+				eq_item.addEquipmentToLocation(qty, EquipmentLocation.NOT_CARRIED, false, aPC);
+			}
+			else if (rootSet != null && rootSet.name.startsWith(Constants.EQUIP_LOCATION_EQUIPPED))
+			{
+				eq_item.addEquipmentToLocation(qty, EquipmentLocation.EQUIPPED_NEITHER, false, aPC);
+			}
+			else
+			{
+				eq_item.addEquipmentToLocation(qty, EquipmentLocation.CONTAINED, false, aPC);
+			}
 		}
 		else if (name.startsWith(Constants.EQUIP_LOCATION_CARRIED))
 		{

Modified: Trunk/pcgen/code/src/java/pcgen/core/facade/EquipmentSetFacade.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/facade/EquipmentSetFacade.java	2013-05-11 00:28:56 UTC (rev 20111)
+++ Trunk/pcgen/code/src/java/pcgen/core/facade/EquipmentSetFacade.java	2013-05-11 08:26:11 UTC (rev 20112)
@@ -172,4 +172,12 @@
 	 */
 	public boolean moveEquipment(EquipNode node, int numRowsToMove);
 
+	/**
+	 * Sort the contents of the supplied node in alphabetical order.
+	 * @param parentNode The node, may be a container or a general 
+	 * body slot.
+	 * @return true if the sort was successful, false if it could not be done.
+	 */
+	public boolean sortEquipment(EquipNode parentNode);
+
 }

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2013-05-11 00:28:56 UTC (rev 20111)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2013-05-11 08:26:11 UTC (rev 20112)
@@ -40,6 +40,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import javax.swing.undo.UndoManager;
@@ -2656,14 +2657,30 @@
 		{
 			try
 			{
-				Logging.log(Logging.DEBUG, "Starting export at serial " + theCharacter.getSerial() + " to " + theHandler.getTemplateFile());
+				Logging.log(Logging.ERROR, "Starting export at serial " + theCharacter.getSerial() + " to " + theHandler.getTemplateFile());
 				PlayerCharacter exportPc =  getExportCharacter();
+				//PlayerCharacter exportPc =  theCharacter;
 				theHandler.write(exportPc, buf);
-				Logging.log(Logging.DEBUG, "Finished export at serial " + theCharacter.getSerial() + " to " + theHandler.getTemplateFile());
+				Logging.log(Logging.ERROR, "Finished export at serial " + theCharacter.getSerial() + " to " + theHandler.getTemplateFile());
 				return;
 			} catch (ConcurrentModificationException e)
 			{
-				Logging.log(Logging.DEBUG, "Retrying export after ConcurrentModificationException");
+				Map<Thread, StackTraceElement[]> allStackTraces = Thread.getAllStackTraces();
+				for (Entry<Thread, StackTraceElement[]> threadEntry : allStackTraces.entrySet())
+				{
+					if (threadEntry.getValue().length > 1 )
+					{
+						StringBuilder sb = new StringBuilder("Thread: " + threadEntry.getKey() + "\n");
+						for (StackTraceElement elem : threadEntry.getValue())
+						{
+							sb.append("  ");
+							sb.append(elem.toString());
+							sb.append("\n");
+						}
+						Logging.log(Logging.INFO, sb.toString());
+					}
+				}
+				Logging.log(Logging.WARNING, "Retrying export after ConcurrentModificationException", e);
 				try
 				{
 					Thread.sleep(1000);
@@ -2753,7 +2770,6 @@
 	@Override
 	public void setHanded(HandedFacade handedness)
 	{
-		Logging.log(Logging.ERROR, "CharacterFacadeImpl @ setHanded to "+((Handed) handedness).name()); //$NON-NLS-1$
 		this.handedness.setReference(handedness);
 		theCharacter.setHanded((Handed) handedness);
 	}
@@ -4238,8 +4254,6 @@
 		characterType.setReference(charDisplay.getCharacterType());
 		alignment.setReference(charDisplay.getPCAlignment());
 		refreshStatScores();
-		refreshAvailableTempBonuses();
-
 	}
 
 	/**

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java	2013-05-11 00:28:56 UTC (rev 20111)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java	2013-05-11 08:26:11 UTC (rev 20112)
@@ -765,7 +765,66 @@
 		return true;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean sortEquipment(EquipNode parentNode)
+	{
+		// Confirm our assumptions
+		if (!(parentNode instanceof EquipNodeImpl)
+			|| !(parentNode.getBodyStructure() instanceof BodyStructure)
+			|| (parentNode.getNodeType() != NodeType.EQUIPMENT && parentNode
+				.getNodeType() != NodeType.BODY_SLOT))
+		{
+			return false;
+		}
+		BodyStructure bodyStruct = (BodyStructure) parentNode.getBodyStructure();
+		if (!bodyStruct.isHoldsAnyType())
+		{
+			return false;
+		}
+		
+		String pid = ((EquipNodeImpl)parentNode).idPath;
+		List<EquipNodeImpl> childList = new ArrayList<EquipmentSetFacadeImpl.EquipNodeImpl>();
+		Map<String, EquipNodeImpl> origPathToNode = buildPathNodeMap();
+		Map<String, EquipSet> origPathToEquipSet = buildPathEquipSetMap();
+		for (Entry<String, EquipNodeImpl> entry : origPathToNode.entrySet())
+		{
+			String origPath = entry.getKey();
+			EquipNodeImpl node = entry.getValue();
+			EquipSet es = origPathToEquipSet.get(origPath);
 
+			if (node.parent == parentNode)
+			{
+				childList.add(node);
+				if (pid == null)
+				{
+					pid = es.getParentIdPath();
+				}
+			}
+		}
+		
+		// Sort child list
+		Collections.sort(childList, new EquipNameComparator());
+		
+		// Renumber paths
+		int id = 1;
+		NumberFormat format =new DecimalFormat("00");
+		for (EquipNodeImpl childNode : childList)
+		{
+			String origPath = childNode.idPath;
+			String newPath = pid + '.' + format.format(id);
+			nodeList.removeElement(childNode);
+			EquipSet es = origPathToEquipSet.get(origPath);
+			es.setIdPath(newPath);
+			updateContainerPath(origPath, newPath, origPathToNode, origPathToEquipSet);
+			childNode.setIdPath(newPath);
+			nodeList.addElement(childNode);
+			id++;
+		}
+		return true;
+	}
+
 	/**
 	 * Scan back in the node list to find the row that is a certain number of 
 	 * steps above the starting row. This will skip past the contents of any 
@@ -789,7 +848,9 @@
 			currIndex--;
 			int lastDepth = EquipSet.getPathDepth(lastIdPath);
 			EquipNodeImpl currRowNode = (EquipNodeImpl) orderedEquipNodes.get(currIndex);
-			int currRowDepth = EquipSet.getPathDepth(currRowNode.getIdPath());
+			int currRowDepth =
+					currRowNode.getIdPath() == null ? 0 : EquipSet
+						.getPathDepth(currRowNode.getIdPath());
 
 			if (lastDepth < currRowDepth)
 			{
@@ -836,6 +897,10 @@
 		while (currIndex < orderedEquipNodes.size() && numRowsMoved <= numRowsToMove)
 		{
 			currIndex++;
+			if (currIndex == orderedEquipNodes.size())
+			{
+				return null;
+			}
 			int lastDepth = EquipSet.getPathDepth(lastIdPath);
 			EquipNodeImpl currRowNode = (EquipNodeImpl) orderedEquipNodes.get(currIndex);
 			if (currRowNode.getIdPath() == null)
@@ -1990,4 +2055,24 @@
 		}
 	
 	}
+
+	/**
+	 * The Class <code>EquipNameComparator</code> compares EquipNodes based 
+	 * on alpha order by sort key (if defined) or name.
+	 */
+
+	public static class EquipNameComparator implements
+			Comparator<EquipNodeImpl>
+	{
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public int compare(EquipNodeImpl node1, EquipNodeImpl node2)
+		{
+			return node1.getSortKey().compareTo(node2.getSortKey());
+		}
+	
+	}
 }

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java	2013-05-11 00:28:56 UTC (rev 20111)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java	2013-05-11 08:26:11 UTC (rev 20112)
@@ -122,6 +122,8 @@
 	private final InfoPane infoPane;
 	private final JButton unequipButton;
 	private final JButton unequipAllButton;
+	private final JButton moveUpButton;
+	private final JButton moveDownButton;
 	private final JButton equipButton;
 	private final JComboBox equipSetBox;
 	private final JButton newSetButton;
@@ -156,6 +158,8 @@
 		this.equipButton = new JButton();
 		this.unequipButton = new JButton();
 		this.unequipAllButton = new JButton();
+		this.moveUpButton = new JButton();
+		this.moveDownButton = new JButton();
 		this.equipSetBox = new JComboBox();
 		this.newSetButton = new JButton();
 		this.removeSetButton = new JButton();
@@ -277,6 +281,10 @@
 		selPanelbuttonsBox.add(unequipButton);
 		selPanelbuttonsBox.add(Box.createHorizontalStrut(3));
 		selPanelbuttonsBox.add(unequipAllButton);
+		selPanelbuttonsBox.add(Box.createHorizontalStrut(3));
+		selPanelbuttonsBox.add(moveUpButton);
+		selPanelbuttonsBox.add(Box.createHorizontalStrut(3));
+		selPanelbuttonsBox.add(moveDownButton);
 		selPanelbuttonsBox.add(Box.createHorizontalGlue());
 		selPanelbuttonsBox.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
 		panel.add(selPanelbuttonsBox, BorderLayout.SOUTH);
@@ -330,9 +338,9 @@
 	public void restoreModels(Hashtable<?, ?> state)
 	{
 		((EquipmentModel) state.get(EquipmentModel.class)).install(equipmentSetTable);
-		((EquipmentModels) state.get(EquipmentModels.class)).install(equipViewBox, equipmentTable,
-																	 tableFilter, equipmentSetTable,
-																	 equipButton, unequipButton);
+		((EquipmentModels) state.get(EquipmentModels.class)).install(
+			equipViewBox, equipmentTable, tableFilter, equipmentSetTable,
+			equipButton, unequipButton, moveUpButton, moveDownButton);
 		((LabelsUpdater) state.get(LabelsUpdater.class)).install();
 		((EquipInfoHandler) state.get(EquipInfoHandler.class)).install();
 		((EquipmentRenderer) state.get(EquipmentRenderer.class)).install();
@@ -1221,18 +1229,12 @@
 		@Override
 		public void actionPerformed(ActionEvent e)
 		{
-//			if (num > 0)
-//			{
-//				for (EquipmentFacade equip : targets)
-//				{
-//					if (character.isAutoResize())
-//					{
-//						equip = character.getEquipmentSizedForCharacter(equip);
-//					}
-//					character.addPurchasedEquipment(equip, num, false);
-//					availableTable.refilter();
-//				}
-//			}
+			EquipmentSetFacade equipSet =
+					character.getEquipmentSetRef().getReference();
+			for (EquipNode equipNode : targets)
+			{
+				equipSet.sortEquipment(equipNode);
+			}
 		}
 
 	}

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java	2013-05-11 00:28:56 UTC (rev 20111)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java	2013-05-11 08:26:11 UTC (rev 20112)
@@ -64,6 +64,7 @@
 import pcgen.gui2.tools.Icons;
 import pcgen.gui2.util.JTableEx;
 import pcgen.gui2.util.JTreeTable;
+import pcgen.gui2.util.table.SortableTableModel;
 import pcgen.gui2.util.table.TableCellUtilities;
 import pcgen.system.LanguageBundle;
 
@@ -114,6 +115,8 @@
 	private final EquipViewHandler viewHandler;
 	private final EquipAction equipAction;
 	private final UnequipAction unequipAction;
+	private final MoveUpAction moveUpAction;
+	private final MoveDownAction moveDownAction;
 	private final EquipFilterHandler filterHandler;
 	private EquipView selectedView;
 	private EquipmentTableModel selectedModel;
@@ -139,12 +142,15 @@
 		this.viewHandler = new EquipViewHandler();
 		this.equipAction = new EquipAction();
 		this.unequipAction = new UnequipAction();
+		this.moveUpAction = new MoveUpAction();
+		this.moveDownAction = new MoveDownAction();
 		this.filterHandler = new EquipFilterHandler();
 	}
 
 	public void install(JComboBox equipBox, JTableEx eqTable,
 		DisplayableFilter<? super CharacterFacade, ? super EquipmentFacade> filter,
-		JTreeTable eqSetTable, JButton equipButton, JButton unequipButton)
+		JTreeTable eqSetTable, JButton equipButton, JButton unequipButton, 
+		JButton moveUpButton, JButton moveDownButton)
 	{
 		this.equipViewBox = equipBox;
 		this.equipmentTable = eqTable;
@@ -152,6 +158,8 @@
 		viewHandler.install();
 		equipButton.setAction(equipAction);
 		unequipButton.setAction(unequipAction);
+		moveUpButton.setAction(moveUpAction);
+		moveDownButton.setAction(moveDownAction);
 		equipAction.install();
 		unequipAction.install();
 
@@ -170,6 +178,34 @@
 		}
 	}
 
+	private List<EquipNode> getSelectedEquipmentSetNodes()
+	{
+		int[] rows = equipmentSetTable.getSelectedRows();
+		List<EquipNode> paths = new ArrayList<EquipNode>();
+		for (int i = 0; i < rows.length; i++)
+		{
+			EquipNode path = (EquipNode) equipmentSetTable.getValueAt(rows[i], 0);
+			if (path.getNodeType() == NodeType.EQUIPMENT)
+			{
+				paths.add(path);
+			}
+		}
+		return paths;
+	}
+
+	private void selectNodeInEquipmentSetTable(EquipNode nodeToSelect)
+	{
+		SortableTableModel model = equipmentSetTable.getModel();
+		for (int i = 0; i < model.getRowCount(); i++)
+		{
+			if (nodeToSelect == model.getValueAt(i, 0))
+			{
+				equipmentSetTable.getSelectionModel().setSelectionInterval(i, i);
+				break;
+			}
+		}
+	}
+	
 	private static JScrollPane prepareScrollPane(JTable table)
 	{
 		JScrollPane pane = new JScrollPane(table);
@@ -287,16 +323,7 @@
 		public void actionPerformed(ActionEvent e)
 		{
 			EquipmentSetFacade equipSet = character.getEquipmentSetRef().getReference();
-			int[] rows = equipmentSetTable.getSelectedRows();
-			List<EquipNode> paths = new ArrayList<EquipNode>();
-			for (int i = 0; i < rows.length; i++)
-			{
-				EquipNode path = (EquipNode) equipmentSetTable.getValueAt(rows[i], 0);
-				if (path.getNodeType() == NodeType.EQUIPMENT)
-				{
-					paths.add(path);
-				}
-			}
+			List<EquipNode> paths = getSelectedEquipmentSetNodes();
 			if (!paths.isEmpty())
 			{
 				Object[][] data = new Object[paths.size()][3];
@@ -619,4 +646,77 @@
 
 	}
 
+	private class MoveUpAction extends AbstractAction
+	{
+
+		public MoveUpAction()
+		{
+			super(LanguageBundle.getString("in_equipMoveUpMenuCommand")); //$NON-NLS-1$
+			this.putValue(SMALL_ICON, Icons.Up16.getImageIcon());
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e)
+		{
+			EquipmentSetFacade equipSet = character.getEquipmentSetRef().getReference();
+			List<EquipNode> paths = getSelectedEquipmentSetNodes();
+			if (!paths.isEmpty())
+			{
+				for (EquipNode node : paths)
+				{
+					equipSet.moveEquipment(node, -1);
+				}
+				selectNodeInEquipmentSetTable(paths.get(0));
+			}
+		}
+
+		
+		public void install()
+		{
+			equipmentSetTable.addActionListener(this);
+		}
+		
+		public void uninstall()
+		{
+			equipmentSetTable.removeActionListener(this);
+		}
+
+	}
+
+	private class MoveDownAction extends AbstractAction
+	{
+
+		public MoveDownAction()
+		{
+			super(LanguageBundle.getString("in_equipMoveDownMenuCommand")); //$NON-NLS-1$
+			this.putValue(SMALL_ICON, Icons.Down16.getImageIcon());
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e)
+		{
+			EquipmentSetFacade equipSet = character.getEquipmentSetRef().getReference();
+			List<EquipNode> paths = getSelectedEquipmentSetNodes();
+			if (!paths.isEmpty())
+			{
+				for (EquipNode node : paths)
+				{
+					equipSet.moveEquipment(node, 1);
+				}
+				selectNodeInEquipmentSetTable(paths.get(0));
+			}
+		}
+		
+		public void install()
+		{
+			equipmentSetTable.addActionListener(this);
+		}
+		
+		public void uninstall()
+		{
+			equipmentSetTable.removeActionListener(this);
+		}
+
+	}
+
 }

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