Skip to content

Misc code cleanup - improve generics #230

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-jeckels merged 1 commit into from
Mar 20, 2025
+7 −8
Merged

Misc code cleanup - improve generics #230

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
15 changes: 7 additions & 8 deletions LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@
* Date: 4/2/13
* Time: 2:54 PM
*/
abstract public class AbstractDataDefinedTable extends CustomPermissionsTable
abstract public class AbstractDataDefinedTable<SchemaType extends UserSchema> extends CustomPermissionsTable<SchemaType>
{
protected String _pk;

protected String _filterColumn;
protected String _filterValue;
protected String _valueColumn;

public AbstractDataDefinedTable(UserSchema schema, SchemaTableInfo table, ContainerFilter cf, String filterColumn, String valueColumn, String tableName, String filterValue)
public AbstractDataDefinedTable(SchemaType schema, SchemaTableInfo table, ContainerFilter cf, String filterColumn, String valueColumn, String tableName, String filterValue)
{
super(schema, table, cf);
_filterColumn = filterColumn;
Expand All @@ -77,23 +77,23 @@ public AbstractDataDefinedTable(UserSchema schema, SchemaTableInfo table, Contai
}

@Override
public CustomPermissionsTable init()
public CustomPermissionsTable<SchemaType> init()
{
super.init();

ColumnInfo col = getRealTable().getColumn(_filterColumn);
addCondition(col, _filterValue); //enforce only showing rows from this category

List<String> pks = getRealTable().getPkColumnNames();
assert pks.size() > 0;
assert !pks.isEmpty();
_pk = pks.get(0);

var valueCol = getMutableColumn(_valueColumn);
assert valueCol != null;

valueCol.setKeyField(true);
valueCol.setNullable(false);
getMutableColumn(_pk).setKeyField(false);
getMutableColumnOrThrow(_pk).setKeyField(false);

ColumnInfo filterCol = getColumn(_filterColumn);
assert filterCol != null;
Expand Down Expand Up @@ -135,7 +135,7 @@ protected class UpdateService extends SimpleQueryUpdateService
{
private final ValuesManager _vm;

public UpdateService(SimpleUserSchema.SimpleTable ti)
public UpdateService(SimpleUserSchema.SimpleTable<SchemaType> ti)
{
super(ti, ti.getRealTable());

Expand Down Expand Up @@ -217,8 +217,7 @@ public boolean testIfRowExists(String value)
{
boolean ret = _distinctValues.contains(value);

if (!_distinctValues.contains(value))
_distinctValues.add(value);
_distinctValues.add(value);

return ret;
}
Expand Down