Simplify and expand use of LinkBuilder factory methods

Author: labkey-adam

hdrl/src/org/labkey/hdrl/HDRLController.java

@@ -54,6 +54,7 @@
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.settings.AdminConsole;
 import org.labkey.api.util.HtmlString;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Path;
 import org.labkey.api.util.URLHelper;
@@ -104,7 +105,7 @@ public ModelAndView getView(Object o, BindException errors)
         {
             VBox vbox = new VBox();
 
-            HtmlView submitView = new HtmlView("New Test Request", HtmlString.of(PageFlowUtil.link("Submit new test request").href(new ActionURL(EditRequestAction.class, getViewContext().getContainer()))));
+            HtmlView submitView = new HtmlView("New Test Request", HtmlString.of(LinkBuilder.labkeyLink("Submit new test request", new ActionURL(EditRequestAction.class, getViewContext().getContainer()))));
             vbox.addView(submitView);
 
             UserSchema schema = QueryService.get().getUserSchema(getUser(), getContainer(), HDRLQuerySchema.NAME);

hdrl/src/org/labkey/hdrl/query/HDRLQuerySchema.java

@@ -42,6 +42,7 @@
 import org.labkey.api.security.User;
 import org.labkey.api.security.permissions.AdminPermission;
 import org.labkey.api.security.permissions.UpdatePermission;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.ViewContext;
@@ -216,13 +217,13 @@ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWrit
                             {
                                 FieldKey requestFieldKey = FieldKey.fromParts("RequestId");
                                 ActionURL actionUrl = new ActionURL(HDRLController.EditRequestAction.class, c).addParameter("requestId", (Integer)ctx.get(requestFieldKey));
-                                oldWriter.write(PageFlowUtil.link("Edit").href(actionUrl).toString());
+                                oldWriter.write(LinkBuilder.labkeyLink("Edit", actionUrl).toString());
                             }
                             else
                             {
                                 ActionURL actionUrl = new ActionURL(HDRLController.RequestDetailsAction.class, c);
                                 actionUrl.addParameter("requestId", (Integer) ctx.get("requestId"));
-                                oldWriter.write(PageFlowUtil.link("View").href(actionUrl).toString());
+                                oldWriter.write(LinkBuilder.labkeyLink("View", actionUrl).toString());
                             }
                         }
                     };