From cb16e78ae8a08f8052686db7a4b75c750ff1a9c1 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Wed, 12 Mar 2025 14:58:55 -0700 Subject: [PATCH 1/3] Remove unused methods from DisplayColumn, refactor --- .../laboratory/query/EnterResultsDisplayColumn.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java b/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java index 4e09ec4a..9b8195f4 100644 --- a/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java +++ b/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java @@ -10,10 +10,14 @@ import org.labkey.api.exp.api.ExperimentService; import org.labkey.api.util.PageFlowUtil; import org.labkey.api.view.ActionURL; +import org.labkey.api.writer.HtmlWriter; import java.io.IOException; import java.io.Writer; +import static org.labkey.api.util.DOM.TD; +import static org.labkey.api.util.DOM.cl; + /** * User: bimber * Date: 11/6/12 @@ -57,8 +61,8 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep } @Override - public void renderGridHeaderCell(RenderContext ctx, Writer out, String headerClass) throws IOException + public void renderGridHeaderCell(RenderContext ctx, HtmlWriter out, String headerClass) { - out.write(""); + TD(cl("labkey-column-header")).appendTo(out); } } From 6585d7964adc5023a30e63c7f0a63ef09519599c Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Thu, 13 Mar 2025 08:08:58 -0700 Subject: [PATCH 2/3] Migrate renderGridCellContents() and renderDetailsCellContents() --- .../laboratory/query/EnterResultsDisplayColumn.java | 4 ++-- .../laboratory/query/WorkbookIdDisplayColumn.java | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java b/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java index 9b8195f4..f85a4c36 100644 --- a/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java +++ b/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java @@ -49,14 +49,14 @@ public String renderURL(RenderContext ctx) } @Override - public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException + public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException { Object value = getValue(ctx); String url = renderURL(ctx); if (value != null && url != null) { - out.write(PageFlowUtil.link(value.toString()).href(url).target(_linkTarget).toString()); + oldWriter.write(PageFlowUtil.link(value.toString()).href(url).target(_linkTarget).toString()); } } diff --git a/laboratory/src/org/labkey/laboratory/query/WorkbookIdDisplayColumn.java b/laboratory/src/org/labkey/laboratory/query/WorkbookIdDisplayColumn.java index 2eeb6f0c..3ad201b5 100644 --- a/laboratory/src/org/labkey/laboratory/query/WorkbookIdDisplayColumn.java +++ b/laboratory/src/org/labkey/laboratory/query/WorkbookIdDisplayColumn.java @@ -3,9 +3,7 @@ import org.labkey.api.data.ColumnInfo; import org.labkey.api.data.DataColumn; import org.labkey.api.data.RenderContext; - -import java.io.IOException; -import java.io.Writer; +import org.labkey.api.writer.HtmlWriter; /** * User: bimber @@ -20,9 +18,9 @@ public WorkbookIdDisplayColumn(ColumnInfo col) } @Override - public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException + public void renderGridCellContents(RenderContext ctx, HtmlWriter out) { - //if the lookup is broken, dont render a value + //if the lookup is broken, don't render a value Object dv = getDisplayValue(ctx); if (dv == null || "".equals(dv)) return; @@ -35,7 +33,7 @@ public Object getDisplayValue(RenderContext ctx) { Object ret = super.getDisplayValue(ctx); - //if the lookup is broken, dont render a value. note: return empty string so client API draws the distinction between deliberately empty and a genuine NULL value + //if the lookup is broken, don't render a value. note: return empty string so client API draws the distinction between deliberately empty and a genuine NULL value return ret == null ? "" : ret; } } \ No newline at end of file From 6f8141a9401bfc6bfcc7a8ad86e8dd63e0f154e7 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Thu, 13 Mar 2025 11:23:22 -0700 Subject: [PATCH 3/3] Fewer StackOverflowExceptions, please --- .../labkey/laboratory/query/EnterResultsDisplayColumn.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java b/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java index f85a4c36..f673e042 100644 --- a/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java +++ b/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java @@ -12,9 +12,6 @@ import org.labkey.api.view.ActionURL; import org.labkey.api.writer.HtmlWriter; -import java.io.IOException; -import java.io.Writer; - import static org.labkey.api.util.DOM.TD; import static org.labkey.api.util.DOM.cl; @@ -49,14 +46,14 @@ public String renderURL(RenderContext ctx) } @Override - public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException + public void renderGridCellContents(RenderContext ctx, HtmlWriter out) { Object value = getValue(ctx); String url = renderURL(ctx); if (value != null && url != null) { - oldWriter.write(PageFlowUtil.link(value.toString()).href(url).target(_linkTarget).toString()); + out.write(PageFlowUtil.link(value.toString()).href(url).target(_linkTarget)); } }