pcgen-commit-svn — Subversion commits

[pcgen-commit-svn] SF.net SVN: pcgen:[16362] Trunk/pcgen/preview/d20/fantasy/Standard.htm

[<ama...@us...>]

Revision: 16362
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16362&view=rev
Author:   amaitland
Date:     2012-02-29 21:23:19 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Implement new Portrait Thumb view for Preview and OS files
Issue#: OS-167

Modified Paths:
--------------
    Trunk/pcgen/preview/d20/fantasy/Standard.htm

Modified: Trunk/pcgen/preview/d20/fantasy/Standard.htm
===================================================================
--- Trunk/pcgen/preview/d20/fantasy/Standard.htm	2012-02-29 20:58:46 UTC (rev 16361)
+++ Trunk/pcgen/preview/d20/fantasy/Standard.htm	2012-02-29 21:23:19 UTC (rev 16362)
@@ -245,7 +245,7 @@
   <td colspan="1" class="h">|ALIGNMENT|</td>
   <td colspan="1" class="h">|DEITY|</td>
   <td class="h">|POOL.COST|</td>
-  <td rowspan="6" align="center" width="1%" class="border"><font style="font-size:10pt"><a href="#Bio"><img src="file://localhost/|PORTRAIT|" width="100" height="100%" alt="Click for Bio" border="0" /></a><br /></font></td>
+  <td rowspan="6" align="center" width="1%" class="border"><font style="font-size:10pt"><a href="#Bio"><img src="file://localhost/|PORTRAIT.THUMB|" width="100" height="100%" alt="Click for Bio" border="0" /></a><br /></font></td>
  </tr>
  <tr>
   <td colspan="2" class="topline">CHARACTER NAME</td>

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

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

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

Revision: 16361
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16361&view=rev
Author:   jdempsey
Date:     2012-02-29 20:58:46 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Allow ESC to close most dialogs

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java
    Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java
    Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java
    Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -58,6 +58,7 @@
 import pcgen.gui2.PCGenFrame;
 import pcgen.gui2.tools.BrowserLauncher;
 import pcgen.gui2.tools.Icons;
+import pcgen.gui2.tools.Utility;
 import pcgen.gui2.util.GridBoxLayout;
 import pcgen.gui2.util.JLabelPane;
 import pcgen.system.LanguageBundle;
@@ -79,6 +80,8 @@
 		pack();
 		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 		setLocationRelativeTo(frame);
+		
+		Utility.installEscapeCloseOperation(this);
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -52,6 +52,7 @@
 import pcgen.core.facade.ReferenceFacade;
 import pcgen.core.facade.event.ReferenceEvent;
 import pcgen.core.facade.event.ReferenceListener;
+import pcgen.gui2.tools.Utility;
 import pcgen.gui2.util.table.IntegerEditor;
 
 /**
@@ -163,6 +164,8 @@
 			}
 
 		});
+		
+		Utility.installEscapeCloseOperation(this);
 	}
 
 	public void actionPerformed(ActionEvent e)

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -44,6 +44,7 @@
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableCellRenderer;
 import pcgen.gui2.PCGenFrame;
+import pcgen.gui2.tools.Utility;
 import pcgen.system.LoggingRecorder;
 import pcgen.util.Logging;
 
@@ -67,6 +68,8 @@
 		initComponents();
 		pack();
 		setSize(700, 500);
+		
+		Utility.installEscapeCloseOperation(this);
 	}
 
 	private void initComponents()

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -71,6 +71,7 @@
 import pcgen.core.facade.PartyFacade;
 import pcgen.gui2.PCGenFrame;
 import pcgen.gui2.UIPropertyContext;
+import pcgen.gui2.tools.Utility;
 import pcgen.gui2.util.FacadeComboBoxModel;
 import pcgen.system.BatchExporter;
 import pcgen.system.CharacterManager;
@@ -130,6 +131,8 @@
 		initComponents();
 		initLayout();
 		fileSearcher.execute();
+		
+		Utility.installEscapeCloseOperation(this);
 	}
 
 	@Override

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -166,6 +166,8 @@
 		settingsTree.setSelectionRow(1);
 
 		pack();
+		
+		Utility.installEscapeCloseOperation(this);
 	}
 
 	public static void show(JFrame frame)

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -80,6 +80,7 @@
 import pcgen.core.facade.CharacterFacade;
 import pcgen.gui2.PCGenFrame;
 import pcgen.gui2.tools.Icons;
+import pcgen.gui2.tools.Utility;
 import pcgen.io.ExportHandler;
 import pcgen.system.ConfigurationSettings;
 import pcgen.util.FOPHandler;
@@ -203,6 +204,8 @@
 		cancelButton.addActionListener(this);
 
 		enableEditGroup(false);
+		
+		Utility.installEscapeCloseOperation(this);
 	}
 
 	private void enableEditGroup(boolean enable)

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -30,6 +30,7 @@
 
 import pcgen.core.SettingsHandler;
 import pcgen.gui2.doomsdaybook.NameGenPanel;
+import pcgen.gui2.tools.Utility;
 
 /**
  * The Class <code>RandomNameDialog</code> is a dialog in which the user can 
@@ -61,6 +62,8 @@
 		pack();
 		setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
 		setLocationRelativeTo(frame);
+		
+		Utility.installEscapeCloseOperation(this);
 	}
 
 	/**

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -34,6 +34,7 @@
 
 import pcgen.core.SettingsHandler;
 import pcgen.gui2.prefs.PCGenPrefsPanel;
+import pcgen.gui2.tools.Utility;
 import pcgen.system.LanguageBundle;
 
 /**
@@ -73,6 +74,8 @@
 		prefsPanel.applyOptionValuesToControls();
 
 		pack();
+		
+		Utility.installEscapeCloseOperation(this);
 	}
 
 	private void initComponents()

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -57,6 +57,7 @@
 import pcgen.gui2.UIPropertyContext;
 import pcgen.gui2.tools.Hyperactive;
 import pcgen.gui2.tools.Icons;
+import pcgen.gui2.tools.Utility;
 import pcgen.gui2.util.JLabelPane;
 import pcgen.system.ConfigurationSettings;
 import pcgen.system.LanguageBundle;
@@ -97,6 +98,8 @@
 		loadTips();
 
 		pack();
+		
+		Utility.installEscapeCloseOperation(this);
 
 		lastNumber = propertyContext.initInt("lastTip", -1);
 		showNextTip();

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -25,7 +25,6 @@
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -66,6 +66,7 @@
 import pcgen.gui2.PCGenFrame;
 import pcgen.gui2.UIPropertyContext;
 import pcgen.gui2.filter.FilteredListFacadeTableModel;
+import pcgen.gui2.tools.Utility;
 import pcgen.gui2.util.JTableEx;
 import pcgen.gui2.util.SortedListModel;
 import pcgen.gui2.util.table.TableUtils;
@@ -159,6 +160,8 @@
 		buttons.add(cancelButton);
 		buttons.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 		pane.add(buttons, BorderLayout.SOUTH);
+		
+		Utility.installEscapeCloseOperation(this);
 	}
 
 	private void initDefaults()

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java	2012-02-29 20:56:13 UTC (rev 16360)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java	2012-02-29 20:58:46 UTC (rev 16361)
@@ -27,12 +27,21 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
 import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowEvent;
 import java.io.File;
 
 import java.io.IOException;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
+import javax.swing.JRootPane;
+import javax.swing.KeyStroke;
 
 import pcgen.system.PCGenSettings;
 
@@ -45,6 +54,13 @@
 public final class Utility
 {
 
+	private static final KeyStroke escapeStroke = KeyStroke.getKeyStroke(
+		KeyEvent.VK_ESCAPE, 0);
+
+	/** An action map key for the user requesting a dialog close via the ESC key. */
+	public static final String dispatchWindowClosingActionMapKey =
+			"pcgen:WINDOW_CLOSING"; //$NON-NLS-1$
+
 	/**
 	 * Set up GridBag Constraints.
 	 * @param gbc The gridbagconstraints to set up
@@ -251,4 +267,25 @@
 
 	}
 
+	/**
+	 * Add a keyboard shortcut to allow ESC to close the dialog.
+	 * @param dialog The dialog to be updated.
+	 */
+	public static void installEscapeCloseOperation(final JDialog dialog)
+	{
+		Action dispatchClosing = new AbstractAction()
+		{
+			public void actionPerformed(ActionEvent event)
+			{
+				dialog.dispatchEvent(new WindowEvent(dialog,
+					WindowEvent.WINDOW_CLOSING));
+			}
+		};
+		JRootPane root = dialog.getRootPane();
+		root.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(escapeStroke,
+			dispatchWindowClosingActionMapKey);
+		root.getActionMap().put(dispatchWindowClosingActionMapKey,
+			dispatchClosing);
+	}
+
 }

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

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

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

Revision: 16360
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16360&view=rev
Author:   jdempsey
Date:     2012-02-29 20:56:13 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Add keyboard shortcuts to open console and sources dialogs

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/PCGenActionMap.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/PCGenActionMap.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/PCGenActionMap.java	2012-02-29 17:08:23 UTC (rev 16359)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/PCGenActionMap.java	2012-02-29 20:56:13 UTC (rev 16360)
@@ -371,7 +371,7 @@
 
 		public ConsoleAction()
 		{
-			super("mnuToolsConsole");
+			super("mnuToolsConsole", CONSOLE_COMMAND, "shortcut D");
 		}
 
 		@Override
@@ -772,7 +772,7 @@
 
 		public LoadSourcesSelectAction()
 		{
-			super("mnuSourcesLoadSelect");
+			super("mnuSourcesLoadSelect", SOURCES_LOAD_COMMAND, "shortcut L");
 		}
 
 		@Override

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16359] Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ advanced_players_guide/pfapg_abilities_class.lst

[<gjo...@us...>]

Revision: 16359
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16359&view=rev
Author:   gjorbjond
Date:     2012-02-29 17:08:23 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Stink Bomb prereq fixed.

Modified Paths:
--------------
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2012-02-29 15:58:21 UTC (rev 16358)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2012-02-29 17:08:23 UTC (rev 16359)
@@ -69,7 +69,7 @@
 Smoke Bomb*			KEY:Discovery ~ Smoke Bomb		CATEGORY:Special Ability	TYPE:SpecialAttack.AlchemistDiscovery																	DESC:When the alchemist creates a bomb, he can choose to have it create a cloud of thick smoke when it detonates. The cloud functions as fog cloud, filling an area equal to twice the bomb's splash radius for 1 round per level.
 Sticky Bomb			KEY:Discovery ~ Sticky Bomb		CATEGORY:Special Ability	TYPE:SpecialAttack.AlchemistDiscovery												PREVARGTEQ:AlchemistLVL,10	DESC:The effects of the alchemist's bombs are persistent and continue to damage creatures for 1 round after the initial damage. Creatures that take a direct hit from a sticky bomb take the splash damage 1 round later. Bombs that have effects that would normally occur 1 round later instead have those effects occur 2 rounds later.
 Sticky Poison		KEY:Discovery ~ Sticky Poison		CATEGORY:Special Ability	TYPE:SpecialAttack.AlchemistDiscovery												PREVARGTEQ:AlchemistLVL,6	DESC:Any poison the alchemist creates is sticky - when the alchemist applies it to a weapon, the weapon remains poisoned for a number of strikes equal to the alchemist's Intelligence modifier.
-Stink Bomb*			KEY:Discovery ~ Stink Bomb		CATEGORY:Special Ability	TYPE:SpecialAttack.AlchemistDiscovery																	DESC:The effects of the smoke created by an alchemist's bomb can duplicate the effects of stinking cloud instead of fog cloud, f illing an area equal to twice the bomb's splash radius for 1 round. An alchemist must possess the smoke bomb discovery before selecting this discovery.
+Stink Bomb*			KEY:Discovery ~ Stink Bomb		CATEGORY:Special Ability	TYPE:SpecialAttack.AlchemistDiscovery	PREABILITY:1,CATEGORY=Special Ability,Discovery ~ Smoke Bomb						DESC:The effects of the smoke created by an alchemist's bomb can duplicate the effects of stinking cloud instead of fog cloud, f illing an area equal to twice the bomb's splash radius for 1 round. An alchemist must possess the smoke bomb discovery before selecting this discovery.
 
 ###Block: Alchemist grand discoveries
 # Ability Name		Unique Key					Category of Ability		Type								Required Ability									Description																																												Stat bonus

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16358] Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ ExportDialog.java

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

Revision: 16358
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16358&view=rev
Author:   zaister
Date:     2012-02-29 15:58:21 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Export Dialog - Use tab name for default filename
Issue#: CODE-1308

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java	2012-02-29 15:43:57 UTC (rev 16357)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java	2012-02-29 15:58:21 UTC (rev 16358)
@@ -329,7 +329,11 @@
 			{
 				path = new File(PCGenSettings.getPcgDir());
 			}
-			name = character.getNameRef().getReference();
+			name = character.getTabNameRef().getReference();
+			if (name == null || "".equals(name))
+			{
+				name = character.getNameRef().getReference();
+			}
 		}
 		else
 		{

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

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

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

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

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

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

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

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

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

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16356] Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ advanced_players_guide/pfapg_abilities_racial.lst

[<gjo...@us...>]

Revision: 16356
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16356&view=rev
Author:   gjorbjond
Date:     2012-02-29 15:31:42 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Gnome Alchemist Bonus Bombs fixed.

Modified Paths:
--------------
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_racial.lst

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_racial.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_racial.lst	2012-02-29 14:48:41 UTC (rev 16355)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_racial.lst	2012-02-29 15:31:42 UTC (rev 16356)
@@ -91,7 +91,8 @@
 # Alternate Favored Class Bonus from APG
 
 # Alchemist
-Bonus Bombs Per Day								CATEGORY:Special Ability	TYPE:SpecialQuality.FavoredClassBonus.FavoredClassAlchemist				VISIBLE:YES		PREABILITY:1,CATEGORY=Special Ability,Alchemist		PRECLASS:1,Alchemist=1		PRERACE:1,Gnome																														DESC:Add +1/2 to the number of bombs per day the alchemist can create.																																																			STACK:YES	MULT:YES	CHOOSE:NOCHOICE
+Bonus Bombs Per Day								CATEGORY:Special Ability	TYPE:SpecialQuality.FavoredClassBonus.FavoredClassAlchemist				VISIBLE:YES		PREABILITY:1,CATEGORY=Special Ability,Alchemist		PRECLASS:1,Alchemist=1		PRERACE:1,Gnome																														DESC:Add +1/2 to the number of bombs per day the alchemist can create.																																																			STACK:YES	MULT:YES	CHOOSE:NOCHOICE	DEFINE:BonusBombCount|0	BONUS:VAR|BonusBombCount|1		ABILITY:Internal|AUTOMATIC|Bonus Bomb Tracker
+Bonus Bomb Tracker								CATEGORY:Internal																																																																																																																																																																																																BONUS:VAR|AlchemistBombTimes|var("BonusBombCount")/2
 Bonus Bomb Damage									CATEGORY:Special Ability	TYPE:SpecialQuality.FavoredClassBonus.FavoredClassAlchemist				VISIBLE:YES		PREABILITY:1,CATEGORY=Special Ability,Alchemist		PRECLASS:1,Alchemist=1		PRERACE:1,Half-Orc																													DESC:Add +1/2 to bomb damage.																																																										STACK:YES	MULT:YES	CHOOSE:NOCHOICE
 Bonus Extract Formula								CATEGORY:Special Ability	TYPE:SpecialQuality.FavoredClassBonus.FavoredClassAlchemist				VISIBLE:YES		PREABILITY:1,CATEGORY=Special Ability,Alchemist		PRECLASS:1,Alchemist=1		PRERACE:1,Human																														DESC:Add one extract formulae from the alchemist's list to the character's formulae book. This formulae must be at least one level below the highest formulae level the alchemist can create.																															STACK:YES	MULT:YES	CHOOSE:NOCHOICE
 # Barbarian

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

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

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

Revision: 16355
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16355&view=rev
Author:   zaister
Date:     2012-02-29 14:48:41 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Missing 'COST' from Abilities view
Issue#: CODE-1303

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/Ability.java
    Trunk/pcgen/code/src/java/pcgen/core/facade/AbilityFacade.java
    Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/Ability.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Ability.java	2012-02-29 13:31:41 UTC (rev 16354)
+++ Trunk/pcgen/code/src/java/pcgen/core/Ability.java	2012-02-29 14:48:41 UTC (rev 16355)
@@ -323,4 +323,9 @@
 		}
 		return retAspect;
 	}
+
+	public double getCost() {
+		// TODO Auto-generated method stub
+		return getSafe(ObjectKey.SELECTION_COST).doubleValue();
+	}
 }

Modified: Trunk/pcgen/code/src/java/pcgen/core/facade/AbilityFacade.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/facade/AbilityFacade.java	2012-02-29 13:31:41 UTC (rev 16354)
+++ Trunk/pcgen/code/src/java/pcgen/core/facade/AbilityFacade.java	2012-02-29 14:48:41 UTC (rev 16355)
@@ -34,5 +34,7 @@
     public boolean isMult();
 
     public boolean isStackable();
+    
+    public double getCost();
 
 }

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java	2012-02-29 13:31:41 UTC (rev 16354)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java	2012-02-29 14:48:41 UTC (rev 16355)
@@ -226,6 +226,8 @@
 															Boolean.class),
 								  new DefaultDataViewColumn("Description",
 															String.class),
+								  new DefaultDataViewColumn("Cost",
+															Float.class),
 								  new DefaultDataViewColumn("Source",
 															String.class));
 		}
@@ -261,6 +263,7 @@
 								 obj.isMult(),
 								 obj.isStackable(),
 								 infoFactory.getDescription(obj),
+								 (int) obj.getCost(),
 								 obj.getSource());
 		}
 

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

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

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

Revision: 16354
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16354&view=rev
Author:   zaister
Date:     2012-02-29 13:31:41 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Advanced Sources Tab
* Select game mode default sources if no sources are remembered for the game mode; cleanup.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/facade/GameModeFacade.java
    Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/facade/GameModeFacade.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/facade/GameModeFacade.java	2012-02-29 13:07:27 UTC (rev 16353)
+++ Trunk/pcgen/code/src/java/pcgen/core/facade/GameModeFacade.java	2012-02-29 13:31:41 UTC (rev 16354)
@@ -20,6 +20,8 @@
  */
 package pcgen.core.facade;
 
+import java.util.List;
+
 /**
  *
  * @author Connor Petty <cpm...@us...>
@@ -34,7 +36,9 @@
 	public String getDisplayName();
 	
 	public String getDefaultSourceTitle();
-	
+
+	public List<String> getDefaultDataSetList();
+
 	public String getInfoSheet();
 
 	public String getInfoSheetSkill();

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-29 13:07:27 UTC (rev 16353)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-29 13:31:41 UTC (rev 16354)
@@ -25,6 +25,7 @@
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -233,22 +234,30 @@
 	 */
 	private void selectDefaultSources(GameModeFacade gameMode)
 	{
-		if (gameMode == null)
+		if (gameMode != null)
 		{
-			return;
-		}
-		String defaultSelectedSources =
-				context.initProperty(
-					PROP_SELECTED_SOURCES + gameMode.toString(), ""); //$NON-NLS-1$
-		String[] sourceNames = defaultSelectedSources.split("\\|"); //$NON-NLS-1$
-		for (String name : sourceNames)
-		{
-			for (CampaignFacade camp : FacadeFactory
-				.getSupportedCampaigns(gameMode))
+			List<String> sourceNames;
+			String defaultSelectedSources =
+					context.initProperty(
+						PROP_SELECTED_SOURCES + gameMode.toString(), ""); //$NON-NLS-1$
+			if (defaultSelectedSources == null || "".equals(defaultSelectedSources))
 			{
-				if (name.equals(camp.toString()))
+				sourceNames = gameMode.getDefaultDataSetList();
+			}
+			else
+			{
+				sourceNames = Arrays.asList(defaultSelectedSources.split("\\|")); //$NON-NLS-1$
+			}
+			
+			for (String name : sourceNames)
+			{
+				for (CampaignFacade camp : FacadeFactory
+					.getSupportedCampaigns(gameMode))
 				{
-					selectedCampaigns.addElement(camp);
+					if (name.equals(camp.toString()))
+					{
+						selectedCampaigns.addElement(camp);
+					}
 				}
 			}
 		}
@@ -368,8 +377,7 @@
 	 */
 	void rememberSelectedSources()
 	{
-		List<CampaignFacade> selectedCampaigns2 = getSelectedCampaigns();
-		String sources = StringUtils.join(selectedCampaigns2, "|"); //$NON-NLS-1$
+		String sources = StringUtils.join(getSelectedCampaigns(), "|"); //$NON-NLS-1$
 		context.setProperty(PROP_SELECTED_SOURCES+gameMode.toString(), sources);		
 	}
 

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16353] Trunk/pcgen/code/src/java/pcgen/gui2/sources/ AdvancedSourceSelectionPanel.java

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

Revision: 16353
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16353&view=rev
Author:   zaister
Date:     2012-02-29 13:07:27 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Advanced Sources Tab
* Remembered sources were added twice to the list, resulting in exponential growth of the saved property

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-29 12:25:33 UTC (rev 16352)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-29 13:07:27 UTC (rev 16353)
@@ -224,10 +224,6 @@
 			gameModeList.setSelectedIndex(0);
 			gameMode = (GameModeFacade) gameModeList.getSelectedItem();
 		}
-		if (gameMode != null)
-		{
-			selectDefaultSources(gameMode);
-		}
 	}
 
 	/**
@@ -372,7 +368,8 @@
 	 */
 	void rememberSelectedSources()
 	{
-		String sources = StringUtils.join(getSelectedCampaigns(), "|"); //$NON-NLS-1$
+		List<CampaignFacade> selectedCampaigns2 = getSelectedCampaigns();
+		String sources = StringUtils.join(selectedCampaigns2, "|"); //$NON-NLS-1$
 		context.setProperty(PROP_SELECTED_SOURCES+gameMode.toString(), sources);		
 	}
 

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

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

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

Revision: 16352
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16352&view=rev
Author:   zaister
Date:     2012-02-29 12:25:33 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Add 'Pantheon' as a Choice for the Deity Section / Domain Tab
Also added 'Pantheon' column to the deity view
Issue#: CODE-1306

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/Deity.java
    Trunk/pcgen/code/src/java/pcgen/core/facade/DeityFacade.java
    Trunk/pcgen/code/src/java/pcgen/core/facade/InfoFactory.java
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java
    Trunk/pcgen/code/src/java/pcgen/gui2/tabs/DomainInfoTab.java
    Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties

Modified: Trunk/pcgen/code/src/java/pcgen/core/Deity.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Deity.java	2012-02-29 12:11:22 UTC (rev 16351)
+++ Trunk/pcgen/code/src/java/pcgen/core/Deity.java	2012-02-29 12:25:33 UTC (rev 16352)
@@ -28,7 +28,9 @@
 import java.util.List;
 
 import pcgen.cdom.base.CDOMReference;
+import pcgen.cdom.enumeration.ListKey;
 import pcgen.cdom.enumeration.ObjectKey;
+import pcgen.cdom.enumeration.Pantheon;
 import pcgen.cdom.enumeration.SourceFormat;
 import pcgen.cdom.list.DomainList;
 import pcgen.cdom.reference.CDOMDirectSingleRef;
@@ -88,4 +90,17 @@
 	{
 		return get(ObjectKey.ALIGNMENT);
 	}
+
+	public List<String> getPantheons()
+	{
+		List<String> pantheons = new ArrayList<String>();
+		for (Pantheon pantheon : getSafeListFor(ListKey.PANTHEON))
+		{
+			String string = pantheon.toString();
+			pantheons.add(string);
+		}
+		
+		return pantheons;
+	}
+
 }

Modified: Trunk/pcgen/code/src/java/pcgen/core/facade/DeityFacade.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/facade/DeityFacade.java	2012-02-29 12:11:22 UTC (rev 16351)
+++ Trunk/pcgen/code/src/java/pcgen/core/facade/DeityFacade.java	2012-02-29 12:25:33 UTC (rev 16352)
@@ -32,5 +32,7 @@
 	List<String> getDomainNames();
 
 	AlignmentFacade getAlignment();
-	
+
+	List<String> getPantheons();
+
 }

Modified: Trunk/pcgen/code/src/java/pcgen/core/facade/InfoFactory.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/facade/InfoFactory.java	2012-02-29 12:11:22 UTC (rev 16351)
+++ Trunk/pcgen/code/src/java/pcgen/core/facade/InfoFactory.java	2012-02-29 12:25:33 UTC (rev 16352)
@@ -98,4 +98,11 @@
 	 */
 	public String getDomains(DeityFacade deityFacade);
 
+	/**
+	 * Get a display string of the deity's pantheons.
+	 * @param deityFacade The deity to be output.
+	 * @return The comma separated list of pantheons.
+	 */
+	public String getPantheons(DeityFacade deityFacade);
+
 }

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java	2012-02-29 12:11:22 UTC (rev 16351)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java	2012-02-29 12:25:33 UTC (rev 16352)
@@ -44,6 +44,7 @@
 import pcgen.cdom.enumeration.ListKey;
 import pcgen.cdom.enumeration.MapKey;
 import pcgen.cdom.enumeration.ObjectKey;
+import pcgen.cdom.enumeration.Pantheon;
 import pcgen.cdom.enumeration.RaceSubType;
 import pcgen.cdom.enumeration.RaceType;
 import pcgen.cdom.enumeration.SourceFormat;
@@ -476,13 +477,29 @@
 		if (aDeity != null)
 		{
 			infoText.appendTitleElement(OutputNameFormatting.piString(aDeity, false));
+			infoText.appendLineBreak();
 
-			infoText.appendLineBreak();
+			String aString = aDeity.get(StringKey.TITLE);
+			if (aString != null)
+			{
+				infoText.appendI18nFormattedElement("in_deityTitle", //$NON-NLS-1$
+					aString);
+				infoText.appendLineBreak();
+			}
+
 			infoText
 				.appendI18nFormattedElement(
 					"in_InfoDescription", DescriptionFormatting.piDescString(pc, aDeity)); //$NON-NLS-1$
 
-			infoText.appendLineBreak();
+			aString = getPantheons(aDeity);
+			if (aString != null)
+			{
+				infoText.appendSpacer();
+				infoText.appendI18nElement(
+						"in_pantheon", aString); //$NON-NLS-1$
+			}
+
+			infoText.appendSpacer();
 			infoText.appendI18nElement(
 				"in_domains", getDomains(aDeity)); //$NON-NLS-1$
 
@@ -496,7 +513,7 @@
 					ReferenceUtilities.joinLstFormat(dwp, "|"));
 			}
 
-			String aString = aDeity.get(StringKey.HOLY_ITEM);
+			aString = aDeity.get(StringKey.HOLY_ITEM);
 			if (aString != null)
 			{
 				infoText.appendSpacer();
@@ -516,6 +533,7 @@
 			aDeity.getPrerequisiteList(), false);
 			if (aString.length() != 0)
 			{
+				infoText.appendSpacer();
 				infoText.appendI18nFormattedElement("in_InfoRequirements", //$NON-NLS-1$
 					aString);
 			}
@@ -523,6 +541,7 @@
 			aString = aDeity.getSource();
 			if (aString.length() > 0)
 			{
+				infoText.appendSpacer();
 				infoText.appendI18nFormattedElement("in_InfoSource", //$NON-NLS-1$
 					aString);
 			}
@@ -1398,10 +1417,29 @@
 			}
 		}
 		final StringBuffer piString = new StringBuffer(100);
-		piString.append("<html>"); //$NON-NLS-1$
+		//piString.append("<html>"); //$NON-NLS-1$
 		piString.append(StringUtil.joinToStringBuffer(set, ",")); //$NON-NLS-1$
-		piString.append("</html>"); //$NON-NLS-1$
+		//piString.append("</html>"); //$NON-NLS-1$
 		return piString.toString();
 		
 	}
+	
+	public String getPantheons(DeityFacade deityFacade)
+	{
+		if (deityFacade == null || !(deityFacade instanceof Deity))
+		{
+			return EMPTY_STRING;
+		}
+		Deity deity = (Deity) deityFacade;
+		Set<String> set = new TreeSet<String>();
+		for (Pantheon p : deity.getSafeListFor(ListKey.PANTHEON))
+		{
+			set.add(p.toString());
+		}
+		final StringBuffer piString = new StringBuffer(100);
+		piString.append(StringUtil.joinToStringBuffer(set, ",")); //$NON-NLS-1$
+		return piString.toString();
+	
+	}
+
 }

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/DomainInfoTab.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/DomainInfoTab.java	2012-02-29 12:11:22 UTC (rev 16351)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/DomainInfoTab.java	2012-02-29 12:25:33 UTC (rev 16352)
@@ -601,6 +601,7 @@
 				new DefaultListFacade<TreeView<DeityFacade>>(Arrays.asList(DeityTreeView.values()));
 		private final List<DefaultDataViewColumn> columns = Arrays.asList(new DefaultDataViewColumn("in_alignLabel", Object.class), //$NON-NLS-1$
 																		  new DefaultDataViewColumn("in_domains", String.class), //$NON-NLS-1$
+																		  new DefaultDataViewColumn("in_pantheon", String.class), //$NON-NLS-1$
 																		  new DefaultDataViewColumn("in_sourceLabel", String.class)); //$NON-NLS-1$
 		private final CharacterFacade character;
 		private InfoFactory infoFactory;
@@ -634,7 +635,8 @@
 		public List<?> getData(DeityFacade obj)
 		{
 			return Arrays.asList(obj.getAlignment(),
-				infoFactory.getDomains(obj), obj.getSource());
+				infoFactory.getDomains(obj), infoFactory.getPantheons(obj), 
+				obj.getSource());
 		}
 
 		public List<? extends DataViewColumn> getDataColumns()
@@ -651,6 +653,7 @@
 		NAME("Name"),
 		ALIGNMENT_NAME("Alignment/Name"),
 		DOMAIN_NAME("Domain/Name"),
+		PANTHEON_NAME("Pantheon/Name"),
 		SOURCE_NAME("Source/Name");
 		private String name;
 
@@ -666,12 +669,12 @@
 
 		public List<TreeViewPath<DeityFacade>> getPaths(DeityFacade pobj)
 		{
+			List<TreeViewPath<DeityFacade>> paths = new ArrayList<TreeViewPath<DeityFacade>>();
 			switch (this)
 			{
 				case NAME:
 					return Collections.singletonList(new TreeViewPath<DeityFacade>(pobj));
 				case DOMAIN_NAME:
-					List<TreeViewPath<DeityFacade>> paths = new ArrayList<TreeViewPath<DeityFacade>>();
 					for (String domain : pobj.getDomainNames())
 					{
 						paths.add(new TreeViewPath(pobj, domain));
@@ -679,6 +682,12 @@
 					return paths;
 				case ALIGNMENT_NAME:
 					return Collections.singletonList(new TreeViewPath<DeityFacade>(pobj, pobj.getAlignment()));
+				case PANTHEON_NAME:
+					for (String pantheon : pobj.getPantheons())
+					{
+						paths.add(new TreeViewPath(pobj, pantheon));
+					}
+					return paths;
 				case SOURCE_NAME:
 					return Collections.singletonList(new TreeViewPath<DeityFacade>(pobj, pobj.getSource()));
 				default:

Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2012-02-29 12:11:22 UTC (rev 16351)
+++ Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2012-02-29 12:25:33 UTC (rev 16352)
@@ -1266,7 +1266,7 @@
 
 in_deityHolyIt=<b>Holy Item:</b>&nbsp;{0}
 
-in_deityTitle=Title
+in_deityTitle=<b>Title:</b>&nbsp;{0}
 
 in_deityWorshippers=<b>Typical Worshippers:</b>&nbsp;{0}
 

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16351] Trunk/pcgen/code/src/java/pcgen/gui2/sources/ AdvancedSourceSelectionPanel.java

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

Revision: 16351
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16351&view=rev
Author:   jdempsey
Date:     2012-02-29 12:11:22 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Fix resizing behaviour.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-29 11:05:37 UTC (rev 16350)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-29 12:11:22 UTC (rev 16351)
@@ -196,7 +196,8 @@
 		infoPane.setPreferredSize(new Dimension(800, 150));
 		mainPane.setBottomComponent(infoPane);
 		mainPane.setResizeWeight(0.7);
-		add(mainPane);
+		setLayout(new BorderLayout());
+		add(mainPane, BorderLayout.CENTER);
 	}
 	
 	private void initDefaults()

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16350] Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ advanced_players_guide/pfapg_profs_weapons.lst

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

Revision: 16350
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16350&view=rev
Author:   zaister
Date:     2012-02-29 11:05:37 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
add missing Sword type for falcata, khopesh and temple sword proficiencies

Modified Paths:
--------------
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_profs_weapons.lst

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_profs_weapons.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_profs_weapons.lst	2012-02-29 08:34:32 UTC (rev 16349)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_profs_weapons.lst	2012-02-29 11:05:37 UTC (rev 16350)
@@ -38,9 +38,9 @@
 Dagger (Swordbreaker)	TYPE:Exotic.Melee.Slashing.MeleeSlashing.Dagger
 
 # -- 1-handers
-Falcata			TYPE:Exotic.Melee.Slashing.MeleeSlashing
-Khopesh			TYPE:Exotic.Melee.Slashing.MeleeSlashing
-Sword (Temple)		TYPE:Exotic.Melee.Slashing.MeleeSlashing
+Falcata			TYPE:Exotic.Melee.Slashing.MeleeSlashing.Sword
+Khopesh			TYPE:Exotic.Melee.Slashing.MeleeSlashing.Sword
+Sword (Temple)		TYPE:Exotic.Melee.Slashing.MeleeSlashing.Sword
 
 # -- 2-handers
 Spear (Chain)		TYPE:Exotic.Melee.Piercing.Slashing.MeleePiercing.MeleeSlashing.Spear.TwoHanded

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

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

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

Revision: 16349
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16349&view=rev
Author:   jdempsey
Date:     2012-02-29 08:34:32 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Advanced Sources Tab - Reimplement as Available/Selected tables
* Wire up use advanced sources preference
* Recall sources selected in advanced tab for each game mode.
* If using advanced tab, recall gamemode and sources used last time.
Issue#: CODE-1290

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java
    Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java
    Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java	2012-02-29 02:35:40 UTC (rev 16348)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java	2012-02-29 08:34:32 UTC (rev 16349)
@@ -40,6 +40,7 @@
 import pcgen.core.SettingsHandler;
 import pcgen.core.utils.MessageType;
 import pcgen.core.utils.ShowMessageDelegate;
+import pcgen.gui2.UIPropertyContext;
 import pcgen.gui2.tools.Utility;
 import pcgen.gui2.util.JComboBoxEx;
 import pcgen.system.LanguageBundle;
@@ -59,8 +60,10 @@
 @SuppressWarnings("serial")
 public class SourcesPanel extends PCGenPrefsPanel
 {
+	/** Settings key for basic/advanced sources. */
+	private static final String SOURCE_USE_BASIC_KEY = "SourceSelectionDialog.useBasic"; //$NON-NLS-1$
 	private static String in_sources =
-		LanguageBundle.getString("in_Prefs_sources");
+		LanguageBundle.getString("in_Prefs_sources"); //$NON-NLS-1$
 	private JCheckBox campLoad = new JCheckBox();
 	private JCheckBox charCampLoad = new JCheckBox();
 	private JCheckBox allowOptsInSource = new JCheckBox();
@@ -240,7 +243,7 @@
 		SettingsHandler.setShowSponsors(showSponsors.isSelected());
 		SettingsHandler.setLoadURLs(loadURL.isSelected());
 		SettingsHandler.setAllowOverride(allowOverride.isSelected());
-		SettingsHandler.setUseAdvancedSourceSelect(useAdvancedSourceSelect.isSelected());
+		UIPropertyContext.getInstance().setBoolean(SOURCE_USE_BASIC_KEY, !useAdvancedSourceSelect.isSelected());
 
 		switch (sourceOptions.getSelectedIndex())
 		{
@@ -290,7 +293,7 @@
 		showSponsors.setSelected(SettingsHandler.showSponsors());
 		loadURL.setSelected(SettingsHandler.isLoadURLs());
 		allowOverride.setSelected(SettingsHandler.isAllowOverride());
-		useAdvancedSourceSelect.setSelected(SettingsHandler.useAdvancedSourceSelect());
+		useAdvancedSourceSelect.setSelected(!UIPropertyContext.getInstance().getBoolean(SOURCE_USE_BASIC_KEY));
 		
 		switch (Globals.getSourceDisplay())
 		{

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-29 02:35:40 UTC (rev 16348)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-29 08:34:32 UTC (rev 16349)
@@ -45,6 +45,8 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
+import org.apache.commons.lang.StringUtils;
+
 import pcgen.core.facade.CampaignFacade;
 import pcgen.core.facade.GameModeFacade;
 import pcgen.core.facade.SourceSelectionFacade;
@@ -81,6 +83,11 @@
 		implements ListSelectionListener, ListListener<CampaignFacade>, ActionListener
 {
 	
+	private static final UIPropertyContext context = UIPropertyContext
+		.createContext("advancedSourceSelectionPanel"); //$NON-NLS-1$
+	private static final String PROP_SELECTED_GAME = "selectedGame"; //$NON-NLS-1$
+	private static final String PROP_SELECTED_SOURCES = "selectedSources."; //$NON-NLS-1$
+
 	private final FilteredTreeViewTable availableTable;
 	private final FilteredTreeViewTable selectedTable;
 	private SourceTreeViewModel availTreeViewModel;
@@ -194,11 +201,61 @@
 	
 	private void initDefaults()
 	{
-		if (gameModeList.getModel().getSize() > 0)
+		String defaultGame =
+				context.initProperty(PROP_SELECTED_GAME, "");		
+		GameModeFacade gameMode = null;
+		if (StringUtils.isNotEmpty(defaultGame))
 		{
+			for (int i = 0; i < gameModeList.getModel().getSize(); i++)
+			{
+				GameModeFacade game =
+						(GameModeFacade) gameModeList.getModel()
+							.getElementAt(i);
+				if (defaultGame.equals(game.toString()))
+				{
+					gameModeList.setSelectedIndex(i);
+					gameMode = game;
+				}
+			}
+		}
+		if (gameMode == null && gameModeList.getModel().getSize() > 0)
+		{
 			gameModeList.setSelectedIndex(0);
+			gameMode = (GameModeFacade) gameModeList.getSelectedItem();
 		}
+		if (gameMode != null)
+		{
+			selectDefaultSources(gameMode);
+		}
 	}
+
+	/**
+	 * Add the user's previously selected sources for this gamemode 
+	 * to the selected list.  
+	 * @param gameMode The game mode being selected
+	 */
+	private void selectDefaultSources(GameModeFacade gameMode)
+	{
+		if (gameMode == null)
+		{
+			return;
+		}
+		String defaultSelectedSources =
+				context.initProperty(
+					PROP_SELECTED_SOURCES + gameMode.toString(), ""); //$NON-NLS-1$
+		String[] sourceNames = defaultSelectedSources.split("\\|"); //$NON-NLS-1$
+		for (String name : sourceNames)
+		{
+			for (CampaignFacade camp : FacadeFactory
+				.getSupportedCampaigns(gameMode))
+			{
+				if (name.equals(camp.toString()))
+				{
+					selectedCampaigns.addElement(camp);
+				}
+			}
+		}
+	}
 	
 	public GameModeFacade getSelectedGameMode()
 	{
@@ -219,8 +276,10 @@
 	private void setSelectedGameMode(GameModeFacade elementAt)
 	{
 		this.gameMode = elementAt;
+		context.setProperty(PROP_SELECTED_GAME, gameMode.toString());		
 		selectedCampaigns.clearContents();
 		availTreeViewModel.setGameModel(elementAt);
+		selectDefaultSources(gameMode);
 	}
 	
 	private void setSelectedCampaign(CampaignFacade source)
@@ -306,6 +365,16 @@
 		availableTable.updateDisplay();
 	}
 
+	/**
+	 * Save the selected sources for the current game mode so they can be 
+	 * restored next time we start.
+	 */
+	void rememberSelectedSources()
+	{
+		String sources = StringUtils.join(getSelectedCampaigns(), "|"); //$NON-NLS-1$
+		context.setProperty(PROP_SELECTED_SOURCES+gameMode.toString(), sources);		
+	}
+
 	private class AddAction extends AbstractAction
 	{
 
@@ -333,6 +402,7 @@
 						selectedCampaigns.removeElement(camp);
 					}
 				}
+				rememberSelectedSources();
 			}
 		}
 	}
@@ -356,6 +426,7 @@
 				{
 					selectedCampaigns.removeElement(camp);
 				}
+				rememberSelectedSources();
 			}
 		}
 	}

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java	2012-02-29 02:35:40 UTC (rev 16348)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java	2012-02-29 08:34:32 UTC (rev 16349)
@@ -163,8 +163,9 @@
 
 	private void initDefaults()
 	{
+		boolean useBasic = context.initBoolean("useBasic", true); //$NON-NLS-1$
 		SourceSelectionFacade selection = basicPanel.getSourceSelection();
-		if (selection != null)
+		if (selection != null && useBasic)
 		{
 			deleteButton.setEnabled(selection.isModifiable());
 			advancedPanel.setSourceSelection(selection);
@@ -174,7 +175,6 @@
 			deleteButton.setEnabled(false);
 		}
 		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS));
-		boolean useBasic = context.initBoolean("useBasic", true);
 		if (useBasic)
 		{
 			setBasicButtons();
@@ -183,6 +183,7 @@
 		else
 		{
 			setAdvancedButtons();
+			tabs.setSelectedIndex(1);
 		}
 	}
 
@@ -456,6 +457,7 @@
 	private class QuickSourceSelectionPanel extends JPanel implements ListSelectionListener
 	{
 
+		private static final String DEFAULT_SOURCE = "Pathfinder RPG for Players"; //$NON-NLS-1$
 		private JList sourceList;
 
 		public QuickSourceSelectionPanel()
@@ -503,7 +505,7 @@
 		{
 			final ListModel sortedModel = sourceList.getModel();
 			String defaultSelectedSource =
-					context.initProperty(PROP_SELECTED_SOURCE, sortedModel.getSize() == 0 ? null : sortedModel.getElementAt(0).toString());
+					context.initProperty(PROP_SELECTED_SOURCE, DEFAULT_SOURCE);
 			int index = Collections.binarySearch(new AbstractList<Object>()
 			{
 

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16348] Trunk/pcgen/docs/listfilepages/ globalfilestagpages/globalfilesother.html

[<mar...@us...>]

Revision: 16348
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16348&view=rev
Author:   maredudd800
Date:     2012-02-29 02:35:40 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Updated AUTO docs to allow multiple PRExxx tags at a time.
Issue#: NEWTAG-282,NEWTAG-283,NEWTAG-284,NEWTAG-285,NEWTAG-287

Modified Paths:
--------------
    Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html

Modified: Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html
===================================================================
--- Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html	2012-02-28 21:37:27 UTC (rev 16347)
+++ Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html	2012-02-29 02:35:40 UTC (rev 16348)
@@ -100,8 +100,8 @@
 
 <hr>
 
-		<p class="new">*** Updated 5.13.7</p>
-		<p class="indent0"><strong><a name="AUTOARMORPROF">Tag Name:</a></strong> AUTO:ARMORPROF|x|x</p>
+		<p class="new"><a name="AUTOARMORPROF">*** Updated 5.17.11</a></p>
+		<p class="indent0"><strong>Tag Name:</strong> AUTO:ARMORPROF|x|x</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> Text (Armor name)</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> ARMORTYPE=Text (Armor type)</p>
 		<p class="indent1"><strong>What it does:</strong></p>
@@ -111,8 +111,7 @@
 			<li>When including the <code>ARMORTYPE=</code> sub-tag you may use a period-delimted (.) list
 				of armor types. This will grant the character proficiency with armor that meet all of the
 				listed armor types.</li>
-			<li>Only one PRExxx tag is allowed, but it can be a PREMULT statement.</li>
-			<li>PRExxx tags must be appended to the tag using the pipe-delimited (|) syntax.</li>
+			<li>PRExxx tags are allowed with this tag and use the pipe-delimited (|) syntax.</li>
 		</ul>
 		<p class="indent1"><strong>Examples:</strong></p>
 		<p class="indent2"><code>AUTO:ARMORPROF|ARMORTYPE=Light</code></p>
@@ -123,27 +122,27 @@
 		<p class="indent3">Light and Medium Armor is given as a free armor proficiency.</p>
 		<p class="indent2"><code>AUTO:ARMORPROF|Dwarven Plate[PRERACE:1,Dwarf]</code></p>
 		<p class="indent3">Dwarven Plate is given as a free armor proficiency if the character is a Dwarf.</p>
-		<p class="indent1"><strong>Deprecated Syntax:</strong></p>
+		<p class="indent1"><strong>Deprecated Syntax:</strong> <span class="new">*** Deprecated 5.17.11 - Remove 6.2</span></p>
 		<p class="indent2"><code>AUTO:ARMORPROF|ARMORTYPE=Light[PRExxx]</code></p>
 		<p class="indent3">The square-bracketed PRExxx tag syntax has been deprecated in favor of the pipe-delimited (|) syntax.</p>
 		<p></p>
 
 <hr>
 
-	<p class="new">*** New 5.4</p>
-	<p class="indent0"><strong><a name="AUTOEQUIP">Tag Name:</a></strong> AUTO:EQUIP|x|x</p>
+	<p class="new"><a name="AUTOEQUIP">*** New 5.17.11</a></p>
+	<p class="indent0"><strong>Tag Name:</strong> AUTO:EQUIP|x|x</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> Text (&lt;Equipment Name&gt;)</p>
 		<p class="indent1"><strong>What it does:</strong></p>
 		<ul class="indent2">
 			<li>This is a pipe-delimited (|) list of equipment that is granted to the character for free.</li>
-			<li>The equipment added is marked on the GUI just as AUTO:FEATs are (yellow) and can't be removed.</li>
+			<li>The equipment added is marked on the GUI just as feats added by the <code>AUTO:FEAT</code> tag, 
+				i.e. are yellow, and can't be removed.</li>
 			<li>The equipment must be added to the Equipment Set just as any other Equipment the PC has to come out on the OS.</li>
-			<li>Only one PRExxx tag is allowed, but it can be a PREMULT statement.</li>
-			<li>PRExxx tags must be appended to the tag using the pipe-delimited (|) syntax.</li>
-			<li>CAUTION: Some trouble has been found when attempting to add two of the same item.</li>
-			<li>CAUTION: You should not use items which have math operators (such as + and -) in their names.</li>
-			<li>AUTO:EQUIP won't take (%)LIST or (%)CHOICE for substitution. See futureequipment_equipmods_gadgets.lst.</li>
+			<li>PRExxx tags are allowed with this tag and use the pipe-delimited (|) syntax.</li>
+			<li><code>AUTO:EQUIP</code> won't take (%)LIST or (%)CHOICE for substitution. See futureequipment_equipmods_gadgets.lst.</li>
 		</ul>
+		<p class="sidebar0"><strong>CAUTION:</strong> Some trouble has been found when attempting to add two of the same item. Additionally, 
+			you should not use items which have math operators (such as + and -) in their names.</p>
         <p class="indent1"><strong>Where it is used:</strong></p>
 		<p class="indent2">Global, however AUTO:EQUIP is not supported in class level lines. It can be used on a class line.</p>
 		<p class="indent1"><strong>Examples:</strong></p>
@@ -153,7 +152,7 @@
 		<p class="indent2"><code>AUTO:EQUIP|Flurry of Blows[PREMULT:2,[PRESTAT:1,DEX=15],[PRECLASS:1,Monk=1]]</code></p>
 		<p class="indent3">The item &quot;Flurry of Blows&quot; is granted as a free equipment item if the
 		character has a level of Monk and a DEX score of 15 or better.</p>
-	<p class="indent1"><strong>Deprecated Syntax:</strong></p>
+	<p class="indent1"><strong>Deprecated Syntax:</strong> <span class="new">*** Deprecated 5.17.11 - Remove 6.2</span></p>
 	<p class="indent2"><code>AUTO:EQUIP|Flurry of Blows[PRECLASS:1,Monk=1]</code></p>
 	<p class="indent3">The square-bracketed PRExxx tag syntax has been deprecated in favor of the pipe-delimited (|) syntax.</p>
 		<p></p>
@@ -190,8 +189,8 @@
 <!--
 <hr>
 
-		<p class="new">*** New 5.17.x</p>
-		<p class="indent0"><strong><a name="AUTOLANG">Tag Name:</a></strong> AUTO:LANG|x|x</p>
+		<p class="new"><a name="AUTOLANG">*** New 5.17.x</a></p>
+		<p class="indent0"><strong>Tag Name:</strong> AUTO:LANG|x|x</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> Text (Language)</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> TYPE=Text (Language type)</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> !TYPE=Text (Language type)</p>
@@ -201,8 +200,7 @@
 			<li>This is a pipe-delimited (|) list of languages, by name or type, that are granted as free language.</li>
 			<li>When including the <code>TYPE=</code> sub-tag you may use a period-delimted (.) list
 				of language types. This will grant the character any Language with the listed types.</li>
-			<li>Only one PRExxx tag is allowed, but it can be a PREMULT statement.</li>
-			<li>PRExxx tags must be enclosed within brackets. (i.e. [PRExxx]).</li>
+			<li>PRExxx tags are allowed with this tag and use the pipe-delimited (|) syntax.</li>
 		</ul>
 		<p class="indent1"><strong>Examples:</strong></p>
 		<p class="indent2"><code>AUTO:LANG|Common</code></p>
@@ -213,8 +211,8 @@
 -->
 <hr>
 
-		<p class="new">*** Updated 5.13.8</p>
-		<p class="indent0"><strong><a name="AUTOSHIELDPROF">Tag Name:</a></strong> AUTO:SHIELDPROF|x|x</p>
+		<p class="new"><a name="AUTOSHIELDPROF">*** Updated 5.17.11</a></p>
+		<p class="indent0"><strong>Tag Name:</strong> AUTO:SHIELDPROF|x|x</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> Text (Shield name)</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> SHIELDTYPE=Text (Shield type)</p>
 		<p class="indent1"><strong>What it does:</strong></p>
@@ -224,22 +222,21 @@
 			<li>When including the <code>SHIELDTYPE=</code> sub-tag you may use a period-delimted (.) list
 				of shield types. This will grant the character proficiency with shields that meet all of the
 				listed shield types.</li>
-			<li>Only one PRExxx tag is allowed, but it can be a PREMULT statement.</li>
-			<li>PRExxx tags must be appended to the tag using the pipe-delimited (|) syntax.</li>
+			<li>PRExxx tags are allowed with this tag and use the pipe-delimited (|) syntax.</li>
 		</ul>
 		<p class="indent1"><strong>Examples:</strong></p>
 		<p class="indent2"><code>AUTO:SHIELDPROF|SHIELDTYPE=Buckler</code></p>
 		<p class="indent3">Buckler shield is given as a free shield proficiency.</p>
 		<p class="indent2"><code>AUTO:SHIELDPROF|SHIELDTYPE=Buckler|SHIELDTYPE=Light|SHIELDTYPE=Heavy</code></p>
 		<p class="indent3">Buckler, Light, and Heavy Shields are given as free shield proficiencies.</p>
-	<p class="indent1"><strong>Deprecated Syntax:</strong></p>
+	<p class="indent1"><strong>Deprecated Syntax:</strong> <span class="new">*** Deprecated 5.17.11 - Remove 6.2</span></p>
 	<p class="indent2"><code>AUTO:SHIELDPROF|SHIELDTYPE=Buckler[PRExxx]</code></p>
 	<p class="indent3">The square-bracketed PRExxx tag syntax has been deprecated in favor of the pipe-delimited (|) syntax.</p>
 		<p></p>
 
 <hr>
 
-		<p class="status"><a name="AUTOWEAPONPROF">*** Updated 5.17.12</a></p>
+		<p class="new"><a name="AUTOWEAPONPROF">*** Updated 5.17.11</a></p>
 		<p class="indent0"><strong>Tag Name:</strong> AUTO:WEAPONPROF|x|x</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> Text (Weapon name)</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> TYPE=Text (Weapon Type)</p>
@@ -256,8 +253,7 @@
 			<li>When using the <code>DEITYWEAPONS</code> sub-tag, all of the deities favored weapons, except 
 				for natural weapons, are added.  If the deity specifies &quot;ALL&quot; or &quot;ANY&quot; for
 				its favored weapon, no weapons will be added.</li>
-			<li>Only one PRExxx tag is allowed, but it can be a PREMULT statement.</li>
-			<li>PRExxx tags must be appended to the tag using the pipe-delimited (|) syntax.</li>
+			<li>PRExxx tags are allowed with this tag and use the pipe-delimited (|) syntax.</li>
 		</ul>
 		<p class="indent1"><strong>Examples:</strong></p>
 		<p class="indent2"><code>AUTO:WEAPONPROF|Longsword|Shortbow (Composite)</code></p>
@@ -284,7 +280,7 @@
 			are given as free weapon proficiencies.</p>
 		<p class="indent2"><code>CLASS:Rogue.MOD &lt;tab&gt; AUTO:WEAPONPROF|Gladius</code></p>
 		<p class="indent3">Modified the Rogue Class to include the Gladius weapon.</p>
-		<p class="indent1"><strong>Deprecated Syntax:</strong></p>
+		<p class="indent1"><strong>Deprecated Syntax:</strong> <span class="new">*** Deprecated 5.17.11 - Remove 6.2</span></p>
 		<p class="indent2"><code>AUTO:WEAPONPROF|Longsword|Shortbow (Composite)[PRExxx]</code></p>
 		<p class="indent3">The square-bracketed PRExxx tag syntax has been deprecated in favor of the pipe-delimited (|) syntax.</p>
 		<p></p>

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16347] Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ advanced_players_guide

[<gjo...@us...>]

Revision: 16347
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16347&view=rev
Author:   gjorbjond
Date:     2012-02-28 21:37:27 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Alchemist Bombs attack should include size mod.  Extra Bombs had misspelled variable name.

Modified Paths:
--------------
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_feats.lst

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2012-02-28 12:54:02 UTC (rev 16346)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2012-02-28 21:37:27 UTC (rev 16347)
@@ -29,7 +29,7 @@
 Instant Alchemy		KEY:Instant Alchemy ~ Alchemist	CATEGORY:Special Ability	TYPE:SpecialQuality.Extraordinary																																																				DESC:You can create alchemical items with almost supernatural speed. You can create any alchemical item as a full-round action if you succeed at the Craft (Alchemy) check and have the appropriate resources at hand to fund the creation. You can apply poison to a weapon as an immediate action.
 
 # Bomb Attack Output
-Bomb	CATEGORY:Natural Attack	TYPE:NaturalAttack	ASPECT:NaturalAttackName|Bomb	ASPECT:NaturalAttackToHit|%1|BAB+DEX+BombAttackBonus	ASPECT:NaturalAttackDamage|%1d%2|BombDamageDice|BombDamageSize	ASPECT:NaturalAttackDamageBonus|%1|INT	ASPECT:NaturalAttackReach|%1|BombRange	ASPECT:NaturalAttackType|Fire	ASPECT:NaturalAttackThreatRange|%1|BombThreatRange	ASPECT:NaturalAttackCritMult|x%1|BombCritMult	DEFINE:BombDamageDice|0	DEFINE:BombDamageSize|0	DEFINE:BombThreatRange|0	DEFINE:BombRange|0	DEFINE:BombCritMult|2	DEFINE:BombAttackBonus|0	BONUS:VAR|BombDamageDice|1	BONUS:VAR|BombDamageSize|6	BONUS:VAR|BombThreatRange|20	BONUS:VAR|BombRange|20	DESC:%1d6 bonus damage|AlchemistBombAdditionalDice|PREVARGT:AlchemistBombAdditionalDice,0
+Bomb	CATEGORY:Natural Attack	TYPE:NaturalAttack	ASPECT:NaturalAttackName|Bomb	ASPECT:NaturalAttackToHit|%1|BAB+DEX+SIZEMOD+BombAttackBonus	ASPECT:NaturalAttackDamage|%1d%2|BombDamageDice|BombDamageSize	ASPECT:NaturalAttackDamageBonus|%1|INT	ASPECT:NaturalAttackReach|%1|BombRange	ASPECT:NaturalAttackType|Fire	ASPECT:NaturalAttackThreatRange|%1|BombThreatRange	ASPECT:NaturalAttackCritMult|x%1|BombCritMult	DEFINE:BombDamageDice|0	DEFINE:BombDamageSize|0	DEFINE:BombThreatRange|0	DEFINE:BombRange|0	DEFINE:BombCritMult|2	DEFINE:BombAttackBonus|0	BONUS:VAR|BombDamageDice|1	BONUS:VAR|BombDamageSize|6	BONUS:VAR|BombThreatRange|20	BONUS:VAR|BombRange|20	DESC:%1d6 bonus damage|AlchemistBombAdditionalDice|PREVARGT:AlchemistBombAdditionalDice,0
 #
 CATEGORY=Natural Attack|Bomb.MOD	BONUS:VAR|BombAttackBonus|1|PREFEAT:1,Weapon Focus(Bomb)	BONUS:VAR|BombAttackBonus|1|PREFEAT:1,Greater Weapon Focus(Bomb)
 #	For Special Attack Notes, you may either use DESC:x, or ASPECT:NaturalAttackNotes|x ASPECT would be used for just one note, DESC can take PRExxx and would be ideal if your attack can be given other things, such as level based increases.

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_feats.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_feats.lst	2012-02-28 12:54:02 UTC (rev 16346)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_feats.lst	2012-02-28 21:37:27 UTC (rev 16347)
@@ -53,7 +53,7 @@
 Elven Accuracy			TYPE:Combat																																																																															PRERACE:1,RACESUBTYPE=Elf																																																																																		DESC:Your sharp eyesight makes difficult shots easier.																																																																																																																																																																																																																																										SOURCEPAGE:p.159	BENEFIT:If you miss due to concealment when making a ranged attack with a longbow or shortbow (including composite bows), you can reroll your miss chance roll one time to see if you actually hit.
 Enforcer				TYPE:Combat																																																																																													PRESKILL:1,Intimidate=1																																																																					DESC:You are skilled at causing fear in those you brutalize.																																																																																																																																																																																																																																									SOURCEPAGE:p.159	BENEFIT:Whenever you deal nonlethal damage with a melee weapon, you can make an Intimidate check to demoralize your target as a free action. If you are successful, the target is shaken for a number of rounds equal to the damage dealt. If your attack was a critical hit, your target is frightened for 1 round with a successful Intimidate check, as well as being shaken for a number of rounds equal to the damage dealt.
 Expanded Arcana			TYPE:General																																	PRECLASS:1,SPELLCASTER=1																																																													PRESPELLCAST:MEMORIZE=N																																																															DESC:Your research has revealed new spells.																			STACK:YES	MULT:YES	CHOOSE:NOCHOICE																BONUS:ABILITYPOOL|Expanded Arcana Selection|1																																																																																																																																																																																												SOURCEPAGE:p.159	BENEFIT:Add one spell from your class's spell list to your list of spells known. This is in addition to the number of spells normally gained at each new level in your class. You may instead add two spells from your class's spell list to your list of spells known, but both of these spells must be at least one level lower than the highest level spell you can cast in that class. Once made, these choices cannot be changed.
-Extra Bombs				TYPE:General		PREABILITY:1,CATEGORY=Special Ability,Bomb ~ Alchemist																																																																																																																																																									DESC:You can throw more bombs per day.																				STACK:YES	MULT:YES	CHOOSE:NOCHOICE																																																																																																																																																																															BONUS:VAR|AlchemistBombsTimes|2																															SOURCEPAGE:p.159	BENEFIT:You can throw two additional bombs per day. Special - You can gain Extra Bombs multiple times. Its effects stack.
+Extra Bombs				TYPE:General		PREABILITY:1,CATEGORY=Special Ability,Bomb ~ Alchemist																																																																																																																																																									DESC:You can throw more bombs per day.																				STACK:YES	MULT:YES	CHOOSE:NOCHOICE																																																																																																																																																																															BONUS:VAR|AlchemistBombTimes|2																															SOURCEPAGE:p.159	BENEFIT:You can throw two additional bombs per day. Special - You can gain Extra Bombs multiple times. Its effects stack.
 Extra Discovery			TYPE:General		PREABILITY:1,CATEGORY=Special Ability,Discovery ~ Alchemist																																																																																																																																																									DESC:You have made a new alchemical discovery.																																									BONUS:ABILITYPOOL|Alchemist Discovery|1																																																																																																																																																																																													SOURCEPAGE:p.160	BENEFIT:You gain one additional discovery. You must meet all of the prerequisites for this discovery. Special - You can gain Extra Discovery multiple times.
 Extra Hex				TYPE:General		PREABILITY:1,CATEGORY=Special Ability,TYPE.WitchHex																																																																																																																																																										DESC:You have learned the secrets of a new hex.																					MULT:YES	CHOOSE:NOCHOICE																BONUS:ABILITYPOOL|Witch Hex|1																																																																																																																																																																																															SOURCEPAGE:p.160	BENEFIT:You gain one additional hex. You must meet all of the prerequisites for this hex. Special - You can gain Extra Hex multiple times.
 Extra Rage Power			TYPE:General		PREABILITY:1,CATEGORY=Special Ability,Rage Powers																																																																																																																																																										DESC:You have unlocked a new ability to use while raging.																			MULT:YES	CHOOSE:NOCHOICE																BONUS:ABILITYPOOL|Rage Power|1																																																																																																																																																																																														SOURCEPAGE:p.160	BENEFIT:You gain one additional rage power. You must meet all of the prerequisites for this rage power. Special - You can gain Extra Rage Power multiple times.

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16346] Trunk/pcgen/docs/listfilepages/ globalfilestagpages/globalfilesother.html

[<mar...@us...>]

Revision: 16346
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16346&view=rev
Author:   maredudd800
Date:     2012-02-28 12:54:02 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Updated PRExxx usage
Issue#: NEWTAG-287

Modified Paths:
--------------
    Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html

Modified: Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html
===================================================================
--- Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html	2012-02-28 10:05:14 UTC (rev 16345)
+++ Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html	2012-02-28 12:54:02 UTC (rev 16346)
@@ -160,8 +160,8 @@
 
 <hr>
 
-	<p class="new">*** Updated 5.17.4</p>
-	<p class="indent0"><strong><a name="AUTOFEAT">Tag Name:</a></strong> AUTO:FEAT|x|x</p>
+	<p class="new"><a name="AUTOFEAT">*** Updated 5.17.4</a></p>
+	<p class="indent0"><strong>Tag Name:</strong> AUTO:FEAT|x|x</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> Text (Feat name)</p>
 		<p class="indent1"><strong>What it does:</strong></p>
 		<ul class="indent2">
@@ -173,7 +173,7 @@
 				<li>Used in conjunction with the <code>CHOOSE</code> tag, <code>%LIST</code> 
 					can be used with this tag to provide the required choice.</li>
 			</ul>
-			<li>Only one PRExxx tag is allowed with this tag at a time unless you use a PREMULT statement.</li>
+			<li>PRExxx tags must be appended to the tag using the pipe-delimited (|) syntax.</li>
 			<li>.CLEAR may be used with this tag as part of a .MOD operation and may not be used during class progression. (i.e. There is no cross-level interaction.)</li>
 		</ul>
 		<p class="indent1"><strong>Note:</strong> This tag <strong class="new">WILL NOT</strong> activate a

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

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

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

Revision: 16345
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16345&view=rev
Author:   jdempsey
Date:     2012-02-28 10:05:14 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Fix bug: Unload Button - Does not seem to do anything. Pressing load, nothing loads.
* Add loaded column.
* Allow add and remove of multiple rows
* il8n work
Issue#: CODE-1316,

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java
    Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java
    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/PCGenFrame.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java	2012-02-28 07:37:23 UTC (rev 16344)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java	2012-02-28 10:05:14 UTC (rev 16345)
@@ -109,6 +109,7 @@
 import pcgen.gui2.util.SwingWorker;
 import pcgen.gui2.util.table.TableCellUtilities;
 import pcgen.io.PCGFile;
+import pcgen.persistence.PersistenceManager;
 import pcgen.persistence.SourceFileLoader;
 import pcgen.system.CharacterManager;
 import pcgen.system.ConfigurationSettings;
@@ -461,6 +462,9 @@
 		}
 	}
 
+	/**
+	 * @return A reference to the currently loaded sources.
+	 */
 	public ReferenceFacade<SourceSelectionFacade> getCurrentSourceSelectionRef()
 	{
 		return currentSourceSelection;
@@ -485,6 +489,17 @@
 	}
 
 	/**
+	 * Unload any currently loaded sources. 
+	 */
+	public void unloadSources()
+	{
+		currentSourceSelection.setReference(null);
+		Globals.emptyLists();
+		PersistenceManager pManager = PersistenceManager.getInstance();
+		pManager.clear();
+	}
+	
+	/**
 	 * Loads a selection of sources into PCGen asynchronously and
 	 * tracks the load progress on the status bar. While sources
 	 * are being loaded any calls to this method are ignored until

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-28 07:37:23 UTC (rev 16344)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java	2012-02-28 10:05:14 UTC (rev 16345)
@@ -45,7 +45,6 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
-import pcgen.core.Globals;
 import pcgen.core.facade.CampaignFacade;
 import pcgen.core.facade.GameModeFacade;
 import pcgen.core.facade.SourceSelectionFacade;
@@ -54,6 +53,7 @@
 import pcgen.core.facade.util.DefaultListFacade;
 import pcgen.core.facade.util.ListFacade;
 import pcgen.core.facade.util.ListFacades;
+import pcgen.gui2.PCGenFrame;
 import pcgen.gui2.UIPropertyContext;
 import pcgen.gui2.filter.FilterBar;
 import pcgen.gui2.filter.FilteredTreeViewTable;
@@ -62,13 +62,14 @@
 import pcgen.gui2.tools.Icons;
 import pcgen.gui2.tools.InfoPane;
 import pcgen.gui2.util.FacadeComboBoxModel;
+import pcgen.gui2.util.table.DynamicTableColumnModel;
+import pcgen.gui2.util.table.TableCellUtilities;
 import pcgen.gui2.util.treeview.DataView;
 import pcgen.gui2.util.treeview.DataViewColumn;
 import pcgen.gui2.util.treeview.DefaultDataViewColumn;
 import pcgen.gui2.util.treeview.TreeView;
 import pcgen.gui2.util.treeview.TreeViewModel;
 import pcgen.gui2.util.treeview.TreeViewPath;
-import pcgen.persistence.PersistenceManager;
 import pcgen.system.FacadeFactory;
 import pcgen.system.LanguageBundle;
 
@@ -91,9 +92,11 @@
 	private final JButton addButton;
 	private final JButton removeButton;
 	private DefaultListFacade<CampaignFacade> selectedCampaigns;
+	private final PCGenFrame frame;
 	
-	public AdvancedSourceSelectionPanel()
+	public AdvancedSourceSelectionPanel(PCGenFrame frame)
 	{
+		this.frame = frame;
 		this.availableTable = new FilteredTreeViewTable();
 		this.selectedTable = new FilteredTreeViewTable();
 		this.selectedCampaigns = new DefaultListFacade<CampaignFacade>();
@@ -133,6 +136,11 @@
 		availableTable.setTreeViewModel(availTreeViewModel);
 		availableTable.getSelectionModel().addListSelectionListener(this);
 		availableTable.setTreeCellRenderer(new CampaignRenderer());
+		((DynamicTableColumnModel) availableTable.getColumnModel())
+			.getAvailableColumns()
+			.get(2)
+			.setCellRenderer(
+				new TableCellUtilities.AlignRenderer(SwingConstants.CENTER));
 		
 		JScrollPane pane = new JScrollPane(availableTable);
 		pane.setPreferredSize(new Dimension(600, 310));
@@ -159,6 +167,11 @@
 		selectedTable.setTreeViewModel(selTreeViewModel);
 		selectedTable.getSelectionModel().addListSelectionListener(this);
 		selectedTable.setTreeCellRenderer(new CampaignRenderer());
+		((DynamicTableColumnModel) selectedTable.getColumnModel())
+			.getAvailableColumns()
+			.get(2)
+			.setCellRenderer(
+				new TableCellUtilities.AlignRenderer(SwingConstants.CENTER));
 		JScrollPane scrollPane = new JScrollPane(selectedTable);
 		scrollPane.setPreferredSize(new Dimension(300,350));
 		selPanel.add(scrollPane, BorderLayout.CENTER);
@@ -247,6 +260,12 @@
 		}
 	}
 
+	void refreshDisplay()
+	{
+		availableTable.refreshModelData();
+		selectedTable.refreshModelData();
+	}
+	
 	/**
 	 * {@inheritDoc}
 	 */
@@ -302,15 +321,17 @@
 			List<CampaignFacade> list = availableTable.getSelectedData();
 			if (list != null && !list.isEmpty())
 			{
-				CampaignFacade camp = list.get(0);
-				selectedCampaigns.addElement(camp);
-				if (!FacadeFactory.passesPrereqs(gameMode, selectedCampaigns.getContents()))
+				for (CampaignFacade camp : list)
 				{
-					JOptionPane.showMessageDialog(AdvancedSourceSelectionPanel.this,
-												  LanguageBundle.getString("in_src_badComboMsg"), //$NON-NLS-1$
-												  LanguageBundle.getString("in_src_badComboTitle"), //$NON-NLS-1$
-												  JOptionPane.INFORMATION_MESSAGE);
-					selectedCampaigns.removeElement(camp);
+					selectedCampaigns.addElement(camp);
+					if (!FacadeFactory.passesPrereqs(gameMode, selectedCampaigns.getContents()))
+					{
+						JOptionPane.showMessageDialog(AdvancedSourceSelectionPanel.this,
+													  LanguageBundle.getString("in_src_badComboMsg"), //$NON-NLS-1$
+													  LanguageBundle.getString("in_src_badComboTitle"), //$NON-NLS-1$
+													  JOptionPane.INFORMATION_MESSAGE);
+						selectedCampaigns.removeElement(camp);
+					}
 				}
 			}
 		}
@@ -331,8 +352,10 @@
 			List<CampaignFacade> list = selectedTable.getSelectedData();
 			if (list != null && !list.isEmpty())
 			{
-				CampaignFacade camp = list.get(0);
-				selectedCampaigns.removeElement(camp);
+				for (CampaignFacade camp : list)
+				{
+					selectedCampaigns.removeElement(camp);
+				}
 			}
 		}
 	}
@@ -347,17 +370,17 @@
 
 		public void actionPerformed(ActionEvent e)
 		{
-			Globals.emptyLists();
-			PersistenceManager pManager = PersistenceManager.getInstance();
-			pManager.clear();
+			frame.unloadSources();
+			availableTable.refreshModelData();
+			selectedTable.refreshModelData();
 		}
 	}
 
-	private static class SourceTreeViewModel
+	private class SourceTreeViewModel
 			implements TreeViewModel<CampaignFacade>, DataView<CampaignFacade>, ListListener<CampaignFacade>
 	{
 		
-		private static ListFacade<TreeView<CampaignFacade>> views =
+		private ListFacade<TreeView<CampaignFacade>> views =
 				new DefaultListFacade<TreeView<CampaignFacade>>(Arrays.asList(SourceTreeView.values()));
 		private DefaultListFacade<CampaignFacade> model;
 		private ListFacade<CampaignFacade> baseModel = null;
@@ -370,7 +393,8 @@
 			this.isAvailModel = true;
 			columns =
 					Arrays.asList(new DefaultDataViewColumn("in_src_bookType", String.class, true), 
-						new DefaultDataViewColumn("in_src_status", String.class, true));
+						new DefaultDataViewColumn("in_src_status", String.class, true),
+						new DefaultDataViewColumn("in_src_loaded", String.class, false));
 		}
 		
 		public SourceTreeViewModel( DefaultListFacade<CampaignFacade> model)
@@ -379,7 +403,8 @@
 			this.isAvailModel = false;
 			columns =
 					Arrays.asList(new DefaultDataViewColumn("in_src_bookType", String.class, false), 
-						new DefaultDataViewColumn("in_src_status", String.class, false));
+						new DefaultDataViewColumn("in_src_status", String.class, false),
+						new DefaultDataViewColumn("in_src_loaded", String.class, false));
 		}
 		
 		public ListFacade<? extends TreeView<CampaignFacade>> getTreeViews()
@@ -404,7 +429,16 @@
 		
 		public List<?> getData(CampaignFacade obj)
 		{
-			return Arrays.asList(obj.getBookType(), obj.getStatus());
+			SourceSelectionFacade sourceFacade =
+					frame.getCurrentSourceSelectionRef().getReference();
+			boolean isLoaded =
+					sourceFacade != null
+						&& sourceFacade.getCampaigns().containsElement(obj);
+			return Arrays.asList(
+				obj.getBookType(),
+				obj.getStatus(),
+				isLoaded ? LanguageBundle.getString("in_yes") : LanguageBundle
+					.getString("in_no"));
 		}
 		
 		public List<? extends DataViewColumn> getDataColumns()
@@ -438,67 +472,70 @@
 			model.setContents(ListFacades.wrap(baseModel));
 		}
 		
-		private static enum SourceTreeView implements
-				TreeView<CampaignFacade>
+	}
+
+	private static enum SourceTreeView implements TreeView<CampaignFacade>
+	{
+
+		NAME("in_nameLabel"), //$NON-NLS-1$
+		PUBLISHER_NAME("in_src_pubName"), //$NON-NLS-1$
+		PUBLISHER_SETTING_NAME("in_src_pubSetName"), //$NON-NLS-1$
+		PUBLISHER_FORMAT_SETTING_NAME("in_src_pubFmtSetName"); //$NON-NLS-1$
+		private String name;
+
+		private SourceTreeView(String name)
 		{
-			
-			NAME("in_nameLabel"), //$NON-NLS-1$
-			PUBLISHER_NAME("in_src_pubName"), //$NON-NLS-1$
-			PUBLISHER_SETTING_NAME("in_src_pubSetName"), //$NON-NLS-1$
-			PUBLISHER_FORMAT_SETTING_NAME("in_src_pubFmtSetName"); //$NON-NLS-1$
-			private String name;
-			
-			private SourceTreeView(String name)
+			this.name = LanguageBundle.getString(name);
+		}
+
+		public String getViewName()
+		{
+			return name;
+		}
+
+		public List<TreeViewPath<CampaignFacade>> getPaths(CampaignFacade pobj)
+		{
+			String publisher = pobj.getPublisher();
+			if (publisher == null)
 			{
-				this.name = LanguageBundle.getString(name);
+				publisher = LanguageBundle.getString("in_other"); //$NON-NLS-1$
 			}
-			
-			public String getViewName()
+			String setting = pobj.getSetting();
+			String format = pobj.getFormat();
+			switch (this)
 			{
-				return name;
+				case NAME:
+					return Collections
+						.singletonList(new TreeViewPath<CampaignFacade>(pobj));
+				case PUBLISHER_FORMAT_SETTING_NAME:
+					if (format != null && setting != null)
+					{
+						return Collections
+							.singletonList(new TreeViewPath<CampaignFacade>(
+								pobj, publisher, format, setting));
+					}
+					if (format != null)
+					{
+						return Collections
+							.singletonList(new TreeViewPath<CampaignFacade>(
+								pobj, publisher, format));
+					}
+				case PUBLISHER_SETTING_NAME:
+					if (setting != null)
+					{
+						return Collections
+							.singletonList(new TreeViewPath<CampaignFacade>(
+								pobj, publisher, setting));
+					}
+				case PUBLISHER_NAME:
+					return Collections
+						.singletonList(new TreeViewPath<CampaignFacade>(pobj,
+							publisher));
+				default:
+					throw new InternalError();
 			}
-			
-			public List<TreeViewPath<CampaignFacade>> getPaths(CampaignFacade pobj)
-			{
-				String publisher = pobj.getPublisher();
-				if (publisher == null)
-				{
-					publisher = LanguageBundle.getString("in_other"); //$NON-NLS-1$
-				}
-				String setting = pobj.getSetting();
-				String format = pobj.getFormat();
-				switch (this)
-				{
-					case NAME:
-						return Collections.singletonList(new TreeViewPath<CampaignFacade>(
-								pobj));
-					case PUBLISHER_FORMAT_SETTING_NAME:
-						if (format != null && setting != null)
-						{
-							return Collections.singletonList(new TreeViewPath<CampaignFacade>(
-									pobj, publisher, format, setting));
-						}
-						if (format != null)
-						{
-							return Collections.singletonList(new TreeViewPath<CampaignFacade>(
-									pobj, publisher, format));
-						}
-					case PUBLISHER_SETTING_NAME:
-						if (setting != null)
-						{
-							return Collections.singletonList(new TreeViewPath<CampaignFacade>(
-									pobj, publisher, setting));
-						}
-					case PUBLISHER_NAME:
-						return Collections.singletonList(new TreeViewPath<CampaignFacade>(
-								pobj, publisher));
-					default:
-						throw new InternalError();
-				}
-			}
-			
 		}
-		
+
 	}
 
 	/**

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java	2012-02-28 07:37:23 UTC (rev 16344)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java	2012-02-28 10:05:14 UTC (rev 16345)
@@ -34,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -54,12 +55,13 @@
 import javax.swing.event.ChangeListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+
 import pcgen.core.facade.CampaignFacade;
 import pcgen.core.facade.GameModeFacade;
 import pcgen.core.facade.LoadableFacade.LoadingState;
+import pcgen.core.facade.SourceSelectionFacade;
 import pcgen.core.facade.util.ListFacade;
 import pcgen.core.facade.util.ListFacades;
-import pcgen.core.facade.SourceSelectionFacade;
 import pcgen.gui.DataInstaller;
 import pcgen.gui2.PCGenFrame;
 import pcgen.gui2.UIPropertyContext;
@@ -79,14 +81,14 @@
 		implements ActionListener, ChangeListener, ListSelectionListener
 {
 
-	private static final UIPropertyContext context = UIPropertyContext.createContext("SourceSelectionDialog");
-	private static final String PROP_SELECTED_SOURCE = "selectedSource";
-	private static final String LOAD_COMMAND = "Load";
-	private static final String CANCEL_COMMAND = "Cancel";
-	private static final String SAVE_COMMAND = "Save";
-	private static final String DELETE_COMMAND = "Delete";
-	private static final String HIDEUNHIDE_COMMAND = "Hide";
-	private static final String INSTALLDATA_COMMAND = "Install";
+	private static final UIPropertyContext context = UIPropertyContext.createContext("SourceSelectionDialog"); //$NON-NLS-1$
+	private static final String PROP_SELECTED_SOURCE = "selectedSource"; //$NON-NLS-1$
+	private static final String LOAD_COMMAND = "Load"; //$NON-NLS-1$
+	private static final String CANCEL_COMMAND = "Cancel"; //$NON-NLS-1$
+	private static final String SAVE_COMMAND = "Save"; //$NON-NLS-1$
+	private static final String DELETE_COMMAND = "Delete"; //$NON-NLS-1$
+	private static final String HIDEUNHIDE_COMMAND = "Hide"; //$NON-NLS-1$
+	private static final String INSTALLDATA_COMMAND = "Install"; //$NON-NLS-1$
 	private final PCGenFrame frame;
 	private QuickSourceSelectionPanel basicPanel;
 	private AdvancedSourceSelectionPanel advancedPanel;
@@ -106,7 +108,7 @@
 		setTitle(LanguageBundle.getString("in_mnuSourcesLoadSelect")); //$NON-NLS-1$
 		this.tabs = new JTabbedPane();
 		this.basicPanel = new QuickSourceSelectionPanel();
-		this.advancedPanel = new AdvancedSourceSelectionPanel();
+		this.advancedPanel = new AdvancedSourceSelectionPanel(frame);
 		this.buttonPanel = new JPanel();
 		this.loadButton = new JButton(LanguageBundle.getString("in_load")); //$NON-NLS-1$
 		this.cancelButton = new JButton(LanguageBundle.getString("in_cancel")); //$NON-NLS-1$
@@ -125,8 +127,8 @@
 		Container pane = getContentPane();
 		pane.setLayout(new BorderLayout());
 
-		tabs.add("Basic", basicPanel);
-		tabs.add("Advanced", advancedPanel);
+		tabs.add(LanguageBundle.getString("in_basic"), basicPanel); //$NON-NLS-1$
+		tabs.add(LanguageBundle.getString("in_advanced"), advancedPanel); //$NON-NLS-1$
 		tabs.addChangeListener(this);
 		pane.add(tabs, BorderLayout.CENTER);
 
@@ -355,6 +357,19 @@
 		}
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setVisible(boolean visible)
+	{
+		if (visible)
+		{
+			advancedPanel.refreshDisplay();
+		}
+		super.setVisible(visible);
+	}
+
 	private static class SourcesTableModel extends FilteredListFacadeTableModel<SourceSelectionFacade>
 	{
 

Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2012-02-28 07:37:23 UTC (rev 16344)
+++ Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties	2012-02-28 10:05:14 UTC (rev 16345)
@@ -4417,6 +4417,7 @@
 
 in_src_bookType=Book Type
 in_src_status=Status
+in_src_loaded=Loaded
 in_src_info=Campaign Info
 
 in_src_pubName=Publisher/Name
@@ -4466,6 +4467,7 @@
 in_hideunhide=Hide/Unhide
 in_saveSelection=Save Source Selection
 
+in_basic=Basic
 in_advanced=Advanced
 
 in_source_gamemode={0} Mode

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16344] Trunk/pcgen/code/src/java/plugin/pretokens/test/ PreSkillTester.java

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

Revision: 16344
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16344&view=rev
Author:   jdempsey
Date:     2012-02-28 07:37:23 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Fix bug: Concurrent error in testing prereq
Issue#: CODE-1317

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSkillTester.java

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSkillTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSkillTester.java	2012-02-28 05:22:54 UTC (rev 16343)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSkillTester.java	2012-02-28 07:37:23 UTC (rev 16344)
@@ -25,6 +25,7 @@
  *
  */package plugin.pretokens.test;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -215,7 +216,8 @@
 		HashMap<Skill, Set<Skill>> serveAsSkills, Set<Skill> imitators,
 		PlayerCharacter character)
 	{
-		for (Skill aSkill : character.getSkillSet())
+		Set<Skill> skillSet = new HashSet<Skill>(character.getSkillSet());
+		for (Skill aSkill : skillSet)
 		{
 			Set<Skill> servesAs = new HashSet<Skill>();
 			for(CDOMReference<Skill> ref: aSkill.getSafeListFor(ListKey.SERVES_AS_SKILL))

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16343] Trunk/utilities/prettylst/prettylst.pl

[<ama...@us...>]

Revision: 16343
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16343&view=rev
Author:   amaitland
Date:     2012-02-28 05:22:54 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
PrettyLst - add FEATSELECTION
Issue#: NEWTAG-96

Modified Paths:
--------------
    Trunk/utilities/prettylst/prettylst.pl

Modified: Trunk/utilities/prettylst/prettylst.pl
===================================================================
--- Trunk/utilities/prettylst/prettylst.pl	2012-02-28 01:58:03 UTC (rev 16342)
+++ Trunk/utilities/prettylst/prettylst.pl	2012-02-28 05:22:54 UTC (rev 16343)
@@ -3729,6 +3729,7 @@
 	'FEATADD',				# Deprecated 5.15 - Remove 6.0
 	'FEATLIST',				# Deprecated 5.15 - Remove 6.0
 	'FEATSELECT',			# Deprecated 5.15 - Remove 6.0
+	'FEATSELECTION',		# [NEWTAG-96 added 5.17]
 	'HP',
 	'NOCHOICE',
 	'NUMBER',

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16342] Trunk/content/notfordistribution/opendesign/ midgard/book_of_drakes

[<mar...@us...>]

Revision: 16342
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16342&view=rev
Author:   maredudd800
Date:     2012-02-28 01:58:03 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------

Issue#: NEWSOURCE-124

Modified Paths:
--------------
    Trunk/content/notfordistribution/opendesign/midgard/book_of_drakes/bod_abilities_build.lst
    Trunk/content/notfordistribution/opendesign/midgard/book_of_drakes/bod_companionmods.lst

Modified: Trunk/content/notfordistribution/opendesign/midgard/book_of_drakes/bod_abilities_build.lst
===================================================================
--- Trunk/content/notfordistribution/opendesign/midgard/book_of_drakes/bod_abilities_build.lst	2012-02-28 01:57:01 UTC (rev 16341)
+++ Trunk/content/notfordistribution/opendesign/midgard/book_of_drakes/bod_abilities_build.lst	2012-02-28 01:58:03 UTC (rev 16342)
@@ -166,7 +166,7 @@
 # Ability Name	Unique Key				Key													Category of Ability			Type								Serves As							Define																					Description																																								Modify VAR											Source Page		Aspects
 Spell-like Ability (1/day, 1st lvl Spell)				KEY:Spell-like Ability I/I ~ Drake Build Feature		CATEGORY:Special Ability	TYPE:SpelllikeAbility.Spelllike	VISIBLE:DISPLAY 		DEFINE:SLA_CL|HD	STACK:NO	MULT:YES	CHOOSE:SPELLS|ANY[LEVELMIN=1;LEVELMAX=1]	COST:2		SOURCEPAGE:pg.52	DESC:You cast %1 per the spell of the same name 1/day and casterlevel %2.|%CHOICE|SLA_CL
 
-## Drake Build Spell-Like Abilities
+## Drake Build Size Mods
 # Ability Name				Unique Key										Category of Ability			Type								Serves As							Define																					Description																																								Modify VAR											Source Page		Aspects
 Increase Size				KEY:Increase Size ~ Drake Build Feature			CATEGORY:Special Ability	TYPE:DrakeSizeMod		PREMULT:1,[PRESIZEEQ:S],[PRESIZEEQ:M]		BONUS:SIZEMOD|NUMBER|1
 Bonus Feature Points		KEY:Bonus Feature Points ~ Drake Build Feature	CATEGORY:Special Ability	TYPE:DrakeSizeMod		PREMULT:1,[PRESIZEEQ:S],[PRESIZEEQ:M]		BONUS:ABILITYPOOL|Drake Build Feature|10

Modified: Trunk/content/notfordistribution/opendesign/midgard/book_of_drakes/bod_companionmods.lst
===================================================================
--- Trunk/content/notfordistribution/opendesign/midgard/book_of_drakes/bod_companionmods.lst	2012-02-28 01:57:01 UTC (rev 16341)
+++ Trunk/content/notfordistribution/opendesign/midgard/book_of_drakes/bod_companionmods.lst	2012-02-28 01:58:03 UTC (rev 16342)
@@ -15,12 +15,12 @@
 FOLLOWER:DrakeLevel=9	TYPE:Drake Companion	HD:1																				BONUS:ABILITYPOOL|Drake Build Feature|10	BONUS:MISC|CR|1		BONUS:VAR|MasterLevel|1
 FOLLOWER:DrakeLevel=10	TYPE:Drake Companion																																						BONUS:VAR|MasterLevel|1
 FOLLOWER:DrakeLevel=11	TYPE:Drake Companion	HD:1																				BONUS:ABILITYPOOL|Drake Build Feature|10	BONUS:MISC|CR|1		BONUS:VAR|MasterLevel|1
-FOLLOWER:DrakeLevel=12	TYPE:Drake Companion																																						BONUS:VAR|MasterLevel|1						BONUS:ABILITYPOOL|Drake Size Mod|1
+FOLLOWER:DrakeLevel=12	TYPE:Drake Companion																						BONUS:ABILITYPOOL|Drake Build Feature|10						BONUS:VAR|MasterLevel|1
 FOLLOWER:DrakeLevel=13	TYPE:Drake Companion	HD:1																				BONUS:ABILITYPOOL|Drake Build Feature|10	BONUS:MISC|CR|1		BONUS:VAR|MasterLevel|1
-FOLLOWER:DrakeLevel=14	TYPE:Drake Companion																																						BONUS:VAR|MasterLevel|1
+FOLLOWER:DrakeLevel=14	TYPE:Drake Companion																						BONUS:ABILITYPOOL|Drake Build Feature|10						BONUS:VAR|MasterLevel|1
 FOLLOWER:DrakeLevel=15	TYPE:Drake Companion	HD:1																				BONUS:ABILITYPOOL|Drake Build Feature|10	BONUS:MISC|CR|1		BONUS:VAR|MasterLevel|1
-FOLLOWER:DrakeLevel=16	TYPE:Drake Companion																																						BONUS:VAR|MasterLevel|1						BONUS:ABILITYPOOL|Drake Size Mod|1
+FOLLOWER:DrakeLevel=16	TYPE:Drake Companion																						BONUS:ABILITYPOOL|Drake Build Feature|10						BONUS:VAR|MasterLevel|1
 FOLLOWER:DrakeLevel=17	TYPE:Drake Companion	HD:1																				BONUS:ABILITYPOOL|Drake Build Feature|10	BONUS:MISC|CR|1		BONUS:VAR|MasterLevel|1
-FOLLOWER:DrakeLevel=18	TYPE:Drake Companion																																						BONUS:VAR|MasterLevel|1
+FOLLOWER:DrakeLevel=18	TYPE:Drake Companion																						BONUS:ABILITYPOOL|Drake Build Feature|10						BONUS:VAR|MasterLevel|1
 FOLLOWER:DrakeLevel=19	TYPE:Drake Companion	HD:1																				BONUS:ABILITYPOOL|Drake Build Feature|10	BONUS:MISC|CR|1		BONUS:VAR|MasterLevel|1
 FOLLOWER:DrakeLevel=20	TYPE:Drake Companion																																						BONUS:VAR|MasterLevel|1

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16341] Trunk/pcgen/installers/mac-installer/instructions .html

[<mar...@us...>]

Revision: 16341
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16341&view=rev
Author:   maredudd800
Date:     2012-02-28 01:57:01 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Update the mac-install instructions.

Modified Paths:
--------------
    Trunk/pcgen/installers/mac-installer/instructions.html

Modified: Trunk/pcgen/installers/mac-installer/instructions.html
===================================================================
--- Trunk/pcgen/installers/mac-installer/instructions.html	2012-02-27 21:27:44 UTC (rev 16340)
+++ Trunk/pcgen/installers/mac-installer/instructions.html	2012-02-28 01:57:01 UTC (rev 16341)
@@ -42,9 +42,9 @@
 
 		<ol style="list-style-type: upper-alpha">
 			<li>You will need the OS X developer tools installed.  If they didn't come with your computer/OS, then you 
-				can setup a free Apple Developer Connection account at <a href="http://www.apple.com/developer">http://www.apple.com/developer</a> 
-				and download them from there. The version I'm currently using is XCode Tools 2.2 which runs in Tiger.</li>
-			<li>Make sure that you have all of current OS updates installed.</li>
+				can setup a free Apple Developer Connection account at <a href="http://developer.apple.com/xcode/index.php">http://developer.apple.com/xcode/index.php</a> 
+				and download them from there. The version I'm currently using is XCode Tools 4.02 running on Snow Leopard.</li>
+			<li>Make sure that you have all the current OS updates installed.</li>
 			<li>Download the support files in this module of the PCGen project at: https://svn.sourceforge.net/pcgen/Trunk/installers/mac-installer</a>.</li>
 			<li>Finally, download the full version of PCGen from SF.</li>
 		</ol>
@@ -55,13 +55,12 @@
 		<h2>Step 2: Converting PCGen to an OS X App</h2>
 
 		<ol style="list-style-type: upper-alpha">
-			<li>Launch /Developer/Applications/Java Tools/Jar Bundler</li>
+			<li>Launch /Developer/Applications/Utilities/Jar Bundler</li>
 			<li>On the first tab (Build Information), click on the choose button to the right of the 
 				Main Class field.  Navigate to pcgen.jar for the version we are building and select it.</li>
-			<li>Make sure the "Use Macintosh Menu Bar" is not checked, in OS 10.4 Apple changed the way 
-				the menu bar in java is handled and checking this will cause the app to crash on launch in Tiger.</li>
-			<li>Make sure the "Anti-Alias Text", "Anti-alias Graphics", and "Growbox Intrudes" checkboxs are all checked.</li>
-			<li>Make sure the JVM version is 1.5+</li>
+			<li>Make sure the "Use Macintosh Menu Bar" is not checked.</li>
+			<li>Make sure the "Anti-Alias Text" and "Anti-alias Graphics" checkboxs are all checked.</li>
+			<li>Make sure the JVM version is 1.6+</li>
 			<li>Switch to the Properties tab.</li>
 			<li>In the Type field, verify that it is APPL.</li>
 			<li>In the Signature Field Enter "PCGn" (without the quotes).</li>
@@ -124,7 +123,7 @@
 			<li>Launch /Applications/Utilities/Disk Utility.</li>
 			<li>Click on the New Image button in the toolbar of the main window.</li>
 			<li>Name this image "Install PCGen.dmg" (without the quotes). </li>
-			<li>Make the size 100 MB.</li>
+			<li>Make the size 125 MB.</li>
 			<li>Set the Encryption to "none".</li>
 			<li>Set the Format to "read/write disc image".</li>
 		</ol>

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

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

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

Revision: 16340
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16340&view=rev
Author:   jdempsey
Date:     2012-02-27 21:27:44 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
Fix bug: SORTKEY not being respected
Issue#: CODE-1296

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/util/Comparators.java

Modified: Trunk/pcgen/code/src/java/pcgen/util/Comparators.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/Comparators.java	2012-02-27 20:15:35 UTC (rev 16339)
+++ Trunk/pcgen/code/src/java/pcgen/util/Comparators.java	2012-02-27 21:27:44 UTC (rev 16340)
@@ -25,6 +25,10 @@
 import java.util.Comparator;
 import java.util.Date;
 
+import pcgen.cdom.base.CDOMObject;
+import pcgen.cdom.enumeration.StringKey;
+import pcgen.gui2.util.treetable.TreeTableNode;
+
 /**
  *
  * @author Connor Petty <mis...@gm...>
@@ -44,6 +48,7 @@
 	private static final NumberComparator nC = new NumberComparator();
 	private static final DateComparator dC = new DateComparator();
 	private static final HashCodeComparator hCC = new HashCodeComparator();
+	private static final TreeTableNodeComparator treeNodeComp = new TreeTableNodeComparator();
 
 	public static <T> Comparator<T> toStringComparator()
 	{
@@ -61,6 +66,14 @@
 	}
 
 	/**
+	 * @return A comparator for use with the contents of tree table nodes. 
+	 */
+	public static Comparator<Object> treeTableNodeComparator()
+	{
+		return treeNodeComp;
+	}
+
+	/**
 	 * TODO: perhaps keep instance references to commonly used InverseComparators?
 	 * @param comparator
 	 * @return new InverseComparator instance
@@ -119,6 +132,10 @@
 		{
 			return (Comparator<? super T>) ignoreCaseStringComparator();
 		}
+		else if (c == TreeTableNode.class)
+		{
+			return (Comparator<? super T>) treeTableNodeComparator();
+		}
 		return toStringComparator();
 	}
 
@@ -181,6 +198,51 @@
 
 	}
 
+	/**
+	 * A <code>Comparator</code> to compare tree table nodes. This respects SORTKEY for the contained object. 
+	 */
+	private static final class TreeTableNodeComparator implements Comparator<Object>,
+			Serializable
+	{
+
+		/** {@inheritDoc} */
+		public int compare(Object o1, Object o2)
+		{
+			String key1 = getSortKey(o1); 
+			String key2 = getSortKey(o2);
+			final Collator collator = Collator.getInstance();
+			
+			if (!key1.equals(key2))
+			{
+				return collator.compare(key1, key2);
+			}
+			return collator.compare(String.valueOf(o1), String.valueOf(o2));
+		}
+
+		private String getSortKey(Object obj1)
+		{
+			String key;
+			if (obj1 == null)
+			{
+				key = "";
+			}
+			else if (obj1 instanceof CDOMObject)
+			{
+				CDOMObject co = (CDOMObject) obj1;
+				key = co.get(StringKey.SORT_KEY);
+				if (key == null)
+				{
+					key = co.getDisplayName();
+				}
+			}
+			else
+			{
+				key = obj1.toString();
+			}
+			return key;
+		}
+	}
+
 	private static final class ToStringIgnoreCaseCollator<E> implements Comparator<E>, Serializable
 	{
 

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16339] Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ AbilitiesInfoTab.java

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

Revision: 16339
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16339&view=rev
Author:   jdempsey
Date:     2012-02-27 20:15:35 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
Fix bug: Can't Create New Character (Out of bounds issue)
Issue#: CODE-1315

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java	2012-02-27 20:00:45 UTC (rev 16338)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java	2012-02-27 20:15:35 UTC (rev 16339)
@@ -38,6 +38,7 @@
 import pcgen.core.facade.event.ListEvent;
 import pcgen.core.facade.event.ListListener;
 import pcgen.gui2.util.SharedTabPane;
+import pcgen.util.Logging;
 
 /**
  *
@@ -135,7 +136,17 @@
 			String type = element.getType();
 			if (!typeMap.containsKey(type))
 			{
-				tabs.add(e.getIndex(), new TabInfo(type, character));
+				if (e.getIndex() >= tabs.size())
+				{
+					Logging.log(Logging.WARNING, "Trying to add " + type + " to "
+						+ tabs + " at index " + e.getIndex()
+						+ ". Putting at end.");
+					tabs.add(new TabInfo(type, character));
+				}
+				else
+				{
+					tabs.add(e.getIndex(), new TabInfo(type, character));
+				}
 				populateFullCategoryList(type, typeMap.get(type));
 				if (isInstalled)
 				{//Add new tab

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

[pcgen-commit-svn] SF.net SVN: pcgen:[16338] Trunk/pcgen/preview/d20/fantasy/ Fantasy_Character_Sheet.html

[<ama...@us...>]

Revision: 16338
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16338&view=rev
Author:   amaitland
Date:     2012-02-27 20:00:45 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
Fantasy_Character_Preview Sheet - Weapon Name doesn't scale
Issue#: OS-165

Modified Paths:
--------------
    Trunk/pcgen/preview/d20/fantasy/Fantasy_Character_Sheet.html

Modified: Trunk/pcgen/preview/d20/fantasy/Fantasy_Character_Sheet.html
===================================================================
--- Trunk/pcgen/preview/d20/fantasy/Fantasy_Character_Sheet.html	2012-02-27 16:16:56 UTC (rev 16337)
+++ Trunk/pcgen/preview/d20/fantasy/Fantasy_Character_Sheet.html	2012-02-27 20:00:45 UTC (rev 16338)
@@ -57,7 +57,11 @@
 }
 .attackTables {
 	font-family: Arial;
+|IIF(WEAPON.NAME>10)|
+	font-size: 8px;
+|ELSE|
 	font-size: 14px;
+|ENDIF|
 	font-weight: bold;
 }
 .attackIterations {

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