Merge pull request #255 from LabKey/fb_htmlview_string_string

remove usages of HtmlView(String,String)
BimberLab · Dec 16, 2023 · da147a9 · da147a9
2 parents 26fc0a5 + 6ad5d15
commit da147a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java
@@ -309,7 +309,7 @@ public ModelAndView getView(FastqcForm form, BindException errors) throws Except
 
             if (files.size() == 0)
             {
-                return new HtmlView("Error: either no files provided or the files did not exist on the server");
+                return HtmlView.of("Error: either no files provided or the files did not exist on the server");
             }
 
             FastqcRunner runner = new FastqcRunner(null);
@@ -324,7 +324,7 @@ public ModelAndView getView(FastqcForm form, BindException errors) throws Except
             }
             catch (FileNotFoundException e)
             {
-                return new HtmlView("Error: " + e.getMessage());
+                return HtmlView.of("Error: " + e.getMessage());
             }
         }
 
@@ -506,7 +506,7 @@ public ModelAndView getConfirmView(Object o, BindException errors) throws Except
         {
             setTitle("Find Orphan Sequence Files");
 
-            HtmlView view = new HtmlView("This will start a pipeline job that will inspect all files in this folder to identify potential orphan or otherwise unnecessary files.  Do you want to continue?");
+            HtmlView view = HtmlView.of("This will start a pipeline job that will inspect all files in this folder to identify potential orphan or otherwise unnecessary files.  Do you want to continue?");
             return view;
         }
 
@@ -544,7 +544,7 @@ public ModelAndView getConfirmView(Object form, BindException errors) throws Exc
                 throw new UnauthorizedException("This can only be used from the root container");
             }
 
-            return new HtmlView("This will calculate the sequence length field for any reference NT sequences lacking it.  Do you want to continue?");
+            return HtmlView.of("This will calculate the sequence length field for any reference NT sequences lacking it.  Do you want to continue?");
         }
 
         @Override

diff --git a/cluster/src/org/labkey/cluster/ClusterController.java b/cluster/src/org/labkey/cluster/ClusterController.java
@@ -88,7 +88,7 @@ public URLHelper getSuccessURL(Object form)
         @Override
         public ModelAndView getConfirmView(Object form, BindException errors) throws Exception
         {
-            return new HtmlView("This will run a very simple test pipeline job against all configured cluster engines.  This is designed to help make sure your site's configuration is functional.  Do you want to continue?<br><br>");
+            return HtmlView.unsafe("This will run a very simple test pipeline job against all configured cluster engines.  This is designed to help make sure your site's configuration is functional.  Do you want to continue?<br><br>");
         }
 
         @Override