diff --git a/src/org/labkey/targetedms/SkylineBinaryDataHandler.java b/src/org/labkey/targetedms/SkylineBinaryDataHandler.java index dd4f590cd..e75d35792 100644 --- a/src/org/labkey/targetedms/SkylineBinaryDataHandler.java +++ b/src/org/labkey/targetedms/SkylineBinaryDataHandler.java @@ -16,6 +16,7 @@ package org.labkey.targetedms; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; import org.labkey.api.data.Container; import org.labkey.api.exp.ExperimentException; import org.labkey.api.exp.Handler; @@ -30,8 +31,8 @@ import org.labkey.api.util.FileUtil; import org.labkey.api.view.ActionURL; import org.labkey.api.view.ViewBackgroundInfo; +import org.labkey.vfs.FileLike; -import java.io.File; import java.nio.file.Path; /** @@ -49,7 +50,7 @@ public DataType getDataType() } @Override - public void importFile(ExpData data, File dataFile, ViewBackgroundInfo info, Logger log, XarContext context) throws ExperimentException + public void importFile(@NotNull ExpData data, @NotNull FileLike dataFile, @NotNull ViewBackgroundInfo info, @NotNull Logger log, @NotNull XarContext context) throws ExperimentException { } diff --git a/src/org/labkey/targetedms/TargetedMSDataHandler.java b/src/org/labkey/targetedms/TargetedMSDataHandler.java index 388730f43..2a26138b6 100644 --- a/src/org/labkey/targetedms/TargetedMSDataHandler.java +++ b/src/org/labkey/targetedms/TargetedMSDataHandler.java @@ -42,6 +42,7 @@ import org.labkey.api.view.ViewBackgroundInfo; import org.labkey.api.writer.ZipUtil; import org.labkey.targetedms.parser.skyaudit.AuditLogException; +import org.labkey.vfs.FileLike; import javax.xml.stream.XMLStreamException; import java.io.File; @@ -71,12 +72,7 @@ public DataType getDataType() } @Override - public void importFile(@NotNull ExpData data, File dataFile, @NotNull ViewBackgroundInfo info, @NotNull Logger log, @NotNull XarContext context) throws ExperimentException - { - importFile(data, dataFile != null ? dataFile.toPath() : null, info, log, context); - } - @Override - public void importFile(ExpData data, Path dataFile, ViewBackgroundInfo info, @NotNull Logger log, @NotNull XarContext context) throws ExperimentException + public void importFile(@NotNull ExpData data, @NotNull FileLike dataFile, @NotNull ViewBackgroundInfo info, @NotNull Logger log, @NotNull XarContext context) throws ExperimentException { String description = data.getFile().getName(); SkylineDocImporter importer = new SkylineDocImporter(info.getUser(), context.getContainer(), description,