Migrate to renderGridCellContents(RenderContext, HtmlWriter)

ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java

@@ -64,7 +64,6 @@
 import org.labkey.api.study.DatasetTable;
 import org.labkey.api.study.Study;
 import org.labkey.api.study.StudyService;
-import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.NavTree;
@@ -73,25 +72,23 @@
 import org.labkey.ehr.EHRModule;
 import org.labkey.ehr.EHRSchema;
 
-import java.io.IOException;
-import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-/**
- * User: bimber
- * Date: 12/7/12
- * Time: 2:29 PM
- */
+import static org.labkey.api.util.DOM.A;
+import static org.labkey.api.util.DOM.Attribute.style;
+import static org.labkey.api.util.DOM.SPAN;
+import static org.labkey.api.util.DOM.at;
+import static org.labkey.api.util.DOM.cl;
+
 public class DefaultEHRCustomizer extends AbstractTableCustomizer
 {
     public static final String ID_COL = "Id";
@@ -825,13 +822,18 @@ public DisplayColumn createRenderer(final ColumnInfo colInfo)
                 return new DataColumn(colInfo)
                 {
                     @Override
-                    public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
+                    public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                     {
-                        Object objectid = ctx.get("objectid");
-                        Date date = (Date) ctx.get("date");
                         Object id = ctx.get(ID_COL);
 
-                        oldWriter.write("<span style=\"white-space:nowrap\"><a class=\"labkey-text-link anm-history\" data-id=\"" + PageFlowUtil.filter(id) + "\">[Show Hx]</a></span>");
+                        SPAN(
+                            at(style, "white-space:nowrap"),
+                            A(
+                                cl("labkey-text-link anm-history").data("id", id),
+                                "[Show Hx]"
+                            )
+                        ).appendTo(out);
+
                         if (!_clickHandlerAdded)
                         {
                             HttpView.currentPageConfig().addHandlerForQuerySelector("a.anm-history", "click", "EHR.window.ClinicalHistoryWindow.showClinicalHistory(null , this.attributes.getNamedItem('data-id').value, null, this);");

ehr/src/org/labkey/ehr/table/SNOMEDCodesDisplayColumn.java

@@ -16,28 +16,24 @@
 package org.labkey.ehr.table;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
+import org.labkey.api.collections.LabKeyCollectors;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.DataColumn;
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.query.FieldKey;
+import org.labkey.api.util.HtmlString;
+import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.view.template.ClientDependency;
 import org.labkey.api.writer.HtmlWriter;
 
-import java.io.IOException;
-import java.io.Writer;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-/**
- * User: bimber
- * Date: 10/23/13
- * Time: 3:49 PM
- */
 public class SNOMEDCodesDisplayColumn extends DataColumn
 {
     private static final Logger _log = LogManager.getLogger(SNOMEDCodesDisplayColumn.class);
@@ -48,48 +44,41 @@ public SNOMEDCodesDisplayColumn(ColumnInfo col)
     }
 
     @Override
-    public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
+    public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
     {
         Object o = getValue(ctx);
         if (o != null)
         {
             String val = o.toString();
             String[] parts = val.split("\\n");
-            Map<Integer, String> ret = new TreeMap<>();
+            Map<Integer, HtmlStringBuilder> ret = new TreeMap<>();
             for (String part : parts)
             {
-                part = StringUtils.trimToNull(part);
+                part = StringUtils.trimToEmpty(part);
                 String[] tokens = part.split(": ");
                 if (tokens.length == 2 && StringUtils.trimToNull(tokens[0]) != null)
                 {
                     Integer sort = Integer.parseInt(tokens[0]);
                     if (ret.containsKey(sort))
                     {
                         Object objectid = ctx.get(FieldKey.fromString("objectid"));
-                        _log.error("Duplicate sort for snomed: " + sort + (objectid == null ? "" : ".  objectid: " + objectid));
-                        ret.put(sort, ret.get(sort) + "<br>" + part);
+                        _log.error("Duplicate sort for snomed: {}{}", sort, objectid == null ? "" : ".  objectid: " + objectid);
+                        ret.get(sort).append(HtmlString.BR).append(part);
                     }
                     else
                     {
-                        ret.put(sort, part);
+                        ret.put(sort, HtmlStringBuilder.of(part));
                     }
-
                 }
                 else
                 {
-                    _log.error("Invalid SNOMED string: " + val);
+                    _log.error("Invalid SNOMED string: {}", val);
                 }
             }
 
-            String text;
-            String delim = "";
-            for (Integer sort : ret.keySet())
-            {
-                text = ret.get(sort).replaceAll("\\r?\\n", "<br>");
-                oldWriter.write(delim);
-                delim = "<br>";
-                oldWriter.write(text);
-            }
+            out.write(ret.values().stream()
+                .map(HtmlStringBuilder::getHtmlString)
+                .collect(LabKeyCollectors.joining(HtmlString.BR)));
         }
     }