updated edescriptor thingis

ch.psi.fda.core/src/main/java/ch/psi/fda/DescriptorProvider.java

@@ -0,0 +1,15 @@
+package ch.psi.fda;
+
+import java.io.File;
+
+import ch.psi.fda.edescriptor.EDescriptor;
+import ch.psi.fda.vdescriptor.VDescriptor;
+
+public interface DescriptorProvider {
+
+	public void load(File ... files );
+	
+	public EDescriptor getEDescriptor();
+	public VDescriptor getVDescriptor();
+	
+}

ch.psi.fda.core/src/main/java/ch/psi/fda/EContainerFactory.java

@@ -1,5 +1,7 @@
 package ch.psi.fda;
 
+import ch.psi.fda.edescriptor.EDescriptor;
+
 import com.google.common.eventbus.EventBus;
 
 public interface EContainerFactory {

ch.psi.fda.core/src/main/java/ch/psi/fda/EDescriptorProvider.java

@@ -1,9 +0,0 @@
-package ch.psi.fda;
-
-import java.io.File;
-
-public interface EDescriptorProvider {
-
-	public EDescriptor loadDescriptor(File ... files );
-	
-}

ch.psi.fda.core/src/main/java/ch/psi/fda/edescriptor/EDescriptor.java

@@ -1,4 +1,4 @@
-package ch.psi.fda;
+package ch.psi.fda.edescriptor;
 
 /**
  * Execution container descriptor

ch.psi.fda.core/src/test/java/ch/psi/fda/vdescriptor/VDescriptorTest.java

@@ -1,7 +1,5 @@
 package ch.psi.fda.vdescriptor;
 
-import static org.junit.Assert.*;
-
 import java.io.File;
 import java.util.logging.Logger;