From f3d0cee32ee2ffea1fc6f29abd3b0d29f61f3046 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 5 Oct 2010 11:52:42 -0700
Subject: [PATCH] Ah, simple typo. Now we work!

---
 .../todoroo/astrid/gtasks/GtasksTaskListUpdater.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
index bd127718f..4bdf9aedc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
@@ -92,9 +92,9 @@ public class GtasksTaskListUpdater {
     // --- task moving
 
     private static class Node {
-        public long taskId;
-        public Node parent;
-        public ArrayList<Node> children = new ArrayList<Node>();
+        public final long taskId;
+        public final Node parent;
+        public final ArrayList<Node> children = new ArrayList<Node>();
 
         public Node(long taskId, Node parent) {
             this.taskId = taskId;
@@ -116,14 +116,15 @@ public class GtasksTaskListUpdater {
         Node root = buildTreeModel(list);
         Node target = findNode(root, targetTaskId);
 
-        target.parent.children.remove(target);
 
         if(moveBeforeTaskId == -1) {
+            target.parent.children.remove(target);
             root.children.add(target);
         } else {
             Node sibling = findNode(root, moveBeforeTaskId);
             int index = sibling.parent.children.indexOf(sibling);
-            sibling.parent.children.add(index, sibling);
+            target.parent.children.remove(target);
+            sibling.parent.children.add(index, target);
         }
 
         traverseTreeAndWriteValues(root, new AtomicInteger(0), -1);
@@ -132,7 +133,6 @@ public class GtasksTaskListUpdater {
     private void traverseTreeAndWriteValues(Node node, AtomicInteger order, int indent) {
         if(node.taskId != -1) {
             Metadata metadata = gtasksMetadataService.getTaskMetadata(node.taskId);
-            System.err.println("task id " + node.taskId + ", order " + order.get());
             metadata.setValue(GtasksMetadata.ORDER, order.getAndIncrement());
             metadata.setValue(GtasksMetadata.INDENT, indent);
             metadata.setValue(GtasksMetadata.PARENT_TASK, node.parent.taskId);