Skip to content

Remove unused get/setInputPrefix() #835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 1 commit into from
Jan 24, 2025
Merged

Remove unused get/setInputPrefix() #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.jetbrains.annotations.NotNull;
import org.labkey.api.action.SpringActionController;
import org.labkey.api.collections.NamedObject;
import org.labkey.api.collections.NamedObjectList;
Expand Down Expand Up @@ -308,7 +309,7 @@ protected void renderFormEnd(RenderContext ctx, Writer out)
@Override
protected String getRecordSelectorName(RenderContext ctx)
{
// Bind select checkbox to ImportAnalyisForm.selectedSamples.select
// Bind select checkbox to ImportAnalysisForm.selectedSamples.select
String sampleId = ctx.get(SAMPLE_ID_FIELD_KEY, String.class);
return "selectedSamples.rows[" + sampleId + "].selected";
}
Expand Down Expand Up @@ -355,9 +356,8 @@ protected boolean isErrorRow(RenderContext ctx, int rowIndex)
}
}

private class MatchedFlagDisplayColumn extends SimpleDisplayColumn
private static class MatchedFlagDisplayColumn extends SimpleDisplayColumn
{

public MatchedFlagDisplayColumn()
{
super();
Expand Down Expand Up @@ -387,7 +387,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
}

// Simple lookup to list of original FlowFCSFiles
private class FCSFilesFilesForeignKey extends AbstractForeignKey
private static class FCSFilesFilesForeignKey extends AbstractForeignKey
{
private static final boolean INCLUDE_ALL_FILES = false;

Expand Down Expand Up @@ -423,13 +423,13 @@ public StringExpression getURL(ColumnInfo parent)
}

@Override
public NamedObjectList getSelectList(RenderContext ctx)
public @NotNull NamedObjectList getSelectList(RenderContext ctx)
{
List<FlowFCSFile> candidates = (List<FlowFCSFile>)ctx.get(CANDIDATE_FILES_FIELD_KEY, List.class);
if (candidates == null || candidates.isEmpty())
return _list;

// Put most likely canidates on the top of the list
// Put most likely candidates on the top of the list
Set<Integer> candidateRowIds = new HashSet<>(candidates.size());
NamedObjectList list = new NamedObjectList();
for (FlowFCSFile candidate : candidates)
Expand Down Expand Up @@ -480,10 +480,9 @@ protected String getSelectInputDisplayValue(NamedObject entry)
if (o instanceof String)
return (String)o;

if (!(o instanceof FlowFCSFile))
if (!(o instanceof FlowFCSFile file))
return null;

FlowFCSFile file = (FlowFCSFile)o;
ExpData data = file.getData();
FlowRun run = null;
if (data != null && data.getRunId() != null)
Expand Down Expand Up @@ -517,4 +516,3 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
}
}
}

3 changes: 1 addition & 2 deletions viability/src/org/labkey/viability/data/MultiValueInputColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public MultiValueInputColumn(ColumnInfo col, List<String> values)
@Override
public void renderInputHtml(RenderContext ctx, Writer out, Object value) throws IOException
{
String formFieldName = ctx.getForm().getFormFieldName(getColumnInfo());
String id = getInputPrefix() + formFieldName;
String id = ctx.getForm().getFormFieldName(getColumnInfo());

out.write("<div id=\"" + PageFlowUtil.filter(id) + "\" class=\"extContainer\"></div>");
out.write("<script text=\"text/javascript\" nonce=\"" + HttpView.currentPageConfig().getScriptNonce() + "\">\n");
Expand Down
Loading