From 632e11dde2bcd36066eb34d1ebb5e11b3179c2d7 Mon Sep 17 00:00:00 2001
From: Simon Ebner <simon.ebner@psi.ch>
Date: Fri, 11 Apr 2014 15:44:32 +0200
Subject: [PATCH] updated edescriptor thingis

---
 .../main/java/ch/psi/fda/DescriptorProvider.java  | 15 +++++++++++++++
 .../main/java/ch/psi/fda/EContainerFactory.java   |  2 ++
 .../main/java/ch/psi/fda/EDescriptorProvider.java |  9 ---------
 .../ch/psi/fda/{ => edescriptor}/EDescriptor.java |  2 +-
 .../ch/psi/fda/vdescriptor/VDescriptorTest.java   |  2 --
 5 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 ch.psi.fda.core/src/main/java/ch/psi/fda/DescriptorProvider.java
 delete mode 100644 ch.psi.fda.core/src/main/java/ch/psi/fda/EDescriptorProvider.java
 rename ch.psi.fda.core/src/main/java/ch/psi/fda/{ => edescriptor}/EDescriptor.java (70%)

diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/DescriptorProvider.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/DescriptorProvider.java
new file mode 100644
index 0000000..af6d375
--- /dev/null
+++ b/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();
+	
+}
diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/EContainerFactory.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/EContainerFactory.java
index 07f4694..c97e7a1 100644
--- a/ch.psi.fda.core/src/main/java/ch/psi/fda/EContainerFactory.java
+++ b/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 {
diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/EDescriptorProvider.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/EDescriptorProvider.java
deleted file mode 100644
index 5df5569..0000000
--- a/ch.psi.fda.core/src/main/java/ch/psi/fda/EDescriptorProvider.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package ch.psi.fda;
-
-import java.io.File;
-
-public interface EDescriptorProvider {
-
-	public EDescriptor loadDescriptor(File ... files );
-	
-}
diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/EDescriptor.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/edescriptor/EDescriptor.java
similarity index 70%
rename from ch.psi.fda.core/src/main/java/ch/psi/fda/EDescriptor.java
rename to ch.psi.fda.core/src/main/java/ch/psi/fda/edescriptor/EDescriptor.java
index 4a6e04f..5109701 100644
--- a/ch.psi.fda.core/src/main/java/ch/psi/fda/EDescriptor.java
+++ b/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
diff --git a/ch.psi.fda.core/src/test/java/ch/psi/fda/vdescriptor/VDescriptorTest.java b/ch.psi.fda.core/src/test/java/ch/psi/fda/vdescriptor/VDescriptorTest.java
index 88e34a8..15b4d80 100644
--- a/ch.psi.fda.core/src/test/java/ch/psi/fda/vdescriptor/VDescriptorTest.java
+++ b/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;