From 616b3fcf512e7fb0e168c01acbad6f67f1a75231 Mon Sep 17 00:00:00 2001 From: Kevin Krouse Date: Wed, 29 Apr 2020 16:50:37 -0700 Subject: [PATCH] Use SchemaKey in ExperimentRunType constructor --- src/org/labkey/targetedms/TargetedMSExperimentRunType.java | 2 +- src/org/labkey/targetedms/TargetedMSSchema.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/targetedms/TargetedMSExperimentRunType.java b/src/org/labkey/targetedms/TargetedMSExperimentRunType.java index 499e0a0e6..71a6b4847 100644 --- a/src/org/labkey/targetedms/TargetedMSExperimentRunType.java +++ b/src/org/labkey/targetedms/TargetedMSExperimentRunType.java @@ -32,7 +32,7 @@ public class TargetedMSExperimentRunType extends ExperimentRunType public TargetedMSExperimentRunType() { - super("Imported Targeted MS Results", TargetedMSSchema.SCHEMA_NAME, TargetedMSSchema.TABLE_TARGETED_MS_RUNS); + super("Imported Targeted MS Results", TargetedMSSchema.SCHEMA_KEY, TargetedMSSchema.TABLE_TARGETED_MS_RUNS); _protocolPrefixes = new String[] {TargetedMSModule.IMPORT_SKYDOC_PROTOCOL_OBJECT_PREFIX, TargetedMSModule.IMPORT_SKYZIP_PROTOCOL_OBJECT_PREFIX}; } diff --git a/src/org/labkey/targetedms/TargetedMSSchema.java b/src/org/labkey/targetedms/TargetedMSSchema.java index 483f8962d..6864c4e4b 100644 --- a/src/org/labkey/targetedms/TargetedMSSchema.java +++ b/src/org/labkey/targetedms/TargetedMSSchema.java @@ -55,6 +55,7 @@ import org.labkey.api.query.QuerySchema; import org.labkey.api.query.QuerySettings; import org.labkey.api.query.QueryView; +import org.labkey.api.query.SchemaKey; import org.labkey.api.query.UserIdQueryForeignKey; import org.labkey.api.query.UserSchema; import org.labkey.api.security.User; @@ -91,6 +92,7 @@ public class TargetedMSSchema extends UserSchema { public static final String SCHEMA_NAME = "targetedms"; + public static final SchemaKey SCHEMA_KEY = SchemaKey.fromParts("targetedms"); public static final String SCHEMA_DESCR = "Contains targeted mass spec data imported from Skyline documents"; // Tables @@ -221,7 +223,7 @@ public QuerySchema createSchema(DefaultSchema schema, Module module) public TargetedMSSchema(User user, Container container) { - super(SCHEMA_NAME, SCHEMA_DESCR, user, container, TargetedMSManager.getSchema()); + super(SCHEMA_KEY, SCHEMA_DESCR, user, container, TargetedMSManager.getSchema(), null); _expSchema = new ExpSchema(user, container); }