Skip to content

Commit fc5a6f9

Browse files
committed
reset SequenceAnalysisCustomizer to 21.3 version
1 parent 09b4649 commit fc5a6f9

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisCustomizer.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.labkey.api.data.DisplayColumn;
1313
import org.labkey.api.data.DisplayColumnFactory;
1414
import org.labkey.api.data.JdbcType;
15-
import org.labkey.api.data.MutableColumnInfo;
1615
import org.labkey.api.data.RenderContext;
1716
import org.labkey.api.data.SQLFragment;
1817
import org.labkey.api.data.TableCustomizer;
@@ -100,21 +99,21 @@ private void customizeSharedCols(AbstractTableInfo ti)
10099
private enum COL_ENUM
101100
{
102101
refNtSequence(Integer.class, PageFlowUtil.set("sequenceid", "ref_nt_sequence")){
103-
public void customizeColumn(MutableColumnInfo col, AbstractTableInfo ti)
102+
public void customizeColumn(BaseColumnInfo col, AbstractTableInfo ti)
104103
{
105104
col.setLabel("Ref NT Sequence");
106105
addFk(ti.getUserSchema().getContainer(), ti.getUserSchema().getUser(), col, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_REF_NT_SEQUENCES, "rowid", "name");
107106
}
108107
},
109108
libraryId(Integer.class, PageFlowUtil.set("genomeId", "genome_id", "library_id")){
110-
public void customizeColumn(MutableColumnInfo col, AbstractTableInfo ti)
109+
public void customizeColumn(BaseColumnInfo col, AbstractTableInfo ti)
111110
{
112111
col.setLabel("Reference Genome");
113112
addFk(ti.getUserSchema().getContainer(), ti.getUserSchema().getUser(), col, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_REF_LIBRARIES, "rowid", "rowid");
114113
}
115114
},
116115
runid(Integer.class, PageFlowUtil.set("run_id")){
117-
public void customizeColumn(MutableColumnInfo col, AbstractTableInfo ti)
116+
public void customizeColumn(BaseColumnInfo col, AbstractTableInfo ti)
118117
{
119118
col.setLabel("Run");
120119
col.setShownInInsertView(false);
@@ -125,7 +124,7 @@ public void customizeColumn(MutableColumnInfo col, AbstractTableInfo ti)
125124
}
126125
},
127126
jobid(Integer.class, PageFlowUtil.set("job_id")){
128-
public void customizeColumn(MutableColumnInfo col, AbstractTableInfo ti)
127+
public void customizeColumn(BaseColumnInfo col, AbstractTableInfo ti)
129128
{
130129
col.setLabel("Job Id");
131130
col.setShownInInsertView(false);
@@ -135,21 +134,21 @@ public void customizeColumn(MutableColumnInfo col, AbstractTableInfo ti)
135134
}
136135
},
137136
dataId(Integer.class, PageFlowUtil.set("data_id")){
138-
public void customizeColumn(MutableColumnInfo col, AbstractTableInfo ti)
137+
public void customizeColumn(BaseColumnInfo col, AbstractTableInfo ti)
139138
{
140139
col.setLabel("File Id");
141140
addFk(ti.getUserSchema().getContainer(), ti.getUserSchema().getUser(), col, "exp", "data", "rowid", null);
142141
}
143142
},
144143
readset(Integer.class, PageFlowUtil.set("readsetId", "readset_id")){
145-
public void customizeColumn(MutableColumnInfo col, AbstractTableInfo ti)
144+
public void customizeColumn(BaseColumnInfo col, AbstractTableInfo ti)
146145
{
147146
col.setLabel("Readset");
148147
addFk(ti.getUserSchema().getContainer(), ti.getUserSchema().getUser(), col, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_READSETS, "rowid", null);
149148
}
150149
},
151150
analysisId(Integer.class, PageFlowUtil.set("analysis_id")){
152-
public void customizeColumn(MutableColumnInfo col, AbstractTableInfo ti)
151+
public void customizeColumn(BaseColumnInfo col, AbstractTableInfo ti)
153152
{
154153
col.setLabel("Analysis Id");
155154
addFk(ti.getUserSchema().getContainer(), ti.getUserSchema().getUser(), col, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_ANALYSES, "rowid", null);
@@ -162,7 +161,7 @@ public void customizeColumn(MutableColumnInfo col, AbstractTableInfo ti)
162161
COL_ENUM(Class dataType, @Nullable Collection<String> alternateNames){
163162
this.dataType = dataType;
164163
if (alternateNames != null)
165-
this.alternateNames.addAll(alternateNames);
164+
this.alternateNames.addAll(alternateNames);
166165
}
167166

168167
public Collection<String> getAlternateNames()
@@ -177,19 +176,19 @@ private static void setNonEditable(BaseColumnInfo col)
177176
col.setShownInUpdateView(false);
178177
}
179178

180-
private static void addFk(Container c, User u, MutableColumnInfo col, String schema, String query, String pkCol, @Nullable String displayCol)
179+
private static void addFk(Container c, User u, BaseColumnInfo col, String schema, String query, String pkCol, @Nullable String displayCol)
181180
{
182181
if (col.getFk() == null)
183182
{
184183
col.setFk(QueryForeignKey.from(DefaultSchema.get(u,c),null)
185-
.schema(schema, c)
186-
.to(query, pkCol, displayCol));
184+
.schema(schema, c)
185+
.to(query, pkCol, displayCol));
187186
}
188187
}
189188

190-
abstract public void customizeColumn(MutableColumnInfo col, AbstractTableInfo ti);
189+
abstract public void customizeColumn(BaseColumnInfo col, AbstractTableInfo ti);
191190

192-
public static void processColumn(MutableColumnInfo col, AbstractTableInfo ti)
191+
public static void processColumn(BaseColumnInfo col, AbstractTableInfo ti)
193192
{
194193
for (COL_ENUM colEnum : COL_ENUM.values())
195194
{
@@ -270,4 +269,4 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
270269
};
271270
}
272271
}
273-
}
272+
}

0 commit comments

Comments
 (0)