Migrate renderGridCellContents() and renderDetailsCellContents()

labkey-adam · labkey-adam · commit a0d489a4e2f2 · 2025-03-13T08:09:11.000-07:00
diff --git a/src/org/labkey/targetedms/TargetedMSSchema.java b/src/org/labkey/targetedms/TargetedMSSchema.java
@@ -81,6 +81,7 @@
 import org.labkey.api.view.PopupMenu;
 import org.labkey.api.view.ViewContext;
 import org.labkey.api.view.template.ClientDependency;
+import org.labkey.api.writer.HtmlWriter;
 import org.labkey.panoramapremium.query.QCEmailNotificationsTable;
 import org.labkey.targetedms.parser.Chromatogram;
 import org.labkey.targetedms.parser.ChromatogramBinaryFormat;
@@ -812,7 +813,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
                             }
 
                             @Override
-                            public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
+                            public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
                             {
                                 Long runId = ctx.get(this.getColumnInfo().getFieldKey(), Long.class);
                                 if (runId != null)
@@ -822,11 +823,11 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
                                     if(run != null)
                                     {
                                         PopupMenu menu = TargetedMSController.createDownloadMenu(run);
-                                        menu.render(out);
+                                        menu.render(oldWriter);
                                     }
                                     else
                                     {
-                                        out.write("<em>Not available</em>");
+                                        oldWriter.write("<em>Not available</em>");
                                     }
                                 }
                             }
diff --git a/src/org/labkey/targetedms/query/ChromatogramDisplayColumnFactory.java b/src/org/labkey/targetedms/query/ChromatogramDisplayColumnFactory.java
@@ -26,6 +26,7 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HttpView;
+import org.labkey.api.writer.HtmlWriter;
 import org.labkey.targetedms.TargetedMSController;
 import org.labkey.targetedms.view.ChromatogramsDataRegion;
 import org.springframework.web.servlet.mvc.Controller;
@@ -170,7 +171,7 @@ public boolean isSortable()
             }
 
             @Override
-            public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
+            public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
             {
                 Object id = getValue(ctx);  // Primary key from the relevant table
                 if(null == id)
@@ -209,7 +210,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
                         "<div style=\"text-align: center\" id=\"" + PageFlowUtil.filter(domLabelId) + "\"></div>";
 
                 dataRegion.addSVG(chromAction.getLocalURIString(), domId, domLabelId);
-                out.write(html);
+                oldWriter.write(html);
             }
 
             @Override
diff --git a/src/org/labkey/targetedms/query/ModifiedSequenceDisplayColumn.java b/src/org/labkey/targetedms/query/ModifiedSequenceDisplayColumn.java
@@ -25,12 +25,11 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.logging.LogHelper;
+import org.labkey.api.writer.HtmlWriter;
 import org.labkey.targetedms.parser.Protein;
 import org.labkey.targetedms.view.IconFactory;
 import org.labkey.targetedms.view.ModifiedPeptideHtmlMaker;
 
-import java.io.IOException;
-import java.io.Writer;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -66,7 +65,7 @@ ModifiedPeptideHtmlMaker getHtmlMaker()
     public abstract void initialize(RenderContext ctx);
 
     @Override
-    public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
+    public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
     {
         initialize(ctx);
         super.renderGridCellContents(ctx, out);
diff --git a/src/org/labkey/targetedms/query/QCFolderDisplayColumnFactory.java b/src/org/labkey/targetedms/query/QCFolderDisplayColumnFactory.java
@@ -10,6 +10,7 @@
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.targetedms.TargetedMSService;
 import org.labkey.api.util.PageFlowUtil;
+import org.labkey.api.writer.HtmlWriter;
 import org.labkey.targetedms.TargetedMSManager;
 import org.labkey.targetedms.TargetedMSModule;
 import org.labkey.targetedms.TargetedMSRun;
@@ -32,7 +33,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
         return new DataColumn(colInfo)
         {
             @Override
-            public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
+            public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
             {
                 final User user = ctx.getViewContext().getUser();
                 String serialNumber = String.valueOf(getBoundColumn().getValue(ctx));
@@ -64,7 +65,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
                             .append(PageFlowUtil.filter(qcContainer.getName()))
                             .append("</a></div>");
                 });
-                out.write(sb.toString());
+                oldWriter.write(sb.toString());
             }
         };
     }
diff --git a/src/org/labkey/targetedms/query/RepresentativeStateDisplayColumn.java b/src/org/labkey/targetedms/query/RepresentativeStateDisplayColumn.java
@@ -19,6 +19,7 @@
 import org.labkey.api.data.DataColumn;
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.targetedms.RepresentativeDataState;
+import org.labkey.api.writer.HtmlWriter;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -36,23 +37,23 @@ public RepresentativeStateDisplayColumn (ColumnInfo columnInfo)
     }
 
     @Override
-    public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
+    public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
     {
         Object representativeState = getValue(ctx);
         if (representativeState == null)
             return;
 
         if (RepresentativeDataState.Representative.getLabel().equals(representativeState.toString()))
         {
-            out.write("<span style='color:green;'>" + representativeState.toString() + "</span>");
+            oldWriter.write("<span style='color:green;'>" + representativeState.toString() + "</span>");
         }
         else if (RepresentativeDataState.Conflicted.getLabel().equals(representativeState.toString()))
         {
-            out.write("<span style='color:red;'>" + representativeState.toString() + "</span>");
+            oldWriter.write("<span style='color:red;'>" + representativeState.toString() + "</span>");
         }
         else
         {
-            out.write(representativeState.toString());
+            oldWriter.write(representativeState.toString());
         }
     }
 }
diff --git a/src/org/labkey/targetedms/query/SampleFileTable.java b/src/org/labkey/targetedms/query/SampleFileTable.java
@@ -58,6 +58,7 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.view.ActionURL;
+import org.labkey.api.writer.HtmlWriter;
 import org.labkey.targetedms.TargetedMSController;
 import org.labkey.targetedms.TargetedMSManager;
 import org.labkey.targetedms.TargetedMSRun;
@@ -68,7 +69,6 @@
 
 import java.io.IOException;
 import java.io.Writer;
-import java.net.URI;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -352,7 +352,7 @@ public DownloadLinkColumn(ColumnInfo col)
         }
 
         @Override
-        public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
+        public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
         {
             Long sampleFileId = ctx.get(this.getColumnInfo().getFieldKey(), Long.class);
             Container container = ctx.get(_containerFieldKey, Container.class);
@@ -377,14 +377,14 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
                             url = url + "?method=zip&depth=-1&file=" + PageFlowUtil.encode(expData.getName()) + "&zipName=" + PageFlowUtil.encode(expData.getName());
                         }
 
-                        out.write(PageFlowUtil.iconLink("fa fa-download", null).href(url).toString());
-                        out.write("&nbsp;");
-                        out.write(PageFlowUtil.filter(size));
+                        oldWriter.write(PageFlowUtil.iconLink("fa fa-download", null).href(url).toString());
+                        oldWriter.write("&nbsp;");
+                        oldWriter.write(PageFlowUtil.filter(size));
                         return;
                     }
                 }
             }
-            out.write("<em>Not available</em>");
+            oldWriter.write("<em>Not available</em>");
         }
 
         @Override

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@`
`81`	`81`	`import org.labkey.api.view.PopupMenu;`
`82`	`82`	`import org.labkey.api.view.ViewContext;`
`83`	`83`	`import org.labkey.api.view.template.ClientDependency;`
	`84`	`+import org.labkey.api.writer.HtmlWriter;`
`84`	`85`	`import org.labkey.panoramapremium.query.QCEmailNotificationsTable;`
`85`	`86`	`import org.labkey.targetedms.parser.Chromatogram;`
`86`	`87`	`import org.labkey.targetedms.parser.ChromatogramBinaryFormat;`
`@@ -812,7 +813,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)`
`812`	`813`	`}`
`813`	`814`
`814`	`815`	`@Override`
`815`		`- public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException`
	`816`	`+ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException`
`816`	`817`	`{`
`817`	`818`	`Long runId = ctx.get(this.getColumnInfo().getFieldKey(), Long.class);`
`818`	`819`	`if (runId != null)`
`@@ -822,11 +823,11 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep`
`822`	`823`	`if(run != null)`
`823`	`824`	`{`
`824`	`825`	`PopupMenu menu = TargetedMSController.createDownloadMenu(run);`
`825`		`- menu.render(out);`
	`826`	`+ menu.render(oldWriter);`
`826`	`827`	`}`
`827`	`828`	`else`
`828`	`829`	`{`
`829`		`- out.write("<em>Not available</em>");`
	`830`	`+ oldWriter.write("<em>Not available</em>");`
`830`	`831`	`}`
`831`	`832`	`}`
`832`	`833`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`import org.labkey.api.security.permissions.ReadPermission;`
`11`	`11`	`import org.labkey.api.targetedms.TargetedMSService;`
`12`	`12`	`import org.labkey.api.util.PageFlowUtil;`
	`13`	`+import org.labkey.api.writer.HtmlWriter;`
`13`	`14`	`import org.labkey.targetedms.TargetedMSManager;`
`14`	`15`	`import org.labkey.targetedms.TargetedMSModule;`
`15`	`16`	`import org.labkey.targetedms.TargetedMSRun;`
`@@ -32,7 +33,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)`
`32`	`33`	`return new DataColumn(colInfo)`
`33`	`34`	`{`
`34`	`35`	`@Override`
`35`		`- public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException`
	`36`	`+ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException`
`36`	`37`	`{`
`37`	`38`	`final User user = ctx.getViewContext().getUser();`
`38`	`39`	`String serialNumber = String.valueOf(getBoundColumn().getValue(ctx));`
`@@ -64,7 +65,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep`
`64`	`65`	`.append(PageFlowUtil.filter(qcContainer.getName()))`
`65`	`66`	`.append("</a></div>");`
`66`	`67`	`});`
`67`		`- out.write(sb.toString());`
	`68`	`+ oldWriter.write(sb.toString());`
`68`	`69`	`}`
`69`	`70`	`};`
`70`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`import org.labkey.api.data.DataColumn;`
`20`	`20`	`import org.labkey.api.data.RenderContext;`
`21`	`21`	`import org.labkey.api.targetedms.RepresentativeDataState;`
	`22`	`+import org.labkey.api.writer.HtmlWriter;`
`22`	`23`
`23`	`24`	`import java.io.IOException;`
`24`	`25`	`import java.io.Writer;`
`@@ -36,23 +37,23 @@ public RepresentativeStateDisplayColumn (ColumnInfo columnInfo)`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`@Override`
`39`		`- public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException`
	`40`	`+ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException`
`40`	`41`	`{`
`41`	`42`	`Object representativeState = getValue(ctx);`
`42`	`43`	`if (representativeState == null)`
`43`	`44`	`return;`
`44`	`45`
`45`	`46`	`if (RepresentativeDataState.Representative.getLabel().equals(representativeState.toString()))`
`46`	`47`	`{`
`47`		`- out.write("<span style='color:green;'>" + representativeState.toString() + "</span>");`
	`48`	`+ oldWriter.write("<span style='color:green;'>" + representativeState.toString() + "</span>");`
`48`	`49`	`}`
`49`	`50`	`else if (RepresentativeDataState.Conflicted.getLabel().equals(representativeState.toString()))`
`50`	`51`	`{`
`51`		`- out.write("<span style='color:red;'>" + representativeState.toString() + "</span>");`
	`52`	`+ oldWriter.write("<span style='color:red;'>" + representativeState.toString() + "</span>");`
`52`	`53`	`}`
`53`	`54`	`else`
`54`	`55`	`{`
`55`		`- out.write(representativeState.toString());`
	`56`	`+ oldWriter.write(representativeState.toString());`
`56`	`57`	`}`
`57`	`58`	`}`
`58`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@`
`58`	`58`	`import org.labkey.api.util.PageFlowUtil;`
`59`	`59`	`import org.labkey.api.util.Pair;`
`60`	`60`	`import org.labkey.api.view.ActionURL;`
	`61`	`+import org.labkey.api.writer.HtmlWriter;`
`61`	`62`	`import org.labkey.targetedms.TargetedMSController;`
`62`	`63`	`import org.labkey.targetedms.TargetedMSManager;`
`63`	`64`	`import org.labkey.targetedms.TargetedMSRun;`
`@@ -68,7 +69,6 @@`
`68`	`69`
`69`	`70`	`import java.io.IOException;`
`70`	`71`	`import java.io.Writer;`
`71`		`-import java.net.URI;`
`72`	`72`	`import java.sql.SQLException;`
`73`	`73`	`import java.util.ArrayList;`
`74`	`74`	`import java.util.Arrays;`
`@@ -352,7 +352,7 @@ public DownloadLinkColumn(ColumnInfo col)`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`@Override`
`355`		`- public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException`
	`355`	`+ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException`
`356`	`356`	`{`
`357`	`357`	`Long sampleFileId = ctx.get(this.getColumnInfo().getFieldKey(), Long.class);`
`358`	`358`	`Container container = ctx.get(_containerFieldKey, Container.class);`
`@@ -377,14 +377,14 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep`
`377`	`377`	`url = url + "?method=zip&depth=-1&file=" + PageFlowUtil.encode(expData.getName()) + "&zipName=" + PageFlowUtil.encode(expData.getName());`
`378`	`378`	`}`
`379`	`379`
`380`		`- out.write(PageFlowUtil.iconLink("fa fa-download", null).href(url).toString());`
`381`		`- out.write(" ");`
`382`		`- out.write(PageFlowUtil.filter(size));`
	`380`	`+ oldWriter.write(PageFlowUtil.iconLink("fa fa-download", null).href(url).toString());`
	`381`	`+ oldWriter.write(" ");`
	`382`	`+ oldWriter.write(PageFlowUtil.filter(size));`
`383`	`383`	`return;`
`384`	`384`	`}`
`385`	`385`	`}`
`386`	`386`	`}`
`387`		`- out.write("<em>Not available</em>");`
	`387`	`+ oldWriter.write("<em>Not available</em>");`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`@Override`