Skip to content

Commit cc656e6

Browse files
labkey-adamlabkey-adam
committed
Migrate renderGridCellContents() and renderDetailsCellContents()
1 parent bd79679 commit cc656e6

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

‎SequenceAnalysis/src/org/labkey/sequenceanalysis/query/DownloadSequenceDisplayColumnFactory.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.labkey.api.util.PageFlowUtil;
1111
import org.labkey.api.view.HttpView;
1212
import org.labkey.api.view.template.ClientDependency;
13+
import org.labkey.api.writer.HtmlWriter;
1314

1415
import java.io.IOException;
1516
import java.io.Writer;
@@ -38,10 +39,10 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
3839
private boolean _handlerRegistered = false;
3940

4041
@Override
41-
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
42+
public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
4243
{
4344
Object val = ctx.get(FieldKey.fromString(getBoundColumn().getFieldKey().getParent(), "rowId"));
44-
out.write(PageFlowUtil.link("Download Sequence").attributes(Map.of(
45+
oldWriter.write(PageFlowUtil.link("Download Sequence").attributes(Map.of(
4546
"data-rowid", val.toString()
4647
)).addClass("sdc-row").toString());
4748

‎SequenceAnalysis/src/org/labkey/sequenceanalysis/query/GenbankDisplayColumnFactory.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.labkey.api.data.DisplayColumnFactory;
77
import org.labkey.api.data.RenderContext;
88
import org.labkey.api.util.PageFlowUtil;
9+
import org.labkey.api.writer.HtmlWriter;
910

1011
import java.io.IOException;
1112
import java.io.Writer;
@@ -26,7 +27,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
2627
DataColumn ret = new DataColumn(colInfo)
2728
{
2829
@Override
29-
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
30+
public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
3031
{
3132
Object val = ctx.get(getBoundColumn().getFieldKey());
3233
if (val != null)
@@ -35,7 +36,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
3536
String delim = "";
3637
for (String v : vals)
3738
{
38-
out.write(delim + "<a href=" + getFormattedURL(v) + ">" + PageFlowUtil.encode(v) + "</a>");
39+
oldWriter.write(delim + "<a href=" + getFormattedURL(v) + ">" + PageFlowUtil.encode(v) + "</a>");
3940
delim = "; ";
4041
}
4142
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.labkey.api.view.ActionURL;
3131
import org.labkey.api.view.HttpView;
3232
import org.labkey.api.view.template.ClientDependency;
33+
import org.labkey.api.writer.HtmlWriter;
3334
import org.labkey.sequenceanalysis.SequenceAnalysisSchema;
3435

3536
import java.io.IOException;
@@ -258,7 +259,7 @@ private FieldKey getBoundKey(String colName)
258259
}
259260

260261
@Override
261-
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
262+
public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
262263
{
263264
Integer rowId = ctx.get(getBoundKey("rowId"), Integer.class);
264265
if (rowId != null)
@@ -273,12 +274,12 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
273274
ActionURL url = QueryService.get().urlFor(ctx.getViewContext().getUser(), ctx.getContainer(), QueryAction.executeQuery, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_OUTPUTFILES);
274275
url.addParameter("query.fileSets~contains", token);
275276

276-
out.write(delim + "<a href=\"" + url.getURIString() + "\"" + ">" + token + "</a>");
277+
oldWriter.write(delim + "<a href=\"" + url.getURIString() + "\"" + ">" + token + "</a>");
277278
delim = ",<br>";
278279
}
279280
}
280281

281-
out.write("<a class=\"fa fa-pencil lk-dr-action-icon sfs-row\" data-tt=\"tooltip\" data-rowid=\"" + rowId +"\" data-original-title=\"add/edit\"></a>");
282+
oldWriter.write("<a class=\"fa fa-pencil lk-dr-action-icon sfs-row\" data-tt=\"tooltip\" data-rowid=\"" + rowId +"\" data-original-title=\"add/edit\"></a>");
282283

283284
if (!_handlerRegistered)
284285
{

‎SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.labkey.api.sequenceanalysis.pipeline.SequenceOutputHandler;
3434
import org.labkey.api.util.PageFlowUtil;
3535
import org.labkey.api.view.ActionURL;
36+
import org.labkey.api.writer.HtmlWriter;
3637
import org.labkey.sequenceanalysis.SequenceAnalysisSchema;
3738
import org.labkey.sequenceanalysis.SequenceAnalysisServiceImpl;
3839

@@ -259,21 +260,21 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
259260
return new DataColumn(colInfo)
260261
{
261262
@Override
262-
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
263+
public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
263264
{
264265
Object o = getValue(ctx);
265266
if (o != null)
266267
{
267268
ActionURL url = QueryService.get().urlFor(getUser(), ctx.getContainer(), QueryAction.executeQuery, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_READ_DATA);
268269
url.addFilter("query", FieldKey.fromString("readset"), CompareType.EQUAL, o);
269270

270-
out.write("<a class=\"labkey-text-link\" href=\"" + url + "\">");
271-
out.write("View File(s)");
272-
out.write("</a>");
271+
oldWriter.write("<a class=\"labkey-text-link\" href=\"" + url + "\">");
272+
oldWriter.write("View File(s)");
273+
oldWriter.write("</a>");
273274
}
274275
else
275276
{
276-
out.write("No Files");
277+
oldWriter.write("No Files");
277278
}
278279
}
279280
};
@@ -448,7 +449,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
448449
return new DataColumn(colInfo)
449450
{
450451
@Override
451-
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
452+
public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
452453
{
453454
String result = StringUtils.trimToNull(super.getFormattedHtml(ctx).toString());
454455
String delim = "";
@@ -459,7 +460,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
459460
{
460461
String url = DetailsURL.fromString(_baseUrl + PageFlowUtil.encode(token), ctx.getContainer()).getActionURL().toString();
461462

462-
out.write(delim + "<a href=\"" + url + "\">" + token + "</a>");
463+
oldWriter.write(delim + "<a href=\"" + url + "\">" + token + "</a>");
463464
delim = "<br>";
464465
}
465466
}

0 commit comments

Comments
 (0)