Add classes for each DataType port Add IPortDataDescriptor that should be implemented by each data type Add new class to represent literal, complex, bounding box data
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/015b223f Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/tree/015b223f Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/diff/015b223f Branch: refs/heads/taverna2 Commit: 015b223fa50315522a1f9f017581a8c793b34ca8 Parents: 09cf820 Author: edikaradumi <[email protected]> Authored: Fri Aug 5 01:53:45 2016 +0100 Committer: edikaradumi <[email protected]> Committed: Fri Aug 5 01:53:45 2016 +0100 ---------------------------------------------------------------------- .../gis/client/BBoxPortDataTypeDescriptor.java | 92 +++++++++++++++++++ .../gis/client/ComplexPortDataDescriptor.java | 93 ++++++++++++++++++++ .../taverna/gis/client/IPortDataDescriptor.java | 19 ++++ .../gis/client/LiteralPortDataDescriptor.java | 68 ++++++++++++++ .../client/PortDataTypeDescriptroFactory.java | 16 ++++ .../taverna/gis/client/PortTypeDescriptor.java | 85 ------------------ 6 files changed, 288 insertions(+), 85 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/015b223f/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/BBoxPortDataTypeDescriptor.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/BBoxPortDataTypeDescriptor.java b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/BBoxPortDataTypeDescriptor.java new file mode 100644 index 0000000..878fb55 --- /dev/null +++ b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/BBoxPortDataTypeDescriptor.java @@ -0,0 +1,92 @@ +package org.apache.taverna.gis.client; + +import java.util.List; + +public class BBoxPortDataTypeDescriptor implements IPortDataDescriptor { + private String name; + private Object value; // TODO: should the value be a property of the TypeDescriptor? + private Integer depth; + private boolean allowLiteralValues; + private Object handledReferenceSchemes; + private Class<?> translatedElementType; + private boolean isRequired; + private List<String> supportedBoundingBoxFormats; + private String defaultBoundingBoxFormat; + private String boundingBoxFormat; + + @Override + public String getName() { + return name; + } + @Override + public void setName(String name) { + this.name = name; + } + @Override + public Object getValue() { + return value; + } + @Override + public void setValue(Object value) { + this.value = value; + } + @Override + public Integer getDepth() { + return depth; + } + @Override + public void setDepth(Integer depth) { + this.depth = depth; + } + @Override + public boolean isAllowLiteralValues() { + return allowLiteralValues; + } + @Override + public void setAllowLiteralValues(boolean allowLiteralValues) { + this.allowLiteralValues = allowLiteralValues; + } + @Override + public Object getHandledReferenceSchemes() { + return handledReferenceSchemes; + } + @Override + public void setHandledReferenceSchemes(Object handledReferenceSchemes) { + this.handledReferenceSchemes = handledReferenceSchemes; + } + @Override + public Class<?> getTranslatedElementType() { + return translatedElementType; + } + @Override + public void setTranslatedElementType(Class<?> translatedElementType) { + this.translatedElementType = translatedElementType; + } + @Override + public boolean isRequired() { + return isRequired; + } + @Override + public void setRequired(boolean isRequired) { + this.isRequired = isRequired; + } + + public List<String> getSupportedBoundingBoxFormats() { + return supportedBoundingBoxFormats; + } + public void setSupportedBoundingBoxFormats(List<String> supportedBoundingBoxFormats) { + this.supportedBoundingBoxFormats = supportedBoundingBoxFormats; + } + public String getDefaultBoundingBoxFormat() { + return defaultBoundingBoxFormat; + } + public void setDefaultBoundingBoxFormat(String defaultBoundingBoxFormat) { + this.defaultBoundingBoxFormat = defaultBoundingBoxFormat; + } + public String getBoundingBoxFormat() { + return boundingBoxFormat; + } + public void setBoundingBoxFormat(String boundingBoxFormat) { + this.boundingBoxFormat = boundingBoxFormat; + } +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/015b223f/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexPortDataDescriptor.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexPortDataDescriptor.java b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexPortDataDescriptor.java new file mode 100644 index 0000000..2c5d0df --- /dev/null +++ b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/ComplexPortDataDescriptor.java @@ -0,0 +1,93 @@ +package org.apache.taverna.gis.client; + +import java.util.List; + +public class ComplexPortDataDescriptor implements IPortDataDescriptor { + private String name; + private Object value; // TODO: should the value be a property of the TypeDescriptor? + private Integer depth; + private boolean allowLiteralValues; + private Object handledReferenceSchemes; + private Class<?> translatedElementType; + private boolean isRequired; + private List<ComplexDataTypeDescriptor> supportedComplexFormats; + private ComplexDataTypeDescriptor defaultComplexFormat; + private ComplexDataTypeDescriptor complexFormat; + + @Override + public String getName() { + return name; + } + @Override + public void setName(String name) { + this.name = name; + } + @Override + public Object getValue() { + return value; + } + @Override + public void setValue(Object value) { + this.value = value; + } + @Override + public Integer getDepth() { + return depth; + } + @Override + public void setDepth(Integer depth) { + this.depth = depth; + } + @Override + public boolean isAllowLiteralValues() { + return allowLiteralValues; + } + @Override + public void setAllowLiteralValues(boolean allowLiteralValues) { + this.allowLiteralValues = allowLiteralValues; + } + @Override + public Object getHandledReferenceSchemes() { + return handledReferenceSchemes; + } + @Override + public void setHandledReferenceSchemes(Object handledReferenceSchemes) { + this.handledReferenceSchemes = handledReferenceSchemes; + } + @Override + public Class<?> getTranslatedElementType() { + return translatedElementType; + } + @Override + public void setTranslatedElementType(Class<?> translatedElementType) { + this.translatedElementType = translatedElementType; + } + @Override + public boolean isRequired() { + return isRequired; + } + @Override + public void setRequired(boolean isRequired) { + this.isRequired = isRequired; + } + + public List<ComplexDataTypeDescriptor> getSupportedComplexFormats() { + return supportedComplexFormats; + } + public void setSupportedComplexFormats(List<ComplexDataTypeDescriptor> supportedComplexFormats) { + this.supportedComplexFormats = supportedComplexFormats; + } + public ComplexDataTypeDescriptor getDefaultComplexFormat() { + return defaultComplexFormat; + } + public void setDefaultComplexFormat(ComplexDataTypeDescriptor defaultComplexFormat) { + this.defaultComplexFormat = defaultComplexFormat; + } + public ComplexDataTypeDescriptor getComplexFormat() { + return complexFormat; + } + public void setComplexFormat(ComplexDataTypeDescriptor complexFormat) { + this.complexFormat = complexFormat; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/015b223f/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/IPortDataDescriptor.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/IPortDataDescriptor.java b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/IPortDataDescriptor.java new file mode 100644 index 0000000..d3915ab --- /dev/null +++ b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/IPortDataDescriptor.java @@ -0,0 +1,19 @@ +package org.apache.taverna.gis.client; + +public interface IPortDataDescriptor { + public String getName(); + public void setName(String name); + public Object getValue(); + public void setValue(Object value); + public Integer getDepth(); + public void setDepth(Integer depth); + public boolean isAllowLiteralValues(); + public void setAllowLiteralValues(boolean allowLiteralValues); + public Object getHandledReferenceSchemes(); + public void setHandledReferenceSchemes(Object handledReferenceSchemes); + public Class<?> getTranslatedElementType(); + public void setTranslatedElementType(Class<?> translatedElementType); + public boolean isRequired(); + public void setRequired(boolean isRequired); + +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/015b223f/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/LiteralPortDataDescriptor.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/LiteralPortDataDescriptor.java b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/LiteralPortDataDescriptor.java new file mode 100644 index 0000000..465a0c5 --- /dev/null +++ b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/LiteralPortDataDescriptor.java @@ -0,0 +1,68 @@ +package org.apache.taverna.gis.client; + +public class LiteralPortDataDescriptor implements IPortDataDescriptor { + private String name; + private Object value; + private Integer depth; + private boolean allowLiteralValues; + private Object handledReferenceSchemes; + private Class<?> translatedElementType; + private boolean isRequired; + + @Override + public String getName() { + return name; + } + @Override + public void setName(String name) { + this.name = name; + } + @Override + public Object getValue() { + return value; + } + @Override + public void setValue(Object value) { + this.value = value; + } + @Override + public Integer getDepth() { + return depth; + } + @Override + public void setDepth(Integer depth) { + this.depth = depth; + } + @Override + public boolean isAllowLiteralValues() { + return allowLiteralValues; + } + @Override + public void setAllowLiteralValues(boolean allowLiteralValues) { + this.allowLiteralValues = allowLiteralValues; + } + @Override + public Object getHandledReferenceSchemes() { + return handledReferenceSchemes; + } + @Override + public void setHandledReferenceSchemes(Object handledReferenceSchemes) { + this.handledReferenceSchemes = handledReferenceSchemes; + } + @Override + public Class<?> getTranslatedElementType() { + return translatedElementType; + } + @Override + public void setTranslatedElementType(Class<?> translatedElementType) { + this.translatedElementType = translatedElementType; + } + @Override + public boolean isRequired() { + return isRequired; + } + @Override + public void setRequired(boolean isRequired) { + this.isRequired = isRequired; + } +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/015b223f/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/PortDataTypeDescriptroFactory.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/PortDataTypeDescriptroFactory.java b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/PortDataTypeDescriptroFactory.java new file mode 100644 index 0000000..2e472b5 --- /dev/null +++ b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/PortDataTypeDescriptroFactory.java @@ -0,0 +1,16 @@ +package org.apache.taverna.gis.client; + +public class PortDataTypeDescriptroFactory { + + public IPortDataDescriptor getPortDataType(PortDataType portDataType) { + switch (portDataType) { + case COMPLEX_DATA: + return new ComplexPortDataDescriptor(); + case BOUNDING_BOX_DATA: + return new BBoxPortDataTypeDescriptor(); + + default: + return new LiteralPortDataDescriptor(); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/015b223f/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/PortTypeDescriptor.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/PortTypeDescriptor.java b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/PortTypeDescriptor.java deleted file mode 100644 index 4f25edc..0000000 --- a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/PortTypeDescriptor.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.apache.taverna.gis.client; - -import java.util.List; - -public class PortTypeDescriptor { - private String name; - private Integer depth; - private boolean allowLiteralValues; - private String handledReferenceSchemes; - private Class<?> translatedElementType; - private PortDataType portDataType; - private boolean isRequired; - private List<ComplexDataTypeDescriptor> supportedComplexFormats; - private ComplexDataTypeDescriptor defaultComplexFormat; - private List<String> supportedBoundingBoxFormats; - private String defaultBoundingBoxFormat; - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public Integer getDepth() { - return depth; - } - public void setDepth(Integer depth) { - this.depth = depth; - } - public boolean isAllowLiteralValues() { - return allowLiteralValues; - } - public void setAllowLiteralValues(boolean allowLiteralValues) { - this.allowLiteralValues = allowLiteralValues; - } - public String getHandledReferenceSchemes() { - return handledReferenceSchemes; - } - public void setHandledReferenceSchemes(String handledReferenceSchemes) { - this.handledReferenceSchemes = handledReferenceSchemes; - } - public Class<?> getTranslatedElementType() { - return translatedElementType; - } - public void setTranslatedElementType(Class<?> translatedElementType) { - this.translatedElementType = translatedElementType; - } - public PortDataType getPortDataType() { - return portDataType; - } - public void setPortDataType(PortDataType portDataType) { - this.portDataType = portDataType; - } - public boolean isRequired() { - return isRequired; - } - public void setRequired(boolean isRequired) { - this.isRequired = isRequired; - } - public List<ComplexDataTypeDescriptor> getSupportedComplexFormats() { - return supportedComplexFormats; - } - public void setSupportedComplexFormats(List<ComplexDataTypeDescriptor> supportedComplexFormats) { - this.supportedComplexFormats = supportedComplexFormats; - } - public ComplexDataTypeDescriptor getDefaultComplexFormat() { - return defaultComplexFormat; - } - public void setDefaultComplexFormat(ComplexDataTypeDescriptor defaultComplexFormat) { - this.defaultComplexFormat = defaultComplexFormat; - } - public List<String> getSupportedBoundingBoxFormats() { - return supportedBoundingBoxFormats; - } - public void setSupportedBoundingBoxFormats(List<String> supportedBoundingBoxFormats) { - this.supportedBoundingBoxFormats = supportedBoundingBoxFormats; - } - public String getDefaultBoundingBoxFormat() { - return defaultBoundingBoxFormat; - } - public void setDefaultBoundingBoxFormat(String defaultBoundingBoxFormat) { - this.defaultBoundingBoxFormat = defaultBoundingBoxFormat; - } - -}
