single java bean for detailworkflow and 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/bcf2a668 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/bcf2a668 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/bcf2a668 Branch: refs/heads/master Commit: bcf2a668c713cd022969326cb24fb6c621bc1244 Parents: eb2e43a Author: Sagar <[email protected]> Authored: Sat Jul 2 19:01:50 2016 +0530 Committer: Sagar <[email protected]> Committed: Sat Jul 2 19:01:50 2016 +0530 ---------------------------------------------------------------------- .../apache/taverna/mobile/data/DataManager.java | 4 +- .../mobile/data/model/DetailWorkflow.java | 282 ------------------- .../taverna/mobile/data/model/Workflow.java | 168 +++++++++-- .../mobile/data/remote/TavernaService.java | 4 +- .../workflowdetail/WorkflowDetailFragment.java | 22 +- .../workflowdetail/WorkflowDetailMvpView.java | 4 +- .../workflowdetail/WorkflowDetailPresenter.java | 10 +- 7 files changed, 160 insertions(+), 334 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bcf2a668/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java index 6d8982f..e35cbb5 100644 --- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java @@ -20,7 +20,7 @@ package org.apache.taverna.mobile.data; import org.apache.taverna.mobile.data.model.Announcements; import org.apache.taverna.mobile.data.model.DetailAnnouncement; -import org.apache.taverna.mobile.data.model.DetailWorkflow; +import org.apache.taverna.mobile.data.model.Workflow; import org.apache.taverna.mobile.data.model.License; import org.apache.taverna.mobile.data.model.User; import org.apache.taverna.mobile.data.model.Workflows; @@ -63,7 +63,7 @@ public class DataManager { * @return Detail of Workflow */ - public Observable<DetailWorkflow> getDetailWorkflow(String id, Map<String, String> options) { + public Observable<Workflow> getDetailWorkflow(String id, Map<String, String> options) { return mBaseApiManager.getTavernaApi().getDetailWorkflow(id, options); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bcf2a668/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java b/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java deleted file mode 100644 index b4e072f..0000000 --- a/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java +++ /dev/null @@ -1,282 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.taverna.mobile.data.model; - - -import org.simpleframework.xml.Attribute; -import org.simpleframework.xml.Element; -import org.simpleframework.xml.ElementList; -import org.simpleframework.xml.Root; - -import android.os.Parcel; -import android.os.Parcelable; - -import java.util.List; - -@Root(name = "workflow") -public class DetailWorkflow implements Parcelable { - - @Attribute(name = "resource", required = false) - String resource; - - @Attribute(name = "uri", required = false) - String uri; - - @Attribute(name = "id", required = false) - String id; - - @Attribute(name = "version", required = false) - String version; - - @Element(name = "id") - private String elementId; - - @Element(name = "title") - private String title; - - @Element(name = "description", required = false) - String description; - - @Element(name = "type") - private Type type; - - @Element(name = "uploader", required = false) - private Uploader uploader; - - @Element(name = "created-at", required = false) - private String createdAt; - - @Element(name = "updated-at", required = false) - private String updatedAt; - - @Element(name = "preview", required = false) - private String previewUri; - - @Element(name = "svg", required = false) - private String svgUri; - - @Element(name = "license-type", required = false) - private LicenseType licenseType; - - @Element(name = "content-uri", required = false) - String contentUri; - - @Element(name = "content-type", required = false) - String contentType; - - @ElementList(name = "tags", required = false) - List<Tag> tag; - - public String getContentType() { - return contentType; - } - - public void setContentType(String contentType) { - this.contentType = contentType; - } - - public String getContentUri() { - return contentUri; - } - - public void setContentUri(String contentUri) { - this.contentUri = contentUri; - } - - public String getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(String createdAt) { - this.createdAt = createdAt; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getElementId() { - return elementId; - } - - public void setElementId(String elementId) { - this.elementId = elementId; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public LicenseType getLicenseType() { - return licenseType; - } - - public void setLicenseType(LicenseType licenseType) { - this.licenseType = licenseType; - } - - public String getPreviewUri() { - return previewUri; - } - - public void setPreviewUri(String previewUri) { - this.previewUri = previewUri; - } - - public String getResource() { - return resource; - } - - public void setResource(String resource) { - this.resource = resource; - } - - public String getSvgUri() { - return svgUri; - } - - public void setSvgUri(String svgUri) { - this.svgUri = svgUri; - } - - public List<Tag> getTag() { - return tag; - } - - public void setTag(List<Tag> tag) { - this.tag = tag; - } - - public Type getType() { - return type; - } - - public void setType(Type type) { - this.type = type; - } - - public Uploader getUploader() { - return uploader; - } - - public void setUploader(Uploader uploader) { - this.uploader = uploader; - } - - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(String updatedAt) { - this.updatedAt = updatedAt; - } - - public DetailWorkflow() { - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(this.resource); - dest.writeString(this.uri); - dest.writeString(this.id); - dest.writeString(this.version); - dest.writeString(this.elementId); - dest.writeString(this.title); - dest.writeString(this.description); - dest.writeParcelable(this.type, flags); - dest.writeParcelable(this.uploader, flags); - dest.writeString(this.createdAt); - dest.writeString(this.updatedAt); - dest.writeString(this.previewUri); - dest.writeString(this.svgUri); - dest.writeParcelable(this.licenseType, flags); - dest.writeString(this.contentUri); - dest.writeString(this.contentType); - dest.writeTypedList(this.tag); - } - - protected DetailWorkflow(Parcel in) { - this.resource = in.readString(); - this.uri = in.readString(); - this.id = in.readString(); - this.version = in.readString(); - this.elementId = in.readString(); - this.title = in.readString(); - this.description = in.readString(); - this.type = in.readParcelable(Type.class.getClassLoader()); - this.uploader = in.readParcelable(Uploader.class.getClassLoader()); - this.createdAt = in.readString(); - this.updatedAt = in.readString(); - this.previewUri = in.readString(); - this.svgUri = in.readString(); - this.licenseType = in.readParcelable(LicenseType.class.getClassLoader()); - this.contentUri = in.readString(); - this.contentType = in.readString(); - this.tag = in.createTypedArrayList(Tag.CREATOR); - } - - public static final Creator<DetailWorkflow> CREATOR = new Creator<DetailWorkflow>() { - @Override - public DetailWorkflow createFromParcel(Parcel source) { - return new DetailWorkflow(source); - } - - @Override - public DetailWorkflow[] newArray(int size) { - return new DetailWorkflow[size]; - } - }; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bcf2a668/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 7a7ffc3..24f72f2 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 @@ -18,13 +18,18 @@ */ package org.apache.taverna.mobile.data.model; + import org.simpleframework.xml.Attribute; import org.simpleframework.xml.Element; +import org.simpleframework.xml.ElementList; +import org.simpleframework.xml.Root; import android.os.Parcel; import android.os.Parcelable; +import java.util.List; +@Root(name = "workflow") public class Workflow implements Parcelable { @Attribute(name = "resource", required = false) @@ -39,35 +44,83 @@ public class Workflow implements Parcelable { @Attribute(name = "version", required = false) String version; + @Element(name = "id", required = false) + private String elementId; + @Element(name = "title") private String title; + @Element(name = "description", required = false) + String description; + @Element(name = "type") private Type type; - @Element(name = "uploader") + @Element(name = "uploader", required = false) private Uploader uploader; - @Element(name = "created-at") + @Element(name = "created-at", required = false) private String createdAt; - @Element(name = "preview") + @Element(name = "updated-at", required = false) + private String updatedAt; + + @Element(name = "preview", required = false) private String previewUri; - public String getResource() { - return resource; + @Element(name = "svg", required = false) + private String svgUri; + + @Element(name = "license-type", required = false) + private LicenseType licenseType; + + @Element(name = "content-uri", required = false) + String contentUri; + + @Element(name = "content-type", required = false) + String contentType; + + @ElementList(name = "tags", required = false) + List<Tag> tag; + + public String getContentType() { + return contentType; } - public void setResource(String resource) { - this.resource = resource; + public void setContentType(String contentType) { + this.contentType = contentType; } - public String getUri() { - return uri; + public String getContentUri() { + return contentUri; } - public void setUri(String uri) { - this.uri = uri; + public void setContentUri(String contentUri) { + this.contentUri = contentUri; + } + + public String getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(String createdAt) { + this.createdAt = createdAt; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getElementId() { + return elementId; + } + + public void setElementId(String elementId) { + this.elementId = elementId; } public String getId() { @@ -78,20 +131,44 @@ public class Workflow implements Parcelable { this.id = id; } - public String getVersion() { - return version; + public LicenseType getLicenseType() { + return licenseType; } - public void setVersion(String version) { - this.version = version; + public void setLicenseType(LicenseType licenseType) { + this.licenseType = licenseType; } - public String getTitle() { - return title; + public String getPreviewUri() { + return previewUri; } - public void setTitle(String title) { - this.title = title; + public void setPreviewUri(String previewUri) { + this.previewUri = previewUri; + } + + public String getResource() { + return resource; + } + + public void setResource(String resource) { + this.resource = resource; + } + + public String getSvgUri() { + return svgUri; + } + + public void setSvgUri(String svgUri) { + this.svgUri = svgUri; + } + + public List<Tag> getTag() { + return tag; + } + + public void setTag(List<Tag> tag) { + this.tag = tag; } public Type getType() { @@ -110,22 +187,40 @@ public class Workflow implements Parcelable { this.uploader = uploader; } - public String getCreatedAt() { - return createdAt; + public String getUri() { + return uri; } - public void setCreatedAt(String createdAt) { - this.createdAt = createdAt; + public void setUri(String uri) { + this.uri = uri; } - public String getPreviewUri() { - return previewUri; + public String getVersion() { + return version; } - public void setPreviewUri(String previewUri) { - this.previewUri = previewUri; + public void setVersion(String version) { + this.version = version; } + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(String updatedAt) { + this.updatedAt = updatedAt; + } + + public Workflow() { + } @Override public int describeContents() { @@ -138,14 +233,19 @@ public class Workflow implements Parcelable { dest.writeString(this.uri); dest.writeString(this.id); dest.writeString(this.version); + dest.writeString(this.elementId); dest.writeString(this.title); + dest.writeString(this.description); dest.writeParcelable(this.type, flags); dest.writeParcelable(this.uploader, flags); dest.writeString(this.createdAt); + dest.writeString(this.updatedAt); dest.writeString(this.previewUri); - } - - public Workflow() { + dest.writeString(this.svgUri); + dest.writeParcelable(this.licenseType, flags); + dest.writeString(this.contentUri); + dest.writeString(this.contentType); + dest.writeTypedList(this.tag); } protected Workflow(Parcel in) { @@ -153,11 +253,19 @@ public class Workflow implements Parcelable { this.uri = in.readString(); this.id = in.readString(); this.version = in.readString(); + this.elementId = in.readString(); this.title = in.readString(); + this.description = in.readString(); this.type = in.readParcelable(Type.class.getClassLoader()); this.uploader = in.readParcelable(Uploader.class.getClassLoader()); this.createdAt = in.readString(); + this.updatedAt = in.readString(); this.previewUri = in.readString(); + this.svgUri = in.readString(); + this.licenseType = in.readParcelable(LicenseType.class.getClassLoader()); + this.contentUri = in.readString(); + this.contentType = in.readString(); + this.tag = in.createTypedArrayList(Tag.CREATOR); } public static final Creator<Workflow> CREATOR = new Creator<Workflow>() { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bcf2a668/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java index 992f25c..fcdaded 100644 --- a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java @@ -20,7 +20,7 @@ package org.apache.taverna.mobile.data.remote; import org.apache.taverna.mobile.data.model.Announcements; import org.apache.taverna.mobile.data.model.DetailAnnouncement; -import org.apache.taverna.mobile.data.model.DetailWorkflow; +import org.apache.taverna.mobile.data.model.Workflow; import org.apache.taverna.mobile.data.model.License; import org.apache.taverna.mobile.data.model.User; import org.apache.taverna.mobile.data.model.Workflows; @@ -45,7 +45,7 @@ public interface TavernaService { Observable<Workflows> getAllWorkflows(@QueryMap Map<String, String> options); @GET(APIEndPoint.WORKFLOW) - Observable<DetailWorkflow> getDetailWorkflow(@Query("id") String id + Observable<Workflow> getDetailWorkflow(@Query("id") String id , @QueryMap Map<String, String> options); @GET(APIEndPoint.USER) http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bcf2a668/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java index 90302a1..5513947 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java @@ -6,7 +6,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; import org.apache.taverna.mobile.R; import org.apache.taverna.mobile.data.DataManager; -import org.apache.taverna.mobile.data.model.DetailWorkflow; +import org.apache.taverna.mobile.data.model.Workflow; import org.apache.taverna.mobile.data.model.License; import org.apache.taverna.mobile.data.model.User; import org.apache.taverna.mobile.utils.ConnectionInfo; @@ -176,26 +176,26 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv } @Override - public void showWorkflowDetail(DetailWorkflow detailWorkflow) { + public void showWorkflowDetail(Workflow workflow) { - uploaderName.setText(detailWorkflow.getUploader().getContent()); - date.setText(detailWorkflow.getUpdatedAt() - .substring(0, detailWorkflow.getUpdatedAt().indexOf(' '))); - type.setText(detailWorkflow.getType().getContent()); - title.setText(detailWorkflow.getTitle()); - description.loadData(detailWorkflow.getDescription(), "text/html", "utf-8"); + uploaderName.setText(workflow.getUploader().getContent()); + date.setText(workflow.getUpdatedAt() + .substring(0, workflow.getUpdatedAt().indexOf(' '))); + type.setText(workflow.getType().getContent()); + title.setText(workflow.getTitle()); + description.loadData(workflow.getDescription(), "text/html", "utf-8"); Glide.with(getContext()) - .load(detailWorkflow.getPreviewUri()) + .load(workflow.getPreviewUri()) .diskCacheStrategy(DiskCacheStrategy.SOURCE) .placeholder(R.drawable.placeholder) .error(R.drawable.placeholder) .into(workflowImage); - if (detailWorkflow.getLicenseType().getId() == null) { + if (workflow.getLicenseType().getId() == null) { licenceId = ""; } else { - licenceId = detailWorkflow.getLicenseType().getId(); + licenceId = workflow.getLicenseType().getId(); } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bcf2a668/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java index c0136a5..b7110c1 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java @@ -1,7 +1,7 @@ package org.apache.taverna.mobile.ui.workflowdetail; -import org.apache.taverna.mobile.data.model.DetailWorkflow; +import org.apache.taverna.mobile.data.model.Workflow; import org.apache.taverna.mobile.data.model.License; import org.apache.taverna.mobile.data.model.User; import org.apache.taverna.mobile.ui.base.MvpView; @@ -10,7 +10,7 @@ public interface WorkflowDetailMvpView extends MvpView { void showProgressbar(boolean b); - void showWorkflowDetail(DetailWorkflow detailWorkflow); + void showWorkflowDetail(Workflow workflow); void setImage(User user); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bcf2a668/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java index 5b5f2af..511498f 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java @@ -1,7 +1,7 @@ package org.apache.taverna.mobile.ui.workflowdetail; import org.apache.taverna.mobile.data.DataManager; -import org.apache.taverna.mobile.data.model.DetailWorkflow; +import org.apache.taverna.mobile.data.model.Workflow; import org.apache.taverna.mobile.data.model.License; import org.apache.taverna.mobile.data.model.User; import org.apache.taverna.mobile.ui.base.BasePresenter; @@ -42,7 +42,7 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView mSubscriptions = mDataManager.getDetailWorkflow(id, getDetailQueryOptions()) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) - .subscribe(new Observer<DetailWorkflow>() { + .subscribe(new Observer<Workflow>() { @Override public void onCompleted() { getMvpView().showProgressbar(false); @@ -54,9 +54,9 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView } @Override - public void onNext(DetailWorkflow detailWorkflow) { - getMvpView().showWorkflowDetail(detailWorkflow); - loadUserDetail(detailWorkflow.getUploader().getId()); + public void onNext(Workflow workflow) { + getMvpView().showWorkflowDetail(workflow); + loadUserDetail(workflow.getUploader().getId()); } });
