add dbflow annotation to Workflow
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/91c0f35f Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/91c0f35f Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/91c0f35f Branch: refs/heads/master Commit: 91c0f35fb1880fcaefd9159a2b199c6f050e7889 Parents: 396a2d4 Author: Sagar <[email protected]> Authored: Sat Jul 2 19:19:43 2016 +0530 Committer: Sagar <[email protected]> Committed: Sat Jul 2 19:19:43 2016 +0530 ---------------------------------------------------------------------- .../apache/taverna/mobile/data/model/Type.java | 12 +++++ .../taverna/mobile/data/model/Uploader.java | 13 ++++++ .../taverna/mobile/data/model/Workflow.java | 46 ++++++++++++++++---- 3 files changed, 62 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/91c0f35f/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java b/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java index b22d7bc..a84a3c3 100644 --- a/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java @@ -18,6 +18,12 @@ */ package org.apache.taverna.mobile.data.model; +import com.raizlabs.android.dbflow.annotation.Column; +import com.raizlabs.android.dbflow.annotation.ModelContainer; +import com.raizlabs.android.dbflow.annotation.PrimaryKey; +import com.raizlabs.android.dbflow.annotation.Table; + +import org.apache.taverna.mobile.data.local.TavernaDatabase; import org.simpleframework.xml.Attribute; import org.simpleframework.xml.Root; import org.simpleframework.xml.Text; @@ -25,18 +31,24 @@ import org.simpleframework.xml.Text; import android.os.Parcel; import android.os.Parcelable; +@Table(database = TavernaDatabase.class) +@ModelContainer @Root(name = "type") public class Type implements Parcelable { + @Column @Attribute(name = "resource", required = false) String resource; + @Column @Attribute(name = "uri", required = false) String uri; + @PrimaryKey @Attribute(name = "id", required = false) String id; + @Column @Text String content; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/91c0f35f/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java b/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java index 41f3be6..b562cb5 100644 --- a/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java @@ -18,6 +18,12 @@ */ package org.apache.taverna.mobile.data.model; +import com.raizlabs.android.dbflow.annotation.Column; +import com.raizlabs.android.dbflow.annotation.ModelContainer; +import com.raizlabs.android.dbflow.annotation.PrimaryKey; +import com.raizlabs.android.dbflow.annotation.Table; + +import org.apache.taverna.mobile.data.local.TavernaDatabase; import org.simpleframework.xml.Attribute; import org.simpleframework.xml.Root; import org.simpleframework.xml.Text; @@ -25,17 +31,24 @@ import org.simpleframework.xml.Text; import android.os.Parcel; import android.os.Parcelable; +@Table(database = TavernaDatabase.class) +@ModelContainer @Root(name = "uploader") public class Uploader implements Parcelable { + + @Column @Attribute(name = "resource", required = false) String resource; + @Column @Attribute(name = "uri", required = false) String uri; + @PrimaryKey @Attribute(name = "id", required = false) String id; + @Column @Text String content; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/91c0f35f/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java b/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java index 24f72f2..cafa073 100644 --- a/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java @@ -19,6 +19,13 @@ package org.apache.taverna.mobile.data.model; +import com.raizlabs.android.dbflow.annotation.Column; +import com.raizlabs.android.dbflow.annotation.ForeignKey; +import com.raizlabs.android.dbflow.annotation.ModelContainer; +import com.raizlabs.android.dbflow.annotation.PrimaryKey; +import com.raizlabs.android.dbflow.annotation.Table; + +import org.apache.taverna.mobile.data.local.TavernaDatabase; import org.simpleframework.xml.Attribute; import org.simpleframework.xml.Element; import org.simpleframework.xml.ElementList; @@ -29,54 +36,75 @@ import android.os.Parcelable; import java.util.List; + +@Table(database = TavernaDatabase.class) +@ModelContainer @Root(name = "workflow") public class Workflow implements Parcelable { + @Column @Attribute(name = "resource", required = false) String resource; + @Column @Attribute(name = "uri", required = false) String uri; + @PrimaryKey @Attribute(name = "id", required = false) String id; + @Column @Attribute(name = "version", required = false) String version; + @Column @Element(name = "id", required = false) - private String elementId; + String elementId; + @Column @Element(name = "title") - private String title; + String title; + @Column @Element(name = "description", required = false) String description; + @Column + @ForeignKey @Element(name = "type") - private Type type; + Type type; + @Column + @ForeignKey @Element(name = "uploader", required = false) - private Uploader uploader; + Uploader uploader; + @Column @Element(name = "created-at", required = false) - private String createdAt; + String createdAt; + @Column @Element(name = "updated-at", required = false) - private String updatedAt; + String updatedAt; + @Column @Element(name = "preview", required = false) - private String previewUri; + String previewUri; + @Column @Element(name = "svg", required = false) - private String svgUri; + String svgUri; + @Column @Element(name = "license-type", required = false) - private LicenseType licenseType; + LicenseType licenseType; + @Column @Element(name = "content-uri", required = false) String contentUri; + @Column @Element(name = "content-type", required = false) String contentType;
