You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/08/12 13:13:23 UTC
[35/46] incubator-taverna-plugin-gis git commit:
ComplexDataTypeDescriptor --> COmplexDataFormat
ComplexDataTypeDescriptor --> COmplexDataFormat
Override object equals method
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/commit/7e8e85ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/tree/7e8e85ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/diff/7e8e85ab
Branch: refs/heads/taverna2
Commit: 7e8e85abbced2dc51c4538cc753043b41bdd2a96
Parents: 973ab66
Author: edikaradumi <ed...@gmail.com>
Authored: Sat Aug 6 00:03:59 2016 +0100
Committer: edikaradumi <ed...@gmail.com>
Committed: Sat Aug 6 00:03:59 2016 +0100
----------------------------------------------------------------------
.../taverna/gis/client/ComplexDataFormat.java | 56 ++++++++++++++++++++
.../gis/client/ComplexDataTypeDescriptor.java | 37 -------------
2 files changed, 56 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e8e85ab/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexDataFormat.java
----------------------------------------------------------------------
diff --git a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexDataFormat.java b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexDataFormat.java
new file mode 100644
index 0000000..b4ea26c
--- /dev/null
+++ b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexDataFormat.java
@@ -0,0 +1,56 @@
+package org.apache.taverna.gis.client;
+
+public class ComplexDataFormat {
+ private String mimeType;
+ private String encoding;
+ private String schema;
+
+ public ComplexDataFormat() {
+ }
+
+ public ComplexDataFormat(String mimeType, String encoding, String schema) {
+ this.mimeType = mimeType;
+ this.encoding = encoding;
+ this.schema = schema;
+ }
+
+ public String getMimeType() {
+ return mimeType;
+ }
+ public void setMimeType(String mimeType) {
+ this.mimeType = mimeType;
+ }
+ public String getEncoding() {
+ return encoding;
+ }
+ public void setEncoding(String encoding) {
+ this.encoding = encoding;
+ }
+ public String getSchema() {
+ return schema;
+ }
+ public void setSchema(String schema) {
+ this.schema = schema;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
+ if (!ComplexDataFormat.class.isAssignableFrom(obj.getClass())) {
+ return false;
+ }
+ final ComplexDataFormat otherFormat = (ComplexDataFormat) obj;
+ if ((this.mimeType == null) ? (otherFormat.mimeType != null) : !this.mimeType.equals(otherFormat.mimeType)) {
+ return false;
+ }
+ if ((this.schema == null) ? (otherFormat.schema != null) : !this.schema.equals(otherFormat.schema)) {
+ return false;
+ }
+ if ((this.encoding == null) ? (otherFormat.encoding != null) : !this.encoding.equals(otherFormat.encoding)) {
+ return false;
+ }
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e8e85ab/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexDataTypeDescriptor.java
----------------------------------------------------------------------
diff --git a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexDataTypeDescriptor.java b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexDataTypeDescriptor.java
deleted file mode 100644
index 3fa69cb..0000000
--- a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexDataTypeDescriptor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.taverna.gis.client;
-
-public class ComplexDataTypeDescriptor {
- private String mimeType;
- private String encoding;
- private String schema;
-
- public ComplexDataTypeDescriptor() {
- }
-
- public ComplexDataTypeDescriptor(String mimeType, String encoding, String schema) {
- this.mimeType = mimeType;
- this.encoding = encoding;
- this.schema = schema;
- }
-
- public String getMimeType() {
- return mimeType;
- }
- public void setMimeType(String mimeType) {
- this.mimeType = mimeType;
- }
- public String getEncoding() {
- return encoding;
- }
- public void setEncoding(String encoding) {
- this.encoding = encoding;
- }
- public String getSchema() {
- return schema;
- }
- public void setSchema(String schema) {
- this.schema = schema;
- }
-
-
-}