Fixed more snafu's. Lots of snafu's today.

astrid/common-src/com/todoroo/andlib/data/GenericDao.java

@@ -24,7 +24,7 @@ import com.todoroo.andlib.sql.Query;
  */
 public class GenericDao<TYPE extends AbstractModel> {
 
-    private Class<TYPE> modelClass;
+    private final Class<TYPE> modelClass;
 
     private Table table;
 
@@ -133,14 +133,14 @@ public class GenericDao<TYPE extends AbstractModel> {
      */
     public boolean persist(AbstractModel item) {
         if (item.getId() == AbstractModel.NO_ID) {
-            return createItem(item);
+            return createNew(item);
         } else {
             ContentValues values = item.getSetValues();
 
             if (values.size() == 0) // nothing changed
                 return true;
 
-            return saveItem(item);
+            return saveExisting(item);
         }
     }
 
@@ -154,7 +154,7 @@ public class GenericDao<TYPE extends AbstractModel> {
      *            item model
      * @return returns true on success.
      */
-    public boolean createItem(AbstractModel item) {
+    public boolean createNew(AbstractModel item) {
         long newRow = database.getDatabase().insert(table.name,
                 AbstractModel.ID_PROPERTY.name, item.getMergedValues());
         item.setId(newRow);
@@ -162,7 +162,7 @@ public class GenericDao<TYPE extends AbstractModel> {
     }
 
     /**
-     * Saves the given item.
+     * Saves the given item. Will not create a new item!
      *
      * @param database
      * @param table
@@ -171,7 +171,7 @@ public class GenericDao<TYPE extends AbstractModel> {
      *            item model
      * @return returns true on success.
      */
-    public boolean saveItem(AbstractModel item) {
+    public boolean saveExisting(AbstractModel item) {
         ContentValues values = item.getSetValues();
         if(values.size() == 0) // nothing changed
             return true;

astrid/plugin-src/com/todoroo/astrid/alarms/AlarmService.java

@@ -53,7 +53,7 @@ public class AlarmService {
         for(Alarm alarm : alarms) {
             alarm.setId(Alarm.NO_ID);
             alarm.setValue(Alarm.TASK, taskId);
-            dao.saveItem(alarm);
+            dao.saveExisting(alarm);
         }
     }
 }

astrid/plugin-src/com/todoroo/astrid/tags/TagService.java

@@ -155,7 +155,7 @@ public class TagService {
         metadata.setValue(Metadata.TASK, taskId);
         for(String tag : tags) {
             metadata.setValue(Metadata.VALUE, tag.trim());
-            metadataDao.createItem(metadata);
+            metadataDao.createNew(metadata);
         }
     }
 }

astrid/src/com/todoroo/astrid/activity/TaskListActivity.java

@@ -256,7 +256,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener {
                 for(Entry<String, Object> item : forMetadata.valueSet()) {
                     metadata.setValue(Metadata.TASK, task.getId());
                     metadata.setValue(Metadata.KEY, item.getKey());
-                    metadata.setValue(Metadata.VALUE, item.toString());
+                    metadata.setValue(Metadata.VALUE, item.getValue().toString());
                     metadataService.save(metadata);
                     metadata.clear();
                 }

astrid/src/com/todoroo/astrid/dao/TaskDao.java

@@ -135,13 +135,13 @@ public class TaskDao extends GenericDao<Task> {
         boolean saveSuccessful;
 
         if (task.getId() == Task.NO_ID) {
-            saveSuccessful = createItem(task);
+            saveSuccessful = createNew(task);
         } else {
             ContentValues values = task.getSetValues();
             if(values.size() == 0)
                 return true;
             beforeSave(task, values, duringSync);
-            saveSuccessful = saveItem(task);
+            saveSuccessful = saveExisting(task);
             afterSave(task, values, duringSync);
         }
 
@@ -152,17 +152,17 @@ public class TaskDao extends GenericDao<Task> {
     }
 
     @Override
-    public boolean createItem(AbstractModel item) {
+    public boolean createNew(AbstractModel item) {
         if(!item.containsValue(Task.CREATION_DATE))
             item.setValue(Task.CREATION_DATE, DateUtilities.now());
         item.setValue(Task.MODIFICATION_DATE, DateUtilities.now());
-        return super.createItem(item);
+        return super.createNew(item);
     }
 
     @Override
-    public boolean saveItem(AbstractModel item) {
+    public boolean saveExisting(AbstractModel item) {
         item.setValue(Task.MODIFICATION_DATE, DateUtilities.now());
-        return super.saveItem(item);
+        return super.saveExisting(item);
     }
 
     /**

astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java

@@ -274,7 +274,7 @@ public class Astrid2To3UpgradeHelper {
                             container.upgradeNotes);
                 }
             }
-            dao.createItem(container.model);
+            dao.createNew(container.model);
         }
 
         upgradeDb.close();
@@ -331,7 +331,7 @@ public class Astrid2To3UpgradeHelper {
                 metadata.setValue(Metadata.TASK, task);
                 metadata.setValue(Metadata.KEY, TagService.KEY);
                 metadata.setValue(Metadata.VALUE, tag);
-                metadataDao.createItem(metadata);
+                metadataDao.createNew(metadata);
                 metadata.clearValue(Metadata.ID);
             }
         }

astrid/src/com/todoroo/astrid/service/MetadataService.java

@@ -88,6 +88,6 @@ public class MetadataService {
      * @param metadata
      */
     public void save(Metadata metadata) {
-        metadataDao.saveItem(metadata);
+        metadataDao.persist(metadata);
     }
 }