stuff

ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java

@@ -206,7 +206,7 @@ public class AcquisitionMain {
         for (EContainerFactory factory : factories) {
         	if(factory.supportsEDescriptor(edescriptor)){
         		injector.injectMembers(factory);
-        		ec = factory.createContainer(edescriptor, b);
+        		ec = factory.getEContainer(edescriptor, b);
         		break;
         	}
         }

ch.psi.fda/src/main/java/ch/psi/fda/rest/AcquisitionEngine.java

@@ -31,7 +31,6 @@ import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
-import ch.psi.fda.AcquisitionConfiguration;
 import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.jcae.ChannelService;
 
@@ -42,7 +41,6 @@ public class AcquisitionEngine {
 	
 	private static final Logger logger = Logger.getLogger(AcquisitionEngine.class.getName());
 	
-	private final AcquisitionConfiguration config;
 	private final ChannelService cService;
 	private final ZMQDataService zmqService;
 	
@@ -50,10 +48,9 @@ public class AcquisitionEngine {
 	private final Map<String, Future<?>> erequests = new HashMap<>();
 	
 	@Inject
-	public AcquisitionEngine(ChannelService cService, ZMQDataService zmqService, AcquisitionConfiguration config) {
+	public AcquisitionEngine(ChannelService cService, ZMQDataService zmqService) {
 		this.zmqService = zmqService;
 		this.cService = cService;
-		this.config = config;
 	}
 	
 	/**
@@ -70,7 +67,7 @@ public class AcquisitionEngine {
 			throw new IllegalArgumentException("A request with tracking ID "+trackingId+" is already submitted");
 		}
 		
-		AcquisitionJob job = new AcquisitionJob(cService, zmqService, config, trackingId, edescriptor);
+		AcquisitionJob job = new AcquisitionJob(cService, zmqService, trackingId, edescriptor);
 		Future<?> future = eservice.submit(job);
 		erequests.put(trackingId, future);
 	}

ch.psi.fda/src/main/java/ch/psi/fda/rest/AcquisitionJob.java

@@ -21,7 +21,6 @@ package ch.psi.fda.rest;
 import java.util.ServiceLoader;
 import java.util.logging.Logger;
 
-import ch.psi.fda.AcquisitionConfiguration;
 import ch.psi.fda.EContainer;
 import ch.psi.fda.EContainerFactory;
 import ch.psi.fda.InjectionModule;
@@ -42,11 +41,9 @@ public class AcquisitionJob implements Runnable {
 	private final String trackingId;
 	private final EDescriptor edescriptor;
 
-	// TODO remove AcquisitionConfiguration
-	public AcquisitionJob(ChannelService cService, ZMQDataService zmqService, AcquisitionConfiguration config, String trackingId, EDescriptor edescriptor) {
+	public AcquisitionJob(ChannelService cService, ZMQDataService zmqService, String trackingId, EDescriptor edescriptor) {
 		this.zmqService = zmqService;
 		this.cService = cService;
-
 		this.trackingId = trackingId;
 		this.edescriptor = edescriptor;
 	}
@@ -67,12 +64,12 @@ public class AcquisitionJob implements Runnable {
 //			ebus.post(edescriptor.getVisualization());
 			
 			Injector injector = Guice.createInjector(new InjectionModule(cService));
-			
+
 			ServiceLoader<EContainerFactory> factories = ServiceLoader.load(EContainerFactory.class);
 	        for (EContainerFactory factory : factories) {
 	        	if(factory.supportsEDescriptor(edescriptor)){
 	        		injector.injectMembers(factory);
-	        		econtainer = factory.createContainer(edescriptor, ebus);
+	        		econtainer = factory.getEContainer(edescriptor, ebus);
 	        		break;
 	        	}
 	        }