scoping

astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java

@@ -157,6 +157,7 @@ public class CustomFilterActivity extends ListActivity {
         Resources r = getResources();
 
         // built in criteria: due date
+        {
             String[] entryValues = new String[] {
                     "0",
                     PermaSql.VALUE_EOD_YESTERDAY,
@@ -182,9 +183,11 @@ public class CustomFilterActivity extends ListActivity {
                     entryValues, ((BitmapDrawable)r.getDrawable(R.drawable.tango_calendar)).getBitmap(),
                     getString(R.string.CFC_dueBefore_name));
             criteria.add(criterion);
+        }
 
         // built in criteria: importance
-        entryValues = new String[] {
+        {
+            String[] entryValues = new String[] {
                             Integer.toString(Task.IMPORTANCE_DO_OR_DIE),
                             Integer.toString(Task.IMPORTANCE_MUST_DO),
                             Integer.toString(Task.IMPORTANCE_SHOULD_DO),
@@ -193,9 +196,9 @@ public class CustomFilterActivity extends ListActivity {
             String[] entries = new String[] {
                     "!!!!", "!!!", "!!", "!"
             };
-        values = new ContentValues();
+            ContentValues values = new ContentValues();
             values.put(Task.IMPORTANCE.name, "?");
-        criterion = new MultipleSelectCriterion(
+            CustomFilterCriterion criterion = new MultipleSelectCriterion(
                     IDENTIFIER_IMPORTANCE,
                     getString(R.string.CFC_importance_text),
                     Query.select(Task.ID).from(Task.TABLE).where(
@@ -205,17 +208,19 @@ public class CustomFilterActivity extends ListActivity {
                     entryValues, ((BitmapDrawable)r.getDrawable(R.drawable.tango_warning)).getBitmap(),
                     getString(R.string.CFC_importance_name));
             criteria.add(criterion);
+        }
 
         // built in criteria: tags
+        {
             Tag[] tags = TagService.getInstance().getGroupedTags(TagService.GROUPED_TAGS_BY_SIZE,
                             TaskCriteria.activeAndVisible());
             String[] tagNames = new String[tags.length];
             for(int i = 0; i < tags.length; i++)
                 tagNames[i] = tags[i].tag;
-        values = new ContentValues();
+            ContentValues values = new ContentValues();
             values.put(Metadata.KEY.name, TagService.KEY);
             values.put(TagService.TAG.name, "?");
-        criterion = new MultipleSelectCriterion(
+            CustomFilterCriterion criterion = new MultipleSelectCriterion(
                     IDENTIFIER_TAG,
                     getString(R.string.CFC_tag_text),
                     Query.select(Metadata.TASK).from(Metadata.TABLE).join(Join.inner(
@@ -227,9 +232,11 @@ public class CustomFilterActivity extends ListActivity {
                     ((BitmapDrawable)r.getDrawable(R.drawable.filter_tags1)).getBitmap(),
                     getString(R.string.CFC_tag_name));
             criteria.add(criterion);
+        }
 
         // built in criteria: tags containing X
-        criterion = new TextInputCriterion(
+        {
+            CustomFilterCriterion criterion = new TextInputCriterion(
                             IDENTIFIER_TAG,
                             getString(R.string.CFC_tag_contains_text),
                             Query.select(Metadata.TASK).from(Metadata.TABLE).join(Join.inner(
@@ -241,11 +248,13 @@ public class CustomFilterActivity extends ListActivity {
                                             ((BitmapDrawable)r.getDrawable(R.drawable.filter_tags2)).getBitmap(),
                                             getString(R.string.CFC_tag_contains_name));
             criteria.add(criterion);
+        }
 
         // built in criteria: title containing X
-        values = new ContentValues();
+        {
+            ContentValues values = new ContentValues();
             values.put(Task.TITLE.name, "?");
-        criterion = new TextInputCriterion(
+            CustomFilterCriterion criterion = new TextInputCriterion(
                     IDENTIFIER_TAG,
                     getString(R.string.CFC_title_contains_text),
                     Query.select(Task.ID).from(Task.TABLE).where(
@@ -255,6 +264,7 @@ public class CustomFilterActivity extends ListActivity {
                         ((BitmapDrawable)r.getDrawable(R.drawable.tango_alpha)).getBitmap(),
                         getString(R.string.CFC_title_contains_name));
             criteria.add(criterion);
+        }
 
     }