Improve display element builders

announcements/src/org/labkey/announcements/AnnouncementsController.java

@@ -109,8 +109,8 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.URLHelper;
-import org.labkey.api.util.element.Option.OptionBuilder;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.AjaxCompletion;
 import org.labkey.api.view.AlwaysAvailableWebPartFactory;

announcements/src/org/labkey/announcements/announcementThread.jsp

@@ -74,7 +74,7 @@ if (announcementModel.isSpam())
 }
 else if (null == announcementModel.getApproved() && c.hasPermission(user, AdminPermission.class))
 {
-    %><p></p><img src="<%=getWebappURL("_images/exclaim.gif")%>">&nbsp;This <%=h(settings.getConversationName().toLowerCase())%> requires <%=link("moderator review", new ActionURL(AnnouncementsController.ModeratorReviewAction.class, c)).clearClasses()%>.<%
+    %><p></p><img src="<%=getWebappURL("_images/exclaim.gif")%>">&nbsp;This <%=h(settings.getConversationName().toLowerCase())%> requires <%=simpleLink("moderator review", new ActionURL(AnnouncementsController.ModeratorReviewAction.class, c))%>.<%
 }
 %>
 

api/src/org/labkey/api/action/LabKeyErrorWithLink.java

@@ -3,7 +3,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.view.ViewContext;
 
 public class LabKeyErrorWithLink extends LabKeyError

api/src/org/labkey/api/assay/AssayQCFlagColumn.java

@@ -32,7 +32,7 @@
 import org.labkey.api.query.ExprColumn;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.view.template.ClientDependency;
@@ -99,7 +99,7 @@ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWrit
 
                             // add onclick handler to call the QCFlag toggle window creation function
                             // users with update perm will be able to change enabled state and edit comment, others will only be able to read flag details
-                            Link.LinkBuilder linkBuilder = new Link.LinkBuilder(getCollapsedQCFlagOutput(values, enabled))
+                            LinkBuilder linkBuilder = new LinkBuilder(getCollapsedQCFlagOutput(values, enabled))
                                     .onClick("showQCFlagToggleWindow(" + jsString(_schemaName) + ", " + runId + "," + _editable + "); return false;");
                             oldWriter.write(linkBuilder.toString());
                         }

api/src/org/labkey/api/assay/actions/UploadWizardAction.java

@@ -76,11 +76,11 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.JavaScriptFragment;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.URLHelper;
-import org.labkey.api.util.element.Input;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HtmlView;
 import org.labkey.api.view.HttpView;
@@ -902,7 +902,7 @@ public boolean isEditable()
         @Override
         public void renderInputHtml(RenderContext ctx, HtmlWriter out, Object value)
         {
-            out.write(new Input.InputBuilder<>().type("text").name(_inputName).value(value == null ? null : value.toString()));
+            out.write(InputBuilder.text().name(_inputName).value(value == null ? null : value.toString()));
         }
 
         @Override
@@ -1213,7 +1213,7 @@ public HtmlString getErrors(String paramName)
                 {
                     sb.append("<br>");
                     String script = "uploadWizard_showPopup('extraErrors', 'All Errors', " + PageFlowUtil.jsString(msgBox.toString()) + "); return false;";
-                    sb.append(new Link.LinkBuilder("Too many errors to display (click to show all).").id("extraErrors").onClick(script).getHtmlString());
+                    sb.append(new LinkBuilder("Too many errors to display (click to show all).").id("extraErrors").onClick(script).getHtmlString());
                     sb.append("<br>");
                 }
                 return sb.getHtmlString();

api/src/org/labkey/api/data/AbstractFileDisplayColumn.java

@@ -23,7 +23,7 @@
 import org.labkey.api.util.MimeMap;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.StringExpression;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.writer.HtmlWriter;
 
@@ -273,11 +273,10 @@ public void renderInputHtml(RenderContext ctx, HtmlWriter out, Object value)
             String filename = getFileName(ctx, value);
             String formFieldName = ctx.getForm().getFormFieldName(getBoundColumn());
 
-            InputBuilder<?> input = new InputBuilder<>()
-                    .type("file")
-                    .name(formFieldName)
-                    .disabled(isDisabledInput(ctx))
-                    .needsWrapping(false);
+            InputBuilder<?> input = InputBuilder.file()
+                .name(formFieldName)
+                .disabled(isDisabledInput(ctx))
+                .needsWrapping(false);
 
             if (null != filename)
             {

api/src/org/labkey/api/data/ActionButton.java

@@ -21,7 +21,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.query.DetailsURL;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.JavaScriptFragment;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.StringExpression;
@@ -377,7 +377,7 @@ public void render(RenderContext ctx, Writer out) throws IOException
 
         lock();
 
-        Button.ButtonBuilder button = PageFlowUtil.button(getCaption(ctx))
+        ButtonBuilder button = PageFlowUtil.button(getCaption(ctx))
             .disableOnClick(_disableOnClick)
             .iconCls(getIconCls())
             .tooltip(getTooltip())

api/src/org/labkey/api/data/CrosstabDataRegion.java

@@ -19,7 +19,7 @@
 import org.labkey.api.query.CrosstabView;
 import org.labkey.api.util.DOM.Renderable;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.SafeToRender;
 import org.labkey.api.writer.HtmlWriter;
@@ -134,7 +134,7 @@ protected SafeToRender getMemberCaptionWithUrl(String caption, String url)
     {
         if (url != null)
         {
-            return new Link.LinkBuilder(caption).href(url);
+            return new LinkBuilder(caption).href(url);
         }
 
         return HtmlString.of(caption);

api/src/org/labkey/api/data/DataColumn.java

@@ -38,18 +38,17 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.JavaScriptFragment;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.SimpleNamedObject;
 import org.labkey.api.util.StringExpression;
 import org.labkey.api.util.StringExpressionFactory;
 import org.labkey.api.util.StringUtilsLabKey;
 import org.labkey.api.util.UniqueID;
-import org.labkey.api.util.element.Input;
-import org.labkey.api.util.element.Option;
-import org.labkey.api.util.element.Option.OptionBuilder;
-import org.labkey.api.util.element.Select;
-import org.labkey.api.util.element.TextArea;
+import org.labkey.api.util.InputBuilder;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
+import org.labkey.api.util.TextAreaBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.TypeAheadSelectDisplayColumn;
@@ -393,7 +392,7 @@ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWrit
 
             if (StringUtils.isNotBlank(url))
             {
-                Link.LinkBuilder link = new Link.LinkBuilder(formattedValue).href(url).clearClasses();
+                LinkBuilder link = new LinkBuilder(formattedValue).href(url).clearClasses();
 
                 String linkTitle = renderURLTitle(ctx);
                 if (null != linkTitle)
@@ -721,12 +720,12 @@ else if (_inputType.equalsIgnoreCase("checkbox"))
 
     private void renderSelectFormInput(HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput, NamedObjectList entryList)
     {
-        Select.SelectBuilder select = new Select.SelectBuilder()
+        SelectBuilder select = new SelectBuilder()
             .disabled(disabledInput)
             .multiple("select.multiple".equalsIgnoreCase(_inputType))
             .name(formFieldName);
 
-        List<Option> options = new ArrayList<>();
+        List<OptionBuilder.Option> options = new ArrayList<>();
 
         // add empty option
         options.add(new OptionBuilder().build());
@@ -797,8 +796,7 @@ protected void renderSelectFormInputFromFk(RenderContext ctx, HtmlWriter out, St
 
     protected void renderFileFormInput(HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput)
     {
-        var input = new Input.InputBuilder<>()
-            .type("file")
+        var input = InputBuilder.file()
             .name(formFieldName)
             .disabled(disabledInput)
             .needsWrapping(false);
@@ -810,8 +808,7 @@ protected void renderCheckboxFormInput(HtmlWriter out, String formFieldName, Obj
     {
         boolean checked = ColumnInfo.booleanFromObj(ConvertUtils.convert(value));
 
-        var input = new Input.InputBuilder<>()
-            .type("checkbox")
+        var input = InputBuilder.checkbox()
             .name(formFieldName)
             .disabled(disabledInput)
             .value("1")
@@ -828,8 +825,7 @@ protected void renderCheckboxFormInput(HtmlWriter out, String formFieldName, Obj
          * To fix this, each checkbox posts a hidden field named @columnName.  Spring parameter
          * binding uses these special fields to set all unposted checkbox values to false.
          */
-        out.write(new Input.InputBuilder<>()
-            .type("hidden")
+        out.write(InputBuilder.hidden()
             .name(SpringActionController.FIELD_MARKER + formFieldName)
             .value(1));
 
@@ -840,7 +836,7 @@ protected void renderCheckboxFormInput(HtmlWriter out, String formFieldName, Obj
 
     protected void renderTextAreaFormInput(HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput)
     {
-        TextArea.TextAreaBuilder input = new TextArea.TextAreaBuilder()
+        TextAreaBuilder input = new TextAreaBuilder()
             .columns(_inputLength)
             .rows(_inputRows)
             .name(formFieldName)
@@ -856,7 +852,7 @@ protected void renderTextAreaFormInput(HtmlWriter out, String formFieldName, Obj
 
     protected void renderTextFormInput(HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput)
     {
-        var input = new Input.InputBuilder<>()
+        var input = InputBuilder.text()
             .name(formFieldName)
             .disabled(disabledInput)
             .size(_inputLength)

api/src/org/labkey/api/data/DataRegion.java

@@ -61,8 +61,8 @@
 import org.labkey.api.util.TestContext;
 import org.labkey.api.util.URLHelper;
 import org.labkey.api.util.UniqueID;
-import org.labkey.api.util.element.CsrfInput;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.CsrfInput;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.DisplayElement;
 import org.labkey.api.view.HttpView;
@@ -1811,19 +1811,19 @@ protected void renderFormBegin(RenderContext ctx, HtmlWriter out, int mode)
     protected void renderHiddenFormFields(RenderContext ctx, HtmlWriter out, int mode)
     {
         if (mode == MODE_GRID)
-            out.write(new InputBuilder<>().type("hidden").name(DataRegionSelection.DATA_REGION_SELECTION_KEY).value(getSelectionKey()));
+            out.write(InputBuilder.hidden().name(DataRegionSelection.DATA_REGION_SELECTION_KEY).value(getSelectionKey()));
 
         out.write(new CsrfInput(ctx.getViewContext()));
 
         for (FormField field : _hiddenFormFields)
         {
-            out.write(new InputBuilder<>().type("hidden").name(field.name()).value(field.value()));
+            out.write(InputBuilder.hidden().name(field.name()).value(field.value()));
         }
 
         if (mode == MODE_UPDATE_MULTIPLE)
         {
-            out.write(new InputBuilder<>().type("hidden").name(TableViewForm.DATA_SUBMIT_NAME).value("true"));
-            out.write(new InputBuilder<>().type("hidden").name(TableViewForm.BULK_UPDATE_NAME).value("true"));
+            out.write(InputBuilder.hidden().name(TableViewForm.DATA_SUBMIT_NAME).value("true"));
+            out.write(InputBuilder.hidden().name(TableViewForm.BULK_UPDATE_NAME).value("true"));
         }
     }
 
@@ -1848,8 +1848,7 @@ private void renderRecordSelector(RenderContext ctx, HtmlWriter out)
         boolean enabled = isRecordSelectorEnabled(ctx);
         boolean checked = isRecordSelectorChecked(ctx, checkboxValue);
 
-        new InputBuilder<>()
-            .type("checkbox")
+        InputBuilder.checkbox()
             .title("Select/unselect row")
             .name(getRecordSelectorName(ctx))
             .id(getRecordSelectorId(ctx))
@@ -2329,8 +2328,7 @@ private void renderForm(RenderContext ctx, HtmlWriter out)
                                         if (null != pkVal)
                                         {
                                             out.write(
-                                                new InputBuilder<>()
-                                                    .type("hidden")
+                                                InputBuilder.hidden()
                                                     .name(viewForm != null ? viewForm.getFormFieldName(pkCol) : pkColName)
                                                     .value(pkVal.toString())
                                             );
@@ -2515,8 +2513,7 @@ private HtmlWriter writeSameHeader(RenderContext ctx, HtmlWriter out, List<Displ
         TD(
             at(style, "white-space:nowrap;"),
             LABEL(cl("control-label"),
-                new InputBuilder<>()
-                    .type("checkbox")
+                InputBuilder.checkbox()
                     .id(madeId)
                     .name("~~SELECTALL~~")
                     .build(),
@@ -2572,7 +2569,7 @@ private void renderOldValues(HtmlWriter out, Map<String, Object> values)
         getTable().getPkColumnNames().forEach(name -> oldKeys.put(name, values.get(name)));
 
         out.write(
-            new InputBuilder<>().type("hidden").name(OLD_VALUES_NAME).value(new JSONObject(oldKeys).toString())
+            InputBuilder.hidden().name(OLD_VALUES_NAME).value(new JSONObject(oldKeys).toString())
         );
     }
 

api/src/org/labkey/api/data/DisplayColumn.java

@@ -36,7 +36,7 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.StringExpression;
 import org.labkey.api.util.StringExpressionFactory;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HttpView;
@@ -1163,9 +1163,8 @@ public String getFormFieldName(RenderContext ctx)
 
     protected void renderHiddenFormInput(HtmlWriter out, String formFieldName, Object value)
     {
-        out.write(new InputBuilder<>()
+        out.write(InputBuilder.hidden()
             .name(formFieldName)
-            .type("hidden")
             .value(null != value ? value.toString() : null));
     }
 

api/src/org/labkey/api/data/DisplayColumnGroup.java

@@ -17,7 +17,7 @@
 package org.labkey.api.data;
 
 import org.labkey.api.util.DOM;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.writer.HtmlWriter;
 
@@ -61,7 +61,7 @@ public void writeSameCheckboxCell(RenderContext ctx, HtmlWriter out)
             isCopyable() ? (DOM.Renderable) ret -> {
 
                 String id = getGroupFormFieldName(ctx) + "CheckBox";
-                new InputBuilder<>().type("checkbox").name(id).id(id).appendTo(out);
+                InputBuilder.checkbox().name(id).id(id).appendTo(out);
                 StringBuilder onChange = new StringBuilder("b = this.checked;");
 
                 // Index starts at 1 -- always leave the first column visible

api/src/org/labkey/api/data/JavaScriptDisplayColumn.java

@@ -20,7 +20,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.StringExpressionFactory;
 import org.labkey.api.view.template.ClientDependency;
 import org.labkey.api.writer.HtmlWriter;

api/src/org/labkey/api/data/MVDisplayColumn.java

@@ -20,7 +20,7 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.writer.HtmlWriter;
 
 import java.util.Set;

api/src/org/labkey/api/data/bigiron/AbstractClrInstallationManager.java

@@ -38,7 +38,7 @@
 import org.labkey.api.util.ExceptionUtil;
 import org.labkey.api.util.HelpTopic;
 import org.labkey.api.util.HtmlStringBuilder;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Path;
 import org.labkey.api.view.ActionURL;
@@ -51,9 +51,6 @@
 /**
  * Base class for handling installation of CLR Assemblies on SQL Server. Most methods/logic
  * were abstracted from what used to be in GroupConcatInstallationManager.
- *
- * User: tgaluhn
- * Date: 1/13/2017
  */
 public abstract class AbstractClrInstallationManager
 {
@@ -205,7 +202,7 @@ protected void addAdminWarningMessage(Warnings warnings, String text, Class<? ex
     {
         ActionURL downloadURL = new ActionURL(downloadActionClass, ContainerManager.getRoot());
         HtmlStringBuilder builder = HtmlStringBuilder.of(text + " ");
-        builder.append(new Link.LinkBuilder("Download installation script.").href(downloadURL).clearClasses().getHtmlString());
+        builder.append(LinkBuilder.simpleLink("Download installation script.", downloadURL));
 
         if (null != helpTopic)
             builder.append(" ").append(new HelpTopic(helpTopic).getSimpleLinkHtml("View installation instructions."));