From 053ef047bdb0ae55a3b0a4fff0159b5f5631f1a1 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 19 Jul 2014 02:16:41 -0500 Subject: [PATCH] Move OrderedMetadataListUpdater to gtasks package --- .../com/todoroo/astrid/gtasks/GtasksListFragment.java | 1 - .../com/todoroo/astrid/gtasks/GtasksMetadataService.java | 2 +- .../com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java | 1 - .../OrderedMetadataListFragmentHelper.java | 9 ++++----- .../{subtasks => gtasks}/OrderedMetadataListUpdater.java | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) rename astrid/src/main/java/com/todoroo/astrid/{subtasks => gtasks}/OrderedMetadataListFragmentHelper.java (96%) rename astrid/src/main/java/com/todoroo/astrid/{subtasks => gtasks}/OrderedMetadataListUpdater.java (99%) diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java index f82756c84..c61b4aa12 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java @@ -32,7 +32,6 @@ import com.todoroo.astrid.service.SyncV2Service; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.subtasks.AstridOrderedListFragmentHelper; import com.todoroo.astrid.subtasks.OrderedListFragmentHelperInterface; -import com.todoroo.astrid.subtasks.OrderedMetadataListFragmentHelper; import org.tasks.R; import org.tasks.injection.ForActivity; diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java index e8da63710..b6361a168 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java @@ -22,7 +22,7 @@ import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.gtasks.sync.GtasksTaskContainer; -import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListIterator; +import com.todoroo.astrid.gtasks.OrderedMetadataListUpdater.OrderedListIterator; import java.util.ArrayList; import java.util.HashSet; diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java index ed842bf04..21daeff87 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java @@ -19,7 +19,6 @@ import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.gtasks.sync.GtasksSyncService; -import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java similarity index 96% rename from astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java index e6a4f7f63..35cafa825 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java @@ -3,7 +3,7 @@ * * See the file "LICENSE" for the full license governing this code. */ -package com.todoroo.astrid.subtasks; +package com.todoroo.astrid.gtasks; import android.app.Activity; import android.database.Cursor; @@ -28,8 +28,7 @@ import com.todoroo.astrid.dao.TaskAttachmentDao; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.TaskService; -import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.Node; -import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListNodeVisitor; +import com.todoroo.astrid.subtasks.OrderedListFragmentHelperInterface; import com.todoroo.astrid.ui.DraggableListView; import org.slf4j.Logger; @@ -238,9 +237,9 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm final ArrayList chained = new ArrayList<>(); final int parentIndent = item.getValue(updater.indentProperty()); - updater.applyToChildren(list, itemId, new OrderedListNodeVisitor() { + updater.applyToChildren(list, itemId, new OrderedMetadataListUpdater.OrderedListNodeVisitor() { @Override - public void visitNode(Node node) { + public void visitNode(OrderedMetadataListUpdater.Node node) { Task childTask = taskService.fetchById(node.taskId, Task.RECURRENCE); if(!TextUtils.isEmpty(childTask.getRecurrence())) { Metadata metadata = updater.getTaskMetadata(node.taskId); diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java similarity index 99% rename from astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java index bbbcbc6ab..b3ec8f095 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java @@ -3,7 +3,7 @@ * * See the file "LICENSE" for the full license governing this code. */ -package com.todoroo.astrid.subtasks; +package com.todoroo.astrid.gtasks; import com.todoroo.andlib.data.Property.IntegerProperty; import com.todoroo.andlib.data.Property.LongProperty;