Rename gis-client TypeDescriptor to PortTypeDescriptor Moved File from North52 implementation to gis-client
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/5f8b4caf Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/tree/5f8b4caf Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/diff/5f8b4caf Branch: refs/heads/taverna2 Commit: 5f8b4caf9ebe2594d3a8af5d5151b15df348a15c Parents: c4077e4 Author: edikaradumi <[email protected]> Authored: Thu Aug 4 05:16:04 2016 +0100 Committer: edikaradumi <[email protected]> Committed: Thu Aug 4 05:16:04 2016 +0100 ---------------------------------------------------------------------- .../ui/serviceprovider/GisServiceProvider.java | 9 ++- .../apache/taverna/gis/client/IGisClient.java | 6 +- .../taverna/gis/client/PortTypeDescriptor.java | 64 ++++++++++++++++++++ .../gis/client/impl/GisClientNorthImpl.java | 13 ++-- .../taverna/gis/client/impl/TypeDescriptor.java | 64 -------------------- 5 files changed, 77 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/5f8b4caf/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java b/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java index e63f069..61e466e 100644 --- a/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java +++ b/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java @@ -10,7 +10,6 @@ import javax.swing.JOptionPane; import org.apache.log4j.Logger; import org.apache.taverna.gis.client.*; -import org.apache.taverna.gis.client.impl.TypeDescriptor; import net.sf.taverna.t2.servicedescriptions.AbstractConfigurableServiceProvider; import net.sf.taverna.t2.servicedescriptions.ConfigurableServiceProvider; @@ -62,11 +61,11 @@ public class GisServiceProvider extends AbstractConfigurableServiceProvider<GisS service.setDescription(processID); // Get input ports - List<TypeDescriptor> inputList = gisServiceClient.getTaverna2InputPorts(processID); + List<PortTypeDescriptor> inputList = gisServiceClient.getTaverna2InputPorts(processID); List<ActivityInputPortDefinitionBean> inputPortDefinitions = new ArrayList<ActivityInputPortDefinitionBean>(); - for (TypeDescriptor input : inputList) { + for (PortTypeDescriptor input : inputList) { ActivityInputPortDefinitionBean newInputPort = new ActivityInputPortDefinitionBean(); newInputPort.setName(input.getName()); newInputPort.setDepth(input.getDepth()); @@ -82,10 +81,10 @@ public class GisServiceProvider extends AbstractConfigurableServiceProvider<GisS // Get output ports - List<TypeDescriptor> outputList = gisServiceClient.getTaverna2OutputPorts(processID); + List<PortTypeDescriptor> outputList = gisServiceClient.getTaverna2OutputPorts(processID); List<ActivityOutputPortDefinitionBean> outputPortDefinitions = new ArrayList<ActivityOutputPortDefinitionBean>(); - for( TypeDescriptor output : outputList ) + for( PortTypeDescriptor output : outputList ) { ActivityOutputPortDefinitionBean newOutputPort = new ActivityOutputPortDefinitionBean(); newOutputPort.setName(output.getName()); http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/5f8b4caf/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/IGisClient.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/IGisClient.java b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/IGisClient.java index a5e252c..316961e 100644 --- a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/IGisClient.java +++ b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/IGisClient.java @@ -24,8 +24,6 @@ import java.net.URI; import java.util.HashMap; import java.util.List; -import org.apache.taverna.gis.client.impl.TypeDescriptor; - public interface IGisClient { // TODO: The interface is specific to WPS services. It should be generic so that it can handle different @@ -44,8 +42,8 @@ public interface IGisClient { public HashMap<String, Integer> getProcessOutputPorts(String processID); - public List<TypeDescriptor> getTaverna2InputPorts(String processID); + public List<PortTypeDescriptor> getTaverna2InputPorts(String processID); - public List<TypeDescriptor> getTaverna2OutputPorts(String processID); + public List<PortTypeDescriptor> getTaverna2OutputPorts(String processID); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/5f8b4caf/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 new file mode 100644 index 0000000..f6e5f16 --- /dev/null +++ b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/PortTypeDescriptor.java @@ -0,0 +1,64 @@ +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 boolean isRequired; + private List<String> supportedFormats; + private String defaultFormat; + + 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 boolean isRequired() { + return isRequired; + } + public void setRequired(boolean isRequired) { + this.isRequired = isRequired; + } + public List<String> getSupportedFormats() { + return supportedFormats; + } + public void setSupportedFormats(List<String> supportedFormats) { + this.supportedFormats = supportedFormats; + } + public String getDefaultFormat() { + return defaultFormat; + } + public void setDefaultFormat(String defaultFormat) { + this.defaultFormat = defaultFormat; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/5f8b4caf/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/impl/GisClientNorthImpl.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/impl/GisClientNorthImpl.java b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/impl/GisClientNorthImpl.java index 2ffc9f7..2f123cd 100644 --- a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/impl/GisClientNorthImpl.java +++ b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/impl/GisClientNorthImpl.java @@ -29,6 +29,7 @@ import java.util.List; import org.apache.log4j.Logger; import org.apache.taverna.gis.client.IGisClient; +import org.apache.taverna.gis.client.PortTypeDescriptor; import org.n52.wps.client.WPSClientException; import org.n52.wps.client.WPSClientSession; @@ -138,10 +139,10 @@ public class GisClientNorthImpl implements IGisClient { return outputPorts; } - public List<TypeDescriptor> getTaverna2InputPorts(String processID) + public List<PortTypeDescriptor> getTaverna2InputPorts(String processID) { - List<TypeDescriptor> inputPorts = new ArrayList<TypeDescriptor>(); + List<PortTypeDescriptor> inputPorts = new ArrayList<PortTypeDescriptor>(); ProcessDescriptionType processDescription = null; @@ -162,7 +163,7 @@ public class GisClientNorthImpl implements IGisClient { InputDescriptionType[] inputList = dataInputs.getInputArray(); for (InputDescriptionType input : inputList) { - TypeDescriptor myNewInputPort = new TypeDescriptor(); + PortTypeDescriptor myNewInputPort = new PortTypeDescriptor(); myNewInputPort.setName(input.getIdentifier().getStringValue()); myNewInputPort.setDepth(getInputPortDepth(input)); @@ -231,8 +232,8 @@ public class GisClientNorthImpl implements IGisClient { } @Override - public List<TypeDescriptor> getTaverna2OutputPorts(String processID) { - List<TypeDescriptor> outputPorts = new ArrayList<TypeDescriptor>(); + public List<PortTypeDescriptor> getTaverna2OutputPorts(String processID) { + List<PortTypeDescriptor> outputPorts = new ArrayList<PortTypeDescriptor>(); ProcessDescriptionType processDescription = null; @@ -248,7 +249,7 @@ public class GisClientNorthImpl implements IGisClient { OutputDescriptionType[] outputList = processDescription.getProcessOutputs().getOutputArray(); for (OutputDescriptionType output : outputList) { - TypeDescriptor myNewOutputPort = new TypeDescriptor(); + PortTypeDescriptor myNewOutputPort = new PortTypeDescriptor(); myNewOutputPort.setName(output.getIdentifier().getStringValue()); myNewOutputPort.setDepth(0); // output port depth is always 1 http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/5f8b4caf/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/impl/TypeDescriptor.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/impl/TypeDescriptor.java b/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/impl/TypeDescriptor.java deleted file mode 100644 index bc18d3f..0000000 --- a/apache-taverna-plugin-gis-client/src/main/java/org/apache/taverna/gis/client/impl/TypeDescriptor.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.apache.taverna.gis.client.impl; - -import java.util.List; - -public class TypeDescriptor { - private String name; - private Integer depth; - private boolean allowLiteralValues; - private String handledReferenceSchemes; - private Class<?> translatedElementType; - private boolean isRequired; - private List<String> supportedFormats; - private String defaultFormat; - - 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 boolean isRequired() { - return isRequired; - } - public void setRequired(boolean isRequired) { - this.isRequired = isRequired; - } - public List<String> getSupportedFormats() { - return supportedFormats; - } - public void setSupportedFormats(List<String> supportedFormats) { - this.supportedFormats = supportedFormats; - } - public String getDefaultFormat() { - return defaultFormat; - } - public void setDefaultFormat(String defaultFormat) { - this.defaultFormat = defaultFormat; - } - -}
