Skip to content

Remove unused methods from DisplayColumn, refactor #229

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
merged 3 commits into from
Mar 18, 2025
Merged

Remove unused methods from DisplayColumn, refactor #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb16e78
Remove unused methods from DisplayColumn, refactor
labkey-adam Mar 12, 2025
6585d79
Migrate renderGridCellContents() and renderDetailsCellContents()
labkey-adam Mar 13, 2025
6f8141a
Fewer StackOverflowExceptions, please
labkey-adam Mar 13, 2025
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
13 changes: 7 additions & 6 deletions laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
import org.labkey.api.exp.api.ExperimentService;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.view.ActionURL;
import org.labkey.api.writer.HtmlWriter;

import java.io.IOException;
import java.io.Writer;
import static org.labkey.api.util.DOM.TD;
import static org.labkey.api.util.DOM.cl;

/**
* User: bimber
Expand Down Expand Up @@ -45,20 +46,20 @@ public String renderURL(RenderContext ctx)
}

@Override
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
{
Object value = getValue(ctx);
String url = renderURL(ctx);

if (value != null && url != null)
{
out.write(PageFlowUtil.link(value.toString()).href(url).target(_linkTarget).toString());
out.write(PageFlowUtil.link(value.toString()).href(url).target(_linkTarget));
}
}

@Override
public void renderGridHeaderCell(RenderContext ctx, Writer out, String headerClass) throws IOException
public void renderGridHeaderCell(RenderContext ctx, HtmlWriter out, String headerClass)
{
out.write("<td class=\"labkey-column-header\"></td>");
TD(cl("labkey-column-header")).appendTo(out);
}
}
10 changes: 4 additions & 6 deletions laboratory/src/org/labkey/laboratory/query/WorkbookIdDisplayColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
import org.labkey.api.data.ColumnInfo;
import org.labkey.api.data.DataColumn;
import org.labkey.api.data.RenderContext;

import java.io.IOException;
import java.io.Writer;
import org.labkey.api.writer.HtmlWriter;

/**
* User: bimber
Expand All @@ -20,9 +18,9 @@ public WorkbookIdDisplayColumn(ColumnInfo col)
}

@Override
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
{
//if the lookup is broken, dont render a value
//if the lookup is broken, don't render a value
Object dv = getDisplayValue(ctx);
if (dv == null || "".equals(dv))
return;
Expand All @@ -35,7 +33,7 @@ public Object getDisplayValue(RenderContext ctx)
{
Object ret = super.getDisplayValue(ctx);

//if the lookup is broken, dont render a value. note: return empty string so client API draws the distinction between deliberately empty and a genuine NULL value
//if the lookup is broken, don't render a value. note: return empty string so client API draws the distinction between deliberately empty and a genuine NULL value
return ret == null ? "" : ret;
}
}