From 49dba7f57bfdf879bd1eeea65b720e12d824fb7c Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 25 Jun 2014 09:24:06 -0500 Subject: [PATCH] Log type conversions in abstract model --- .../com/todoroo/andlib/data/AbstractModel.java | 16 ++++++++++------ .../todoroo/andlib/utility/AndroidUtilities.java | 2 -- .../main/java/com/todoroo/astrid/data/Task.java | 4 ++-- .../astrid/repeats/AdvancedRepeatTest.java | 2 +- .../astrid/activity/ShareLinkActivity.java | 3 --- .../todoroo/astrid/core/CustomFilterExposer.java | 1 - .../java/com/todoroo/astrid/dao/TaskDao.java | 2 -- .../todoroo/astrid/service/TaskDuplicator.java | 1 - .../com/todoroo/astrid/ui/DraggableListView.java | 2 +- 9 files changed, 14 insertions(+), 19 deletions(-) diff --git a/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java b/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java index 38f268efd..63d2f9e09 100644 --- a/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java +++ b/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java @@ -194,12 +194,13 @@ public abstract class AbstractModel implements Parcelable, Cloneable { */ public synchronized TYPE getValue(Property property) { Object value; - if(setValues != null && setValues.containsKey(property.getColumnName())) { - value = setValues.get(property.getColumnName()); - } else if(values != null && values.containsKey(property.getColumnName())) { - value = values.get(property.getColumnName()); - } else if(getDefaultValues().containsKey(property.getColumnName())) { - value = getDefaultValues().get(property.getColumnName()); + String columnName = property.getColumnName(); + if(setValues != null && setValues.containsKey(columnName)) { + value = setValues.get(columnName); + } else if(values != null && values.containsKey(columnName)) { + value = values.get(columnName); + } else if(getDefaultValues().containsKey(columnName)) { + value = getDefaultValues().get(columnName); } else { throw new UnsupportedOperationException( "Model Error: Did not read property " + property.name); //$NON-NLS-1$ @@ -208,10 +209,13 @@ public abstract class AbstractModel implements Parcelable, Cloneable { // resolve properties that were retrieved with a different type than accessed try { if(value instanceof String && property instanceof LongProperty) { + log.debug("{}={} stored as string instead of long", columnName, value); return (TYPE) Long.valueOf((String) value); } else if(value instanceof String && property instanceof IntegerProperty) { + log.debug("{}={} stored as string instead of int", columnName, value); return (TYPE) Integer.valueOf((String) value); } else if(value instanceof Integer && property instanceof LongProperty) { + log.debug("{}={} stored as int instead of long", columnName, value); return (TYPE) Long.valueOf(((Number) value).longValue()); } return (TYPE) value; diff --git a/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java index 2ec937507..36d452300 100644 --- a/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java @@ -10,8 +10,6 @@ import android.content.BroadcastReceiver; import android.content.ContentValues; import android.content.Context; import android.content.Intent; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.os.Bundle; import android.text.InputType; import android.view.MotionEvent; diff --git a/api/src/main/java/com/todoroo/astrid/data/Task.java b/api/src/main/java/com/todoroo/astrid/data/Task.java index b6fc5a50d..9a6a02c04 100644 --- a/api/src/main/java/com/todoroo/astrid/data/Task.java +++ b/api/src/main/java/com/todoroo/astrid/data/Task.java @@ -234,7 +234,7 @@ public class Task extends RemoteModel { static { defaultValues.put(TITLE.name, ""); - defaultValues.put(DUE_DATE.name, 0); + defaultValues.put(DUE_DATE.name, 0L); defaultValues.put(HIDE_UNTIL.name, 0); defaultValues.put(COMPLETION_DATE.name, 0); defaultValues.put(DELETION_DATE.name, 0); @@ -242,7 +242,7 @@ public class Task extends RemoteModel { defaultValues.put(CALENDAR_URI.name, ""); defaultValues.put(RECURRENCE.name, ""); - defaultValues.put(REPEAT_UNTIL.name, 0); + defaultValues.put(REPEAT_UNTIL.name, 0L); defaultValues.put(REMINDER_PERIOD.name, 0); defaultValues.put(REMINDER_FLAGS.name, 0); defaultValues.put(REMINDER_LAST.name, 0); diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java index 95a546bd2..e7ef2dad9 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java @@ -231,7 +231,7 @@ public class AdvancedRepeatTest extends AndroidTestCase { } private void setRRuleDays(RRule rrule, Weekday... weekdays) { - ArrayList days = new ArrayList(); + ArrayList days = new ArrayList<>(); for(Weekday wd : weekdays) days.add(new WeekdayNum(0, wd)); rrule.setByDay(days); diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java index 9b7fa935f..15145b930 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java @@ -3,7 +3,6 @@ */ package com.todoroo.astrid.activity; -import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -11,8 +10,6 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.TaskCreator; import com.todoroo.astrid.service.TaskService; -import org.tasks.injection.ForApplication; - import javax.inject.Inject; /** diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java index b801ef191..33cc6c370 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java @@ -9,7 +9,6 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.res.Resources; -import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; import com.todoroo.andlib.data.TodorooCursor; diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java index e6f99fffc..5a8b3be76 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.dao; import android.content.ContentValues; -import android.content.Intent; import android.database.sqlite.SQLiteConstraintException; import com.todoroo.andlib.data.Property; @@ -15,7 +14,6 @@ import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Functions; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskApiDao; diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TaskDuplicator.java b/astrid/src/main/java/com/todoroo/astrid/service/TaskDuplicator.java index 6b572cdc2..a4e82c2b1 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/TaskDuplicator.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/TaskDuplicator.java @@ -33,7 +33,6 @@ public class TaskDuplicator { Task original = new Task(); original.setId(itemId); Task clone = clone(original); - String userId = clone.getUserID(); clone.setCreationDate(DateUtilities.now()); clone.setCompletionDate(0L); clone.setDeletionDate(0L); diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java b/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java index 17dbf7c90..0e36e9a99 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java @@ -342,7 +342,7 @@ public class DraggableListView extends ListView { } catch (InterruptedException e) { // bye! - log.error(e.getMessage(), e); + log.debug(e.getMessage(), e); } } }