From 8d2c19c8592b76bbcc8b07e5d837177fe1c13817 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 9 Apr 2012 15:37:56 -0700 Subject: [PATCH] Renamed adjustedSqlQuery in Filter to filterOverride to be more descriptive --- api/src/com/todoroo/astrid/api/Filter.java | 12 ++++++------ .../com/todoroo/astrid/subtasks/SubtasksUpdater.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/src/com/todoroo/astrid/api/Filter.java b/api/src/com/todoroo/astrid/api/Filter.java index 8d082b4c2..3e6b2960f 100644 --- a/api/src/com/todoroo/astrid/api/Filter.java +++ b/api/src/com/todoroo/astrid/api/Filter.java @@ -60,7 +60,7 @@ public class Filter extends FilterListItem { * Field for holding a modified sqlQuery based on sqlQuery. Useful for adjusting * 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. @@ -105,13 +105,13 @@ public class Filter extends FilterListItem { this.listingTitle = listingTitle; this.title = title; this.sqlQuery = sqlQuery; - this.adjustedSqlQuery = null; + this.filterOverride = null; this.valuesForNewTasks = valuesForNewTasks; } public String getSqlQuery() { - if (adjustedSqlQuery != null) - return adjustedSqlQuery; + if (filterOverride != null) + return filterOverride; return sqlQuery; } @@ -119,8 +119,8 @@ public class Filter extends FilterListItem { this.sqlQuery = sqlQuery; } - public void setAdjustedSqlQuery(String adjustedSqlQuery) { - this.adjustedSqlQuery = adjustedSqlQuery; + public void setFilterOverrideQuery(String filterOverride) { + this.filterOverride = filterOverride; } /** diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java index 22b06ba8c..594236ec4 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java @@ -109,7 +109,7 @@ public class SubtasksUpdater extends OrderedListUpdater { query = query.replace(TaskCriteria.isVisible().toString(), Criterion.all.toString()); - filter.setAdjustedSqlQuery(query); + filter.setFilterOverrideQuery(query); } }