removed stop function from econtainer

This commit is contained in:
2014-04-29 11:08:11 +02:00
parent a6c8edd6d2
commit 6b57c8a9ba
3 changed files with 11 additions and 9 deletions
+6
View File
@@ -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>
@@ -38,11 +38,6 @@ public class XScanContainer implements EContainer {
acquisition.abort();
}
@Override
public void stop() {
acquisition.abort();
}
@Override
public void destroy() {
acquisition.destroy();
@@ -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);