From fc732b8de7e7b895e2b190c36a98103e2aee2427 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 --- ms2/src/org/labkey/ms2/MS2SearchExperimentRunType.java | 2 +- ms2/src/org/labkey/ms2/query/MS2Schema.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ms2/src/org/labkey/ms2/MS2SearchExperimentRunType.java b/ms2/src/org/labkey/ms2/MS2SearchExperimentRunType.java index f660fd080a..bc780f58b0 100644 --- a/ms2/src/org/labkey/ms2/MS2SearchExperimentRunType.java +++ b/ms2/src/org/labkey/ms2/MS2SearchExperimentRunType.java @@ -40,7 +40,7 @@ public class MS2SearchExperimentRunType extends ExperimentRunType public MS2SearchExperimentRunType(String name, String tableName, Priority priority, String... protocolPrefixes) { - super(name, MS2Schema.SCHEMA_NAME, tableName); + super(name, MS2Schema.SCHEMA_KEY, tableName); _priority = priority; _protocolPrefixes = protocolPrefixes; } diff --git a/ms2/src/org/labkey/ms2/query/MS2Schema.java b/ms2/src/org/labkey/ms2/query/MS2Schema.java index 48d50c6044..9eff03d7ec 100644 --- a/ms2/src/org/labkey/ms2/query/MS2Schema.java +++ b/ms2/src/org/labkey/ms2/query/MS2Schema.java @@ -37,6 +37,7 @@ import org.labkey.api.query.QueryForeignKey; import org.labkey.api.query.QuerySchema; import org.labkey.api.query.QueryService; +import org.labkey.api.query.SchemaKey; import org.labkey.api.query.UserSchema; import org.labkey.api.security.User; import org.labkey.api.settings.AppProps; @@ -76,6 +77,7 @@ public class MS2Schema extends UserSchema { public static final String SCHEMA_NAME = "ms2"; + public static final SchemaKey SCHEMA_KEY = SchemaKey.fromParts("ms2"); public static final String SCHEMA_DESCR = "Contains data about MS2 runs, including detected peptides and proteins"; private static final String PROTOCOL_PATTERN_PREFIX = "urn:lsid:%:Protocol.%:"; @@ -136,7 +138,7 @@ public QuerySchema createSchema(DefaultSchema schema, Module module) public MS2Schema(User user, Container container) { - super(SCHEMA_NAME, SCHEMA_DESCR, user, container, ExperimentService.get().getSchema()); + super(SCHEMA_KEY, SCHEMA_DESCR, user, container, ExperimentService.get().getSchema(), null); } public enum TableType