ExpMaterialTableImpl: constant name

LabKey · Mar 20, 2024 · 8fb7fa7 · 8fb7fa7
1 parent 15cb838
commit 8fb7fa7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/elisa/src/org/labkey/elisa/query/ElisaResultsTable.java b/elisa/src/org/labkey/elisa/query/ElisaResultsTable.java
@@ -70,7 +70,7 @@ public ElisaResultsTable(final AssayProtocolSchema schema, ContainerFilter cf, b
                 @Override
                 public TableInfo getLookupTableInfo()
                 {
-                    ExpMaterialTable materials = ExperimentService.get().createMaterialTable(ExpSchema.TableType.Materials.toString(), schema, getLookupContainerFilter(), sampleType);
+                    ExpMaterialTable materials = ExperimentService.get().createMaterialTable(schema, getLookupContainerFilter(), sampleType);
                     var propertyCol = materials.addColumn(ExpMaterialTable.Column.Property);
                     if (propertyCol.getFk() instanceof PropertyForeignKey)
                     {

diff --git a/elispotassay/src/org/labkey/elispot/query/PlateBasedAssayRunDataTable.java b/elispotassay/src/org/labkey/elispot/query/PlateBasedAssayRunDataTable.java
@@ -98,7 +98,7 @@ public TableInfo getLookupTableInfo()
             @Override
             public TableInfo getLookupTableInfo()
             {
-                ExpMaterialTable materials = ExperimentService.get().createMaterialTable(ExpSchema.TableType.Materials.toString(), schema, getLookupContainerFilter(), sampleType);
+                ExpMaterialTable materials = ExperimentService.get().createMaterialTable(schema, getLookupContainerFilter(), sampleType);
                 var propertyCol = materials.addColumn(ExpMaterialTable.Column.Property);
                 if (hasMaterialSpecimenPropertyColumnDecorator && propertyCol.getFk() instanceof PropertyForeignKey)
                 {

diff --git a/nab/src/org/labkey/nab/query/NabBaseTable.java b/nab/src/org/labkey/nab/query/NabBaseTable.java
@@ -26,8 +26,6 @@
 import org.labkey.api.exp.api.ExperimentService;
 import org.labkey.api.exp.api.SampleTypeService;
 import org.labkey.api.exp.query.ExpMaterialTable;
-import org.labkey.api.exp.query.ExpRunTable;
-import org.labkey.api.exp.query.ExpSchema;
 import org.labkey.api.query.ExprColumn;
 import org.labkey.api.query.FilteredTable;
 import org.labkey.api.query.LookupForeignKey;
@@ -40,11 +38,6 @@
 import org.labkey.api.util.StringExpression;
 import org.labkey.nab.SinglePlateNabDataHandler;
 
-/**
- * User: davebradlee
- * Date: 2/20/13
- * Time: 6:36 PM
- */
 public abstract class NabBaseTable extends FilteredTable<AssayProtocolSchema>
 {
     protected final NabProtocolSchema _schema;
@@ -72,7 +65,7 @@ protected void addSpecimenColumn()
             @Override
             public TableInfo getLookupTableInfo()
             {
-                ExpMaterialTable materials = ExperimentService.get().createMaterialTable(ExpSchema.TableType.Materials.toString(), _schema, getLookupContainerFilter(), sampleType);
+                ExpMaterialTable materials = ExperimentService.get().createMaterialTable(_schema, getLookupContainerFilter(), sampleType);
                 var propertyCol = materials.addColumn(ExpMaterialTable.Column.Property);
                 if (propertyCol.getFk() instanceof PropertyForeignKey)
                 {

diff --git a/nab/src/org/labkey/nab/query/NabRunDataTable.java b/nab/src/org/labkey/nab/query/NabRunDataTable.java
@@ -38,7 +38,6 @@
 import org.labkey.api.exp.property.Domain;
 import org.labkey.api.exp.property.DomainProperty;
 import org.labkey.api.exp.query.ExpMaterialTable;
-import org.labkey.api.exp.query.ExpSchema;
 import org.labkey.api.query.AliasedColumn;
 import org.labkey.api.query.ExprColumn;
 import org.labkey.api.query.FieldKey;
@@ -64,11 +63,6 @@
 
 import static org.labkey.api.assay.dilution.DilutionDataHandler.FIT_PARAMETERS_PROPERTY_NAME;
 
-/**
- * User: brittp
- * Date: Jul 6, 2007
- * Time: 5:35:15 PM
- */
 public class NabRunDataTable extends NabBaseTable
 {
     protected final NAbSpecimenTable _nabSpecimenTable;
@@ -270,7 +264,7 @@ protected BaseColumnInfo constructColumnInfo(ColumnInfo parent, FieldKey name, P
                         @Override
                         public TableInfo getLookupTableInfo()
                         {
-                            ExpMaterialTable materials = ExperimentService.get().createMaterialTable(ExpSchema.TableType.Materials.toString(), schema, getLookupContainerFilter(), sampleType);
+                            ExpMaterialTable materials = ExperimentService.get().createMaterialTable(schema, getLookupContainerFilter(), sampleType);
                             var propertyCol = materials.addColumn(ExpMaterialTable.Column.Property);
                             if (propertyCol.getFk() instanceof PropertyForeignKey)
                             {