updated edescriptor thingi

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

@@ -58,6 +58,7 @@ import sun.misc.Signal;
 import sun.misc.SignalHandler;
 import ch.psi.fda.aq.VisualizationMapper;
 import ch.psi.fda.aq.XScanDescriptor;
+import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.fda.gui.ProgressPanel;
 import ch.psi.fda.gui.ScrollableFlowPanel;
 import ch.psi.fda.install.ApplicationConfigurator;
@@ -188,10 +189,11 @@ public class AcquisitionMain {
 		
 
 		EDescriptor edescriptor = null;
-		ServiceLoader<EDescriptorProvider> providers = ServiceLoader.load(EDescriptorProvider.class);
-        for (EDescriptorProvider provider : providers) {
+		ServiceLoader<DescriptorProvider> providers = ServiceLoader.load(DescriptorProvider.class);
+        for (DescriptorProvider provider : providers) {
         	try{
-        		edescriptor = provider.loadDescriptor(file);
+        		provider.load(file);
+        		edescriptor = provider.getEDescriptor();
         		break;
         	}
         	catch(Exception e){

ch.psi.fda/src/main/java/ch/psi/fda/aq/XScanDescriptor.java

@@ -1,6 +1,6 @@
 package ch.psi.fda.aq;
 
-import ch.psi.fda.EDescriptor;
+import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.fda.model.v1.Configuration;
 
 public class XScanDescriptor implements EDescriptor {

ch.psi.fda/src/main/java/ch/psi/fda/aq/XScanDescriptorProvider.java

@@ -2,16 +2,19 @@ package ch.psi.fda.aq;
 
 import java.io.File;
 
-import ch.psi.fda.EDescriptor;
-import ch.psi.fda.EDescriptorProvider;
+import ch.psi.fda.DescriptorProvider;
+import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.fda.model.ModelManager;
 import ch.psi.fda.model.v1.Configuration;
 import ch.psi.fda.model.v1.Data;
+import ch.psi.fda.vdescriptor.VDescriptor;
 
-public class XScanDescriptorProvider implements EDescriptorProvider {
+public class XScanDescriptorProvider implements DescriptorProvider {
 
+	private EDescriptor edescriptor;
+	
 	@Override
-	public EDescriptor loadDescriptor(File... files) {
+	public void load(File... files) {
 		
 		
 		if(files.length<1 || files[0]==null){
@@ -58,7 +61,17 @@ public class XScanDescriptorProvider implements EDescriptorProvider {
 			c.setNumberOfExecution(1);
 		}
 		
-		return new XScanDescriptor(c);
+		edescriptor = new XScanDescriptor(c);
+	}
+
+	@Override
+	public EDescriptor getEDescriptor() {
+		return edescriptor;
+	}
+
+	@Override
+	public VDescriptor getVDescriptor() {
+		return null;
 	}
 
 }

ch.psi.fda/src/main/java/ch/psi/fda/aq/XScanFactory.java

@@ -4,7 +4,7 @@ import com.google.common.eventbus.EventBus;
 
 import ch.psi.fda.EContainer;
 import ch.psi.fda.EContainerFactory;
-import ch.psi.fda.EDescriptor;
+import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.jcae.ChannelService;
 import ch.psi.jcae.impl.DefaultChannelService;