From c6a0349fb96dc8376cb339ab8858b864cdf410f0 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Wed, 22 Jan 2025 16:32:53 -0800 Subject: [PATCH 1/2] Remove unused get/setInputPrefix() --- api/src/org/labkey/api/data/DisplayColumn.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api/src/org/labkey/api/data/DisplayColumn.java b/api/src/org/labkey/api/data/DisplayColumn.java index 8c654821bf0..a93eeaf41f9 100644 --- a/api/src/org/labkey/api/data/DisplayColumn.java +++ b/api/src/org/labkey/api/data/DisplayColumn.java @@ -336,6 +336,9 @@ public String getName() protected String getInputPrefix() { + if (!_inputPrefix.isEmpty()) + throw new IllegalStateException("Input prefix is set to an unexpected value: " + _inputPrefix); + return _inputPrefix; } From 967de29fd2ae72ba0c3e8b240ce2a9d229b7777a Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Fri, 24 Jan 2025 12:11:44 -0800 Subject: [PATCH 2/2] Remove get/setInputPrefix() --- .../api/data/AbstractFileDisplayColumn.java | 3 +- api/src/org/labkey/api/data/DataColumn.java | 88 +++++++++---------- api/src/org/labkey/api/data/DataRegion.java | 21 ----- .../org/labkey/api/data/DisplayColumn.java | 58 ++++-------- .../api/data/DisplayColumnDecorator.java | 12 --- api/src/org/labkey/api/data/JdbcType.java | 14 +-- api/src/org/labkey/api/view/DetailsView.java | 5 +- .../view/TypeAheadSelectDisplayColumn.java | 2 +- .../mothership/AssignedToDisplayColumn.java | 6 +- 9 files changed, 73 insertions(+), 136 deletions(-) diff --git a/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java b/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java index d4bfc869c23..4fd3d7036ec 100644 --- a/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java +++ b/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java @@ -266,7 +266,7 @@ public void renderInputHtml(RenderContext ctx, Writer out, Object value) throws Input.InputBuilder input = new Input.InputBuilder() .type("file") - .name(getInputPrefix() + formFieldName) + .name(formFieldName) .disabled(isDisabledInput(ctx)) .needsWrapping(false); @@ -288,7 +288,6 @@ public void renderInputHtml(RenderContext ctx, Writer out, Object value) throws /** * Enable subclasses to override the warning text * @param filename being displayed - * @return */ protected String getRemovalWarningText(String filename) { diff --git a/api/src/org/labkey/api/data/DataColumn.java b/api/src/org/labkey/api/data/DataColumn.java index 62287ca4df1..5f46fbc780c 100644 --- a/api/src/org/labkey/api/data/DataColumn.java +++ b/api/src/org/labkey/api/data/DataColumn.java @@ -103,9 +103,7 @@ public DataColumn(ColumnInfo col, boolean withLookups) { _width = _displayColumn.getWidth(); } - StringExpression url = withLookups ? - _boundColumn.getEffectiveURL() : - _boundColumn.getURL(); + StringExpression url = withLookups ? _boundColumn.getEffectiveURL() : _boundColumn.getURL(); if (null != url) super.setURLExpression(url); setLinkTarget(_boundColumn.getURLTargetWindow()); @@ -129,7 +127,6 @@ public DataColumn(ColumnInfo col, boolean withLookups) else _inputType = "select"; } - } catch (QueryParseException qpe) { @@ -143,7 +140,6 @@ public DataColumn(ColumnInfo col, boolean withLookups) _caption = StringExpressionFactory.create(_boundColumn.getLabel()); _editable = !_boundColumn.isReadOnly() && _boundColumn.isUserEditable(); _textAlign = _displayColumn.getTextAlign(); - } @@ -282,7 +278,7 @@ public void addQueryColumns(Set columns) @Override public boolean isSortable() { - return _sortFieldKeys != null && _sortFieldKeys.size() > 0; + return _sortFieldKeys != null && !_sortFieldKeys.isEmpty(); } @Override @@ -718,9 +714,9 @@ private void renderSelectFormInput( ) throws IOException { Select.SelectBuilder select = new Select.SelectBuilder() - .disabled(disabledInput) - .multiple("select.multiple".equalsIgnoreCase(_inputType)) - .name(getInputPrefix() + formFieldName); + .disabled(disabledInput) + .multiple("select.multiple".equalsIgnoreCase(_inputType)) + .name(formFieldName); List