Skip to content

ExperimentDataHandler File->FileLike #1123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 2 commits into from
Oct 16, 2025
Merged

ExperimentDataHandler File->FileLike #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2140a84
ExperimentDataHandler File->FileLike
labkey-jeckels Oct 11, 2025
0a67fa4
Merge branch 'develop' into fb_adoptFileLike
labkey-jeckels Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/org/labkey/targetedms/SkylineBinaryDataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

/**
Expand All @@ -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
{
}

Expand Down
8 changes: 2 additions & 6 deletions src/org/labkey/targetedms/TargetedMSDataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down