archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Log type conversions in abstract model

Browse Source
pull/189/head
Alex Baker 12 years ago
parent c2d1b02761
commit 49dba7f57b
9 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File

16
api/src/main/java/com/todoroo/andlib/data/AbstractModel.java
Unescape Escape View File

@ -194,12 +194,13 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
*/ */
public synchronized <TYPE> TYPE getValue(Property<TYPE> property) { public synchronized <TYPE> TYPE getValue(Property<TYPE> property) {
Object value; Object value;
if(setValues != null && setValues.containsKey(property.getColumnName())) { String columnName = property.getColumnName();
value = setValues.get(property.getColumnName()); if(setValues != null && setValues.containsKey(columnName)) {
} else if(values != null && values.containsKey(property.getColumnName())) { value = setValues.get(columnName);
value = values.get(property.getColumnName()); } else if(values != null && values.containsKey(columnName)) {
} else if(getDefaultValues().containsKey(property.getColumnName())) { value = values.get(columnName);
value = getDefaultValues().get(property.getColumnName()); } else if(getDefaultValues().containsKey(columnName)) {
value = getDefaultValues().get(columnName);
} else { } else {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Model Error: Did not read property " + property.name); //$NON-NLS-1$ "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 // resolve properties that were retrieved with a different type than accessed
try { try {
if(value instanceof String && property instanceof LongProperty) { if(value instanceof String && property instanceof LongProperty) {
log.debug("{}={} stored as string instead of long", columnName, value);
return (TYPE) Long.valueOf((String) value); return (TYPE) Long.valueOf((String) value);
} else if(value instanceof String && property instanceof IntegerProperty) { } else if(value instanceof String && property instanceof IntegerProperty) {
log.debug("{}={} stored as string instead of int", columnName, value);
return (TYPE) Integer.valueOf((String) value); return (TYPE) Integer.valueOf((String) value);
} else if(value instanceof Integer && property instanceof LongProperty) { } 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) Long.valueOf(((Number) value).longValue());
} }
return (TYPE) value; return (TYPE) value;

2
api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
Unescape Escape View File

@ -10,8 +10,6 @@ import android.content.BroadcastReceiver;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Bundle; import android.os.Bundle;
import android.text.InputType; import android.text.InputType;
import android.view.MotionEvent; import android.view.MotionEvent;

4
api/src/main/java/com/todoroo/astrid/data/Task.java
Unescape Escape View File

@ -234,7 +234,7 @@ public class Task extends RemoteModel {
static { static {
defaultValues.put(TITLE.name, ""); defaultValues.put(TITLE.name, "");
defaultValues.put(DUE_DATE.name, 0); defaultValues.put(DUE_DATE.name, 0L);
defaultValues.put(HIDE_UNTIL.name, 0); defaultValues.put(HIDE_UNTIL.name, 0);
defaultValues.put(COMPLETION_DATE.name, 0); defaultValues.put(COMPLETION_DATE.name, 0);
defaultValues.put(DELETION_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(CALENDAR_URI.name, "");
defaultValues.put(RECURRENCE.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_PERIOD.name, 0);
defaultValues.put(REMINDER_FLAGS.name, 0); defaultValues.put(REMINDER_FLAGS.name, 0);
defaultValues.put(REMINDER_LAST.name, 0); defaultValues.put(REMINDER_LAST.name, 0);

2
astrid/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java
Unescape Escape View File

@ -231,7 +231,7 @@ public class AdvancedRepeatTest extends AndroidTestCase {
} }
private void setRRuleDays(RRule rrule, Weekday... weekdays) { private void setRRuleDays(RRule rrule, Weekday... weekdays) {
ArrayList<WeekdayNum> days = new ArrayList<WeekdayNum>(); ArrayList<WeekdayNum> days = new ArrayList<>();
for(Weekday wd : weekdays) for(Weekday wd : weekdays)
days.add(new WeekdayNum(0, wd)); days.add(new WeekdayNum(0, wd));
rrule.setByDay(days); rrule.setByDay(days);

3
astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java
Unescape Escape View File

@ -3,7 +3,6 @@
*/ */
package com.todoroo.astrid.activity; package com.todoroo.astrid.activity;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; 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.TaskCreator;
import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.service.TaskService;
import org.tasks.injection.ForApplication;
import javax.inject.Inject; import javax.inject.Inject;
/** /**

1
astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
Unescape Escape View File

@ -9,7 +9,6 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle; import android.os.Bundle;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;

2
astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java
Unescape Escape View File

@ -6,7 +6,6 @@
package com.todoroo.astrid.dao; package com.todoroo.astrid.dao;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Intent;
import android.database.sqlite.SQLiteConstraintException; import android.database.sqlite.SQLiteConstraintException;
import com.todoroo.andlib.data.Property; 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.Functions;
import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskApiDao; import com.todoroo.astrid.data.TaskApiDao;

1
astrid/src/main/java/com/todoroo/astrid/service/TaskDuplicator.java
Unescape Escape View File

@ -33,7 +33,6 @@ public class TaskDuplicator {
Task original = new Task(); Task original = new Task();
original.setId(itemId); original.setId(itemId);
Task clone = clone(original); Task clone = clone(original);
String userId = clone.getUserID();
clone.setCreationDate(DateUtilities.now()); clone.setCreationDate(DateUtilities.now());
clone.setCompletionDate(0L); clone.setCompletionDate(0L);
clone.setDeletionDate(0L); clone.setDeletionDate(0L);

2
astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java
Unescape Escape View File

@ -342,7 +342,7 @@ public class DraggableListView extends ListView {
} catch (InterruptedException e) { } catch (InterruptedException e) {
// bye! // bye!
log.error(e.getMessage(), e); log.debug(e.getMessage(), e);
} }
} }
} }

Write Preview
Loading…
Cancel
Save