[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.