Rename PortDescriptor references
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/00f882b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/tree/00f882b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/diff/00f882b1 Branch: refs/heads/taverna2 Commit: 00f882b1c36d61144596ec74f97ab75edfcc1326 Parents: aed29b4 Author: edikaradumi <[email protected]> Authored: Sat Aug 6 00:09:52 2016 +0100 Committer: edikaradumi <[email protected]> Committed: Sat Aug 6 00:09:52 2016 +0100 ---------------------------------------------------------------------- .../gis/ui/serviceprovider/GisServiceDesc.java | 52 ++++++++++---------- .../gis/GisActivityConfigurationBean.java | 20 ++++++-- .../gis/client/ComplexPortDataDescriptor.java | 18 +++---- 3 files changed, 53 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/00f882b1/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceDesc.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceDesc.java b/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceDesc.java index 7cbdffa..96e8a8f 100644 --- a/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceDesc.java +++ b/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceDesc.java @@ -8,17 +8,23 @@ import javax.swing.Icon; import net.sf.taverna.t2.servicedescriptions.ServiceDescription; import net.sf.taverna.t2.workflowmodel.processor.activity.Activity; -import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean; -import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean; import org.apache.taverna.gis.GisActivity; import org.apache.taverna.gis.GisActivityConfigurationBean; +import org.apache.taverna.gis.client.IPortDataDescriptor; public class GisServiceDesc extends ServiceDescription<GisActivityConfigurationBean> { + // All fields are searchable in the Service palette, + // for instance try a search for exampleString:3 + private URI ogcServiceUri; + private String processIdentifier; + private List<IPortDataDescriptor> inputPortDefinitions; + private List<IPortDataDescriptor> outputPortDefinitions; + /** - * The subclass of Activity which should be instantiated when adding a service - * for this description + * The subclass of Activity which should be instantiated when adding a + * service for this description */ @Override public Class<? extends Activity<GisActivityConfigurationBean>> getActivityClass() { @@ -26,9 +32,10 @@ public class GisServiceDesc extends ServiceDescription<GisActivityConfigurationB } /** - * The configuration bean which is to be used for configuring the instantiated activity. - * Making this bean will typically require some of the fields set on this service - * description, like an endpoint URL or method name. + * The configuration bean which is to be used for configuring the + * instantiated activity. Making this bean will typically require some of + * the fields set on this service description, like an endpoint URL or + * method name. * */ @Override @@ -36,10 +43,10 @@ public class GisServiceDesc extends ServiceDescription<GisActivityConfigurationB GisActivityConfigurationBean bean = new GisActivityConfigurationBean(); bean.setOgcServiceUri(ogcServiceUri); bean.setProcessIdentifier(processIdentifier); - + bean.setInputPortDefinitions(inputPortDefinitions); bean.setOutputPortDefinitions(outputPortDefinitions); - + return bean; } @@ -52,8 +59,8 @@ public class GisServiceDesc extends ServiceDescription<GisActivityConfigurationB } /** - * The display name that will be shown in service palette and will - * be used as a template for processor name when added to workflow. + * The display name that will be shown in service palette and will be used + * as a template for processor name when added to workflow. */ @Override public String getName() { @@ -61,8 +68,8 @@ public class GisServiceDesc extends ServiceDescription<GisActivityConfigurationB } /** - * The path to this service description in the service palette. Folders - * will be created for each element of the returned path. + * The path to this service description in the service palette. Folders will + * be created for each element of the returned path. */ @Override public List<String> getPath() { @@ -81,40 +88,35 @@ public class GisServiceDesc extends ServiceDescription<GisActivityConfigurationB return Arrays.<Object>asList(ogcServiceUri, processIdentifier); } - - // All fields are searchable in the Service palette, - // for instance try a search for exampleString:3 - private URI ogcServiceUri; - private String processIdentifier; - private List<ActivityInputPortDefinitionBean> inputPortDefinitions; - private List<ActivityOutputPortDefinitionBean> outputPortDefinitions; - public URI getOgcServiceUri() { return ogcServiceUri; } + public void setOgcServiceUri(URI ogcServiceUri) { this.ogcServiceUri = ogcServiceUri; } + public String getProcessIdentifier() { return processIdentifier; } + public void setProcessIdentifier(String processIdentifier) { this.processIdentifier = processIdentifier; } - public List<ActivityInputPortDefinitionBean> getInputPortDefinitions() { + public List<IPortDataDescriptor> getInputPortDefinitions() { return inputPortDefinitions; } - public void setInputPortDefinitions(List<ActivityInputPortDefinitionBean> inputPortDefinitions) { + public void setInputPortDefinitions(List<IPortDataDescriptor> inputPortDefinitions) { this.inputPortDefinitions = inputPortDefinitions; } - public List<ActivityOutputPortDefinitionBean> getOutputPortDefinitions() { + public List<IPortDataDescriptor> getOutputPortDefinitions() { return outputPortDefinitions; } - public void setOutputPortDefinitions(List<ActivityOutputPortDefinitionBean> outputPortDefinitions) { + public void setOutputPortDefinitions(List<IPortDataDescriptor> outputPortDefinitions) { this.outputPortDefinitions = outputPortDefinitions; } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/00f882b1/apache-taverna-plugin-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityConfigurationBean.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityConfigurationBean.java b/apache-taverna-plugin-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityConfigurationBean.java index 1372540..56f311a 100644 --- a/apache-taverna-plugin-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityConfigurationBean.java +++ b/apache-taverna-plugin-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityConfigurationBean.java @@ -2,18 +2,21 @@ package org.apache.taverna.gis; import java.io.Serializable; import java.net.URI; +import java.util.List; -import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityPortsDefinitionBean; +import org.apache.taverna.gis.client.IPortDataDescriptor; /** * Gis activity configuration bean. * */ @SuppressWarnings("serial") -public class GisActivityConfigurationBean extends ActivityPortsDefinitionBean implements Serializable { +public class GisActivityConfigurationBean implements Serializable { private URI ogcServiceUri; private String processIdentifier; + private List<IPortDataDescriptor> inputPortDefinitions; + private List<IPortDataDescriptor> outputPortDefinitions; public URI getOgcServiceUri() { return ogcServiceUri; @@ -27,5 +30,16 @@ public class GisActivityConfigurationBean extends ActivityPortsDefinitionBean im public void setProcessIdentifier(String processIdentifier) { this.processIdentifier = processIdentifier; } - + public List<IPortDataDescriptor> getInputPortDefinitions() { + return inputPortDefinitions; + } + public void setInputPortDefinitions(List<IPortDataDescriptor> inputPortDefinitions) { + this.inputPortDefinitions = inputPortDefinitions; + } + public List<IPortDataDescriptor> getOutputPortDefinitions() { + return outputPortDefinitions; + } + public void setOutputPortDefinitions(List<IPortDataDescriptor> outputPortDefinitions) { + this.outputPortDefinitions = outputPortDefinitions; + } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/00f882b1/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 index 2c5d0df..3a37fe9 100644 --- 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 @@ -10,9 +10,9 @@ public class ComplexPortDataDescriptor implements IPortDataDescriptor { private Object handledReferenceSchemes; private Class<?> translatedElementType; private boolean isRequired; - private List<ComplexDataTypeDescriptor> supportedComplexFormats; - private ComplexDataTypeDescriptor defaultComplexFormat; - private ComplexDataTypeDescriptor complexFormat; + private List<ComplexDataFormat> supportedComplexFormats; + private ComplexDataFormat defaultComplexFormat; + private ComplexDataFormat complexFormat; @Override public String getName() { @@ -71,22 +71,22 @@ public class ComplexPortDataDescriptor implements IPortDataDescriptor { this.isRequired = isRequired; } - public List<ComplexDataTypeDescriptor> getSupportedComplexFormats() { + public List<ComplexDataFormat> getSupportedComplexFormats() { return supportedComplexFormats; } - public void setSupportedComplexFormats(List<ComplexDataTypeDescriptor> supportedComplexFormats) { + public void setSupportedComplexFormats(List<ComplexDataFormat> supportedComplexFormats) { this.supportedComplexFormats = supportedComplexFormats; } - public ComplexDataTypeDescriptor getDefaultComplexFormat() { + public ComplexDataFormat getDefaultComplexFormat() { return defaultComplexFormat; } - public void setDefaultComplexFormat(ComplexDataTypeDescriptor defaultComplexFormat) { + public void setDefaultComplexFormat(ComplexDataFormat defaultComplexFormat) { this.defaultComplexFormat = defaultComplexFormat; } - public ComplexDataTypeDescriptor getComplexFormat() { + public ComplexDataFormat getComplexFormat() { return complexFormat; } - public void setComplexFormat(ComplexDataTypeDescriptor complexFormat) { + public void setComplexFormat(ComplexDataFormat complexFormat) { this.complexFormat = complexFormat; }
