Renamed adjustedSqlQuery in Filter to filterOverride to be more descriptive

pull/14/head
Sam Bosley 12 years ago
parent 872ae3edf1
commit 8d2c19c859

@ -60,7 +60,7 @@ public class Filter extends FilterListItem {
* Field for holding a modified sqlQuery based on sqlQuery. Useful for adjusting * Field for holding a modified sqlQuery based on sqlQuery. Useful for adjusting
* query for sort/subtasks without breaking the equality checking based on sqlQuery. * query for sort/subtasks without breaking the equality checking based on sqlQuery.
*/ */
protected String adjustedSqlQuery; protected String filterOverride;
/** /**
* Values to apply to a task when quick-adding a task from this filter. * Values to apply to a task when quick-adding a task from this filter.
@ -105,13 +105,13 @@ public class Filter extends FilterListItem {
this.listingTitle = listingTitle; this.listingTitle = listingTitle;
this.title = title; this.title = title;
this.sqlQuery = sqlQuery; this.sqlQuery = sqlQuery;
this.adjustedSqlQuery = null; this.filterOverride = null;
this.valuesForNewTasks = valuesForNewTasks; this.valuesForNewTasks = valuesForNewTasks;
} }
public String getSqlQuery() { public String getSqlQuery() {
if (adjustedSqlQuery != null) if (filterOverride != null)
return adjustedSqlQuery; return filterOverride;
return sqlQuery; return sqlQuery;
} }
@ -119,8 +119,8 @@ public class Filter extends FilterListItem {
this.sqlQuery = sqlQuery; this.sqlQuery = sqlQuery;
} }
public void setAdjustedSqlQuery(String adjustedSqlQuery) { public void setFilterOverrideQuery(String filterOverride) {
this.adjustedSqlQuery = adjustedSqlQuery; this.filterOverride = filterOverride;
} }
/** /**

@ -109,7 +109,7 @@ public class SubtasksUpdater extends OrderedListUpdater<String> {
query = query.replace(TaskCriteria.isVisible().toString(), query = query.replace(TaskCriteria.isVisible().toString(),
Criterion.all.toString()); Criterion.all.toString());
filter.setAdjustedSqlQuery(query); filter.setFilterOverrideQuery(query);
} }
} }

Loading…
Cancel
Save