structure

qbicsoftware · Oct 7, 2024 · c41c6aa · c41c6aa
1 parent 4d28df9
commit c41c6aa
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/...n/java/life/qbic/model/SeekStructure.java → ...va/life/qbic/model/isa/SeekStructure.java b/...n/java/life/qbic/model/SeekStructure.java → ...va/life/qbic/model/isa/SeekStructure.java
@@ -3,18 +3,22 @@
 import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.DataSetFile;
 import java.util.List;
 import java.util.Map;
+import life.qbic.model.isa.GenericSeekAsset;
 import life.qbic.model.isa.ISAAssay;
-import life.qbic.model.isa.ISADataFile;
 import life.qbic.model.isa.ISASample;
 
 public class SeekStructure {
 
   private ISAAssay assay;
   private List<ISASample> samples;
-  private List<ISADataFile> dataFiles;
-  private Map<ISADataFile, DataSetFile> isaToOpenBISFile;
-  private Map<ISADataFile, String> isaFileToAssetType;
-  //ISASample isaSample = new ISASample(map, sampleTypeID, Arrays.asList(projectID));
+  private Map<GenericSeekAsset, DataSetFile> isaToOpenBISFile;
+
+  public SeekStructure(ISAAssay assay, List<ISASample> samples,
+      Map<GenericSeekAsset, DataSetFile> isaToOpenBISFile) {
+    this.assay = assay;
+    this.samples = samples;
+    this.isaToOpenBISFile = isaToOpenBISFile;
+  }
 
   public ISAAssay getAssay() {
     return assay;
@@ -24,11 +28,8 @@ public List<ISASample> getSamples() {
     return samples;
   }
 
-  public Map<ISADataFile, DataSetFile> getIsaToOpenBISFiles() {
+  public Map<GenericSeekAsset, DataSetFile> getISAFileToDatasetFiles() {
     return isaToOpenBISFile;
   }
 
-  public String getAssetType(ISADataFile dataFile) {
-    return isaFileToAssetType.get(dataFile);
-  }
 }