From 6b57c8a9badf8947db3eb0510ada643457de6602 Mon Sep 17 00:00:00 2001
From: Simon Ebner <simon.ebner@psi.ch>
Date: Tue, 29 Apr 2014 11:08:11 +0200
Subject: [PATCH] removed stop function from econtainer

---
 ch.psi.fda.xscan/pom.xml                                 | 6 ++++++
 .../src/main/java/ch/psi/fda/aq/XScanContainer.java      | 5 -----
 .../src/main/java/ch/psi/fda/aq/XScanFactory.java        | 9 +++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ch.psi.fda.xscan/pom.xml b/ch.psi.fda.xscan/pom.xml
index 6417a66..7218056 100644
--- a/ch.psi.fda.xscan/pom.xml
+++ b/ch.psi.fda.xscan/pom.xml
@@ -14,6 +14,12 @@
 			<version>1.5.0</version>
 		</dependency>
 
+		<dependency>
+			<groupId>javax.inject</groupId>
+			<artifactId>javax.inject</artifactId>
+			<version>1</version>
+		</dependency>
+
 		<dependency>
 			<groupId>ch.psi</groupId>
 			<artifactId>ch.psi.fda.core</artifactId>
diff --git a/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanContainer.java b/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanContainer.java
index a36bbd6..44ac42f 100644
--- a/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanContainer.java
+++ b/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanContainer.java
@@ -38,11 +38,6 @@ public class XScanContainer implements EContainer {
 		acquisition.abort();
 	}
 
-	@Override
-	public void stop() {
-		acquisition.abort();
-	}
-
 	@Override
 	public void destroy() {
 		acquisition.destroy();
diff --git a/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanFactory.java b/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanFactory.java
index d50e1a3..09fd282 100644
--- a/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanFactory.java
+++ b/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanFactory.java
@@ -1,17 +1,18 @@
 package ch.psi.fda.aq;
 
+import javax.inject.Inject;
+
 import com.google.common.eventbus.EventBus;
 
 import ch.psi.fda.EContainer;
 import ch.psi.fda.EContainerFactory;
 import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.jcae.ChannelService;
-import ch.psi.jcae.impl.DefaultChannelService;
 
 public class XScanFactory implements EContainerFactory {
 
-	// TODO need to be injected
-	private ChannelService cservice = new DefaultChannelService();
+	@Inject
+	private ChannelService cservice;
 	
 	private AcquisitionConfiguration config = new AcquisitionConfiguration();
 	
@@ -21,7 +22,7 @@ public class XScanFactory implements EContainerFactory {
 	}
 
 	@Override
-	public EContainer createContainer(EDescriptor descriptor, EventBus bus) {
+	public EContainer getEContainer(EDescriptor descriptor, EventBus bus) {
 		
 		if(! (descriptor instanceof XScanDescriptor)){
 			throw new IllegalArgumentException("Descriptor of type "+descriptor.getClass().getName()+" is not supported - descriptor need to be of type "+XScanDescriptor.class);