diff --git a/src/main/java/life/qbic/model/SeekStructure.java b/src/main/java/life/qbic/model/isa/SeekStructure.java similarity index 51% rename from src/main/java/life/qbic/model/SeekStructure.java rename to src/main/java/life/qbic/model/isa/SeekStructure.java index 5d7cc46..323876c 100644 --- a/src/main/java/life/qbic/model/SeekStructure.java +++ b/src/main/java/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 samples; - private List dataFiles; - private Map isaToOpenBISFile; - private Map isaFileToAssetType; - //ISASample isaSample = new ISASample(map, sampleTypeID, Arrays.asList(projectID)); + private Map isaToOpenBISFile; + + public SeekStructure(ISAAssay assay, List samples, + Map isaToOpenBISFile) { + this.assay = assay; + this.samples = samples; + this.isaToOpenBISFile = isaToOpenBISFile; + } public ISAAssay getAssay() { return assay; @@ -24,11 +28,8 @@ public List getSamples() { return samples; } - public Map getIsaToOpenBISFiles() { + public Map getISAFileToDatasetFiles() { return isaToOpenBISFile; } - public String getAssetType(ISADataFile dataFile) { - return isaFileToAssetType.get(dataFile); - } }