From 925e0653b2acfbf8f84b4a3bb5188f0b5d840169 Mon Sep 17 00:00:00 2001
From: Simon Ebner <simon.ebner@psi.ch>
Date: Mon, 11 Mar 2013 13:36:41 +0100
Subject: [PATCH] fda_scan now returns an exit value other than 0 when aborted
 via CTRL+C FDA-67

---
 ch.psi.fda/.classpath                                      | 6 +-----
 ch.psi.fda/pom.xml                                         | 4 ++--
 .../src/main/java/ch/psi/fda/aq/AcquisitionMain.java       | 7 +++++++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ch.psi.fda/.classpath b/ch.psi.fda/.classpath
index b22ded1..3865a70 100644
--- a/ch.psi.fda/.classpath
+++ b/ch.psi.fda/.classpath
@@ -23,15 +23,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/ch.psi.fda/pom.xml b/ch.psi.fda/pom.xml
index 54be090..8d5472f 100644
--- a/ch.psi.fda/pom.xml
+++ b/ch.psi.fda/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.psi</groupId>
 	<artifactId>fda</artifactId>
-	<version>1.1.35-SNAPSHOT</version>
+	<version>1.1.36-SNAPSHOT</version>
 
 	<dependencies>
 		<dependency>
 			<groupId>ch.psi</groupId>
 			<artifactId>jcae</artifactId>
-			<version>1.1.0</version>
+			<version>1.0.30</version>
 		</dependency>
 		<!-- Plotting library -->
 		<dependency>
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionMain.java
index 534e455..67a52ac 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionMain.java
@@ -70,9 +70,12 @@ public class AcquisitionMain {
 	// Get Logger
 	private static Logger logger = Logger.getLogger(AcquisitionMain.class.getName());
 	
+	private static boolean abortedViaSignal = false;
+	
 	/**
 	 *  Main Program
 	 * Returns -1 if wrong number of arguments are passed
+	 * Returns 3 if aborted via Ctrl+C
 	 * 
 	 * @param args	Arguments of the program
 	 */
@@ -385,6 +388,7 @@ public class AcquisitionMain {
 					System.exit(2);
 				}
 
+				abortedViaSignal = true;
 				// Abort acquisition engine
 				if(acquisition.isActive()){
 					// Abort acquisition
@@ -425,6 +429,9 @@ public class AcquisitionMain {
 		}
 		// GUI GUI GUI GUI GUI GUI GUI
 		
+		if(abortedViaSignal){
+			System.exit(3);
+		}
 	}