[pcgen-commit-svn] SF.net SVN: pcgen:[13809] branches/5.16.x/pcgen/code/src

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

Revision: 13809
          http://pcgen.svn.sourceforge.net/pcgen/?rev=13809&view=rev
Author:   jdempsey
Date:     2010-11-08 21:12:08 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
Fix bug: Batch processing of PCs failing
 - Make character tests work again
Issue#: CODE-376

Modified Paths:
--------------
    branches/5.16.x/pcgen/code/src/java/pcgen/gui/pcGenGUI.java
    branches/5.16.x/pcgen/code/src/test/pcgen/gui/pcGenGUITestCase.java

Modified: branches/5.16.x/pcgen/code/src/java/pcgen/gui/pcGenGUI.java
===================================================================
--- branches/5.16.x/pcgen/code/src/java/pcgen/gui/pcGenGUI.java	2010-11-08 11:59:10 UTC (rev 13808)
+++ branches/5.16.x/pcgen/code/src/java/pcgen/gui/pcGenGUI.java	2010-11-08 21:12:08 UTC (rev 13809)
@@ -154,7 +154,7 @@
 		if (!Globals.getUseGUI())
 		{
 			runNonGui();
-			System.exit(0);
+			return;
 		}
 
 		// If we get here then we are running with a GUI
@@ -372,6 +372,7 @@
 		templateName = System.getProperty("pcgen.templatefile");
 		inFileName = System.getProperty("pcgen.inputfile");
 		outFileName = System.getProperty("pcgen.outputfile");
+		String dontExitOnComplete = System.getProperty("pcgen.dont.exit");
 
 		startupArgs = args;
 
@@ -494,6 +495,11 @@
 		SettingsHandler.initGameModes();
 
 		new pcGenGUI(d);
+		
+		if (!Globals.getUseGUI() && !"Y".equals(dontExitOnComplete))
+		{
+			System.exit(0);
+		}
 	}
 
 	public static void showHpFrame(PlayerCharacter aPC)

Modified: branches/5.16.x/pcgen/code/src/test/pcgen/gui/pcGenGUITestCase.java
===================================================================
--- branches/5.16.x/pcgen/code/src/test/pcgen/gui/pcGenGUITestCase.java	2010-11-08 11:59:10 UTC (rev 13808)
+++ branches/5.16.x/pcgen/code/src/test/pcgen/gui/pcGenGUITestCase.java	2010-11-08 21:12:08 UTC (rev 13809)
@@ -139,6 +139,7 @@
 			System.setProperty("pcgen.outputfile", "code/testsuite/output/"
 				+ character + ".xml");
 			System.setProperty("pcgen.options", "options.ini.junit");
+			System.setProperty("pcgen.dont.exit", "Y");
 
 			// Fire off PCGen, which will produce an XML file 
 			pcGenGUI.main(Globals.EMPTY_STRING_ARRAY);


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