DisplayColumn refactor

Author: labkey-adam

src/org/labkey/targetedms/TargetedMSSchema.java

@@ -69,14 +69,13 @@
 import org.labkey.api.query.UserSchema;
 import org.labkey.api.security.User;
 import org.labkey.api.security.UserPrincipal;
-import org.labkey.api.security.permissions.AdminPermission;
 import org.labkey.api.security.permissions.Permission;
-import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.targetedms.RepresentativeDataState;
 import org.labkey.api.targetedms.RunRepresentativeDataState;
 import org.labkey.api.util.ContainerContext;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.Pair;
+import org.labkey.api.util.SafeToRender;
 import org.labkey.api.util.UnexpectedException;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.PopupMenu;
@@ -1685,7 +1684,7 @@ protected DataRegion createDataRegion()
                         {
                             private final Map<Pair<String, Long>, Pair<Boolean, String>> _metadata = PTMPercentsGroupedCustomizer.getSampleMetadata(getContainer());
                             @Override
-                            protected String getMemberCaptionWithUrl(String caption, String url)
+                            protected SafeToRender getMemberCaptionWithUrl(String caption, String url)
                             {
                                 var key = Pair.of(caption, runId);
                                 if (_metadata.containsKey(key))

src/org/labkey/targetedms/query/AnnotatedTargetedMSTable.java

@@ -45,16 +45,12 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * Optionally adds annotation-valued columns as if there were "real" columns. Can be conditionalized via the omitAnnotations
  * column to optimize for scenarios where they will never be used, such as when populating a Java bean with a fixed set
  * of get/set methods.
  * Wires up lookups to Skyline lists when possible. {@link SkylineListUnionTable}
- *
- * User: jeckels
- * Date: Jul 6, 2012
  */
 public class AnnotatedTargetedMSTable extends TargetedMSTable
 {
@@ -141,7 +137,7 @@ protected void addAnnotationsColumns(TableInfo annotationTableInfo, String annot
                 String lookup = annotationSetting.getMaxLookup();
                 // Look at all the lists with the same name in this scope
                 List<ListDefinition> listDefs = SkylineListManager.getListDefinitions(getContainer(), getContainerFilter());
-                listDefs = listDefs.stream().filter((l) -> lookup.equals(l.getName())).collect(Collectors.toList());
+                listDefs = listDefs.stream().filter((l) -> lookup.equals(l.getName())).toList();
                 if (!listDefs.isEmpty())
                 {
                     ListDefinition listDef = listDefs.get(0);
@@ -310,7 +306,7 @@ public String getValue(RenderContext ctx)
         }
 
         @Override
-        public Class<?> getValueClass()
+        public Class<String> getValueClass()
         {
             return String.class;
         }

src/org/labkey/targetedms/view/ChromatogramsDataRegion.java

@@ -50,6 +50,7 @@
 import java.util.List;
 
 import static org.labkey.api.util.DOM.Attribute.style;
+import static org.labkey.api.util.DOM.SCRIPT;
 import static org.labkey.api.util.DOM.TD;
 import static org.labkey.api.util.DOM.TR;
 import static org.labkey.api.util.DOM.at;
@@ -149,8 +150,9 @@ protected void renderTable(RenderContext ctx, HtmlWriter out) throws SQLExceptio
                 .append("].refreshPlots);\n");
         }
 
-        out.write(JavaScriptFragment.unsafe(script.toString()));
-        out.writeElementEnd(DOM.Element.script);
+        SCRIPT(
+            JavaScriptFragment.unsafe(script.toString())
+        ).appendTo(out);
     }
 
     @Override

src/org/labkey/targetedms/view/FontAwesomeLinkColumn.java

@@ -1,6 +1,7 @@
 package org.labkey.targetedms.view;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.DataColumn;
 import org.labkey.api.data.RenderContext;
@@ -26,7 +27,7 @@ public FontAwesomeLinkColumn(ColumnInfo col, String icon, String tooltip)
     }
 
     @Override
-    public String getTitle(RenderContext ctx)
+    public @Nullable HtmlString getTitle(RenderContext ctx)
     {
         return null;
     }