Skip to content

Commit 4714fbe

Browse files
committed
Finish renderGridCellContents migration
1 parent cc656e6 commit 4714fbe

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import org.labkey.api.view.template.ClientDependency;
1313
import org.labkey.api.writer.HtmlWriter;
1414

15-
import java.io.IOException;
16-
import java.io.Writer;
1715
import java.util.Collections;
1816
import java.util.LinkedHashSet;
1917
import java.util.Map;
@@ -39,12 +37,12 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
3937
private boolean _handlerRegistered = false;
4038

4139
@Override
42-
public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
40+
public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
4341
{
44-
Object val = ctx.get(FieldKey.fromString(getBoundColumn().getFieldKey().getParent(), "rowId"));
45-
oldWriter.write(PageFlowUtil.link("Download Sequence").attributes(Map.of(
42+
Integer val = ctx.get(FieldKey.fromString(getBoundColumn().getFieldKey().getParent(), "rowId"), Integer.class);
43+
out.write(PageFlowUtil.link("Download Sequence").attributes(Map.of(
4644
"data-rowid", val.toString()
47-
)).addClass("sdc-row").toString());
45+
)).addClass("sdc-row"));
4846

4947
if (!_handlerRegistered)
5048
{

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,25 @@ public GenbankDisplayColumnFactory()
2424
@Override
2525
public DisplayColumn createRenderer(ColumnInfo colInfo)
2626
{
27-
DataColumn ret = new DataColumn(colInfo)
27+
return new DataColumn(colInfo)
2828
{
2929
@Override
30-
public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
30+
public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
3131
{
32-
Object val = ctx.get(getBoundColumn().getFieldKey());
32+
String val = ctx.get(getBoundColumn().getFieldKey(), String.class);
3333
if (val != null)
3434
{
35-
String[] vals = String.valueOf(val).replaceAll("\\s+", "").split(";|,");
35+
String[] vals = val.replaceAll("\\s+", "").split("[;,]");
3636
String delim = "";
3737
for (String v : vals)
3838
{
39-
oldWriter.write(delim + "<a href=" + getFormattedURL(v) + ">" + PageFlowUtil.encode(v) + "</a>");
39+
out.write(PageFlowUtil.link(v).href(getFormattedURL(v)));
40+
out.write(delim);
4041
delim = "; ";
4142
}
4243
}
4344
}
4445
};
45-
46-
return ret;
4746
}
4847

4948
protected String getFormattedURL(String v)

0 commit comments

Comments
 (0)