From 1a151f78914e1db4269a39d272bdad1f54cc873b Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Thu, 20 Sep 2012 16:56:24 -0700 Subject: [PATCH] Some stubs for client/server messaging --- .../todoroo/astrid/data/OutstandingEntry.java | 2 +- .../todoroo/astrid/data/TagOutstanding.java | 2 +- .../todoroo/astrid/data/TaskOutstanding.java | 2 +- .../astrid/actfm/sync/messages/BriefMe.java | 5 ++++ .../actfm/sync/messages/ChangesHappened.java | 24 +++++++++++++++++++ .../sync/messages/ClientToServerMessage.java | 5 ++++ .../sync/messages/RequestDoubleCheck.java | 5 ++++ .../sync/messages/ServerToClientMessage.java | 5 ++++ 8 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/BriefMe.java create mode 100644 astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java create mode 100644 astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java create mode 100644 astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java create mode 100644 astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java diff --git a/api/src/com/todoroo/astrid/data/OutstandingEntry.java b/api/src/com/todoroo/astrid/data/OutstandingEntry.java index 698e293f0..879281869 100644 --- a/api/src/com/todoroo/astrid/data/OutstandingEntry.java +++ b/api/src/com/todoroo/astrid/data/OutstandingEntry.java @@ -5,7 +5,7 @@ import com.todoroo.andlib.data.Property.LongProperty; import com.todoroo.andlib.data.Property.StringProperty; @SuppressWarnings("nls") -public abstract class OutstandingEntry extends AbstractModel { +public abstract class OutstandingEntry extends AbstractModel { public static final String ENTITY_ID_PROPERTY_NAME = "entityId"; diff --git a/api/src/com/todoroo/astrid/data/TagOutstanding.java b/api/src/com/todoroo/astrid/data/TagOutstanding.java index 2f518c44c..a1198362a 100644 --- a/api/src/com/todoroo/astrid/data/TagOutstanding.java +++ b/api/src/com/todoroo/astrid/data/TagOutstanding.java @@ -9,7 +9,7 @@ import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.data.Table; @SuppressWarnings("nls") -public class TagOutstanding extends OutstandingEntry { +public class TagOutstanding extends OutstandingEntry { /** table for this model */ public static final Table TABLE = new Table("tags_outstanding", TagOutstanding.class); diff --git a/api/src/com/todoroo/astrid/data/TaskOutstanding.java b/api/src/com/todoroo/astrid/data/TaskOutstanding.java index 3b3a1ba6b..6a90ae5c1 100644 --- a/api/src/com/todoroo/astrid/data/TaskOutstanding.java +++ b/api/src/com/todoroo/astrid/data/TaskOutstanding.java @@ -9,7 +9,7 @@ import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.data.Table; @SuppressWarnings("nls") -public class TaskOutstanding extends OutstandingEntry { +public class TaskOutstanding extends OutstandingEntry { /** table for this model */ public static final Table TABLE = new Table("tasks_outstanding", TaskOutstanding.class); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/BriefMe.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/BriefMe.java new file mode 100644 index 000000000..adaea272d --- /dev/null +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/BriefMe.java @@ -0,0 +1,5 @@ +package com.todoroo.astrid.actfm.sync.messages; + +public class BriefMe implements ClientToServerMessage { + +} diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java new file mode 100644 index 000000000..b16dbf56c --- /dev/null +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java @@ -0,0 +1,24 @@ +package com.todoroo.astrid.actfm.sync.messages; + +import java.util.ArrayList; +import java.util.List; + +import com.todoroo.astrid.data.OutstandingEntry; +import com.todoroo.astrid.data.RemoteModel; + +public class ChangesHappened implements ClientToServerMessage { + + private final Class modelClass; + private final long id; + private final long uuid; + private final List> changes; + private long pushedAt; + + public ChangesHappened(TYPE entity) { + this.modelClass = entity.getClass(); + this.id = entity.getId(); + this.uuid = entity.getValue(RemoteModel.REMOTE_ID_PROPERTY); + this.changes = new ArrayList>(); + } + +} diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java new file mode 100644 index 000000000..4db6263ed --- /dev/null +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java @@ -0,0 +1,5 @@ +package com.todoroo.astrid.actfm.sync.messages; + +public interface ClientToServerMessage { + +} diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java new file mode 100644 index 000000000..6cf82d5a1 --- /dev/null +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java @@ -0,0 +1,5 @@ +package com.todoroo.astrid.actfm.sync.messages; + +public class RequestDoubleCheck implements ClientToServerMessage { + +} diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java new file mode 100644 index 000000000..a97a7fadf --- /dev/null +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java @@ -0,0 +1,5 @@ +package com.todoroo.astrid.actfm.sync.messages; + +public interface ServerToClientMessage { + +}