Repository: airavata Updated Branches: refs/heads/master bfaac64d8 -> db4569977
http://git-wip-us.apache.org/repos/asf/airavata/blob/db456997/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/util/GraphUtil.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/util/GraphUtil.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/util/GraphUtil.java index 0dc3e2c..6b46405 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/util/GraphUtil.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/util/GraphUtil.java @@ -33,6 +33,7 @@ import java.util.Map; import javax.xml.namespace.QName; import org.apache.airavata.common.utils.WSConstants; +import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; import org.apache.airavata.workflow.model.graph.ControlEdge; import org.apache.airavata.workflow.model.graph.ControlPort; @@ -271,8 +272,8 @@ public class GraphUtil { DataPort fromDataPort = (DataPort) fromPort; DataPort toDataPort = (DataPort) toPort; - QName fromType = fromDataPort.getType(); - QName toType = toDataPort.getType(); + DataType fromType = fromDataPort.getType(); + DataType toType = toDataPort.getType(); if (toDataPort.getEdges().size() > 1) { throw new GraphException( http://git-wip-us.apache.org/repos/asf/airavata/blob/db456997/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java index 606982f..0140993 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java @@ -25,6 +25,7 @@ import javax.xml.namespace.QName; import com.google.gson.JsonObject; import org.apache.airavata.common.utils.WSConstants; +import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.ComponentPort; import org.apache.airavata.workflow.model.component.system.SystemComponentDataPort; import org.apache.airavata.workflow.model.component.ws.WSComponentPort; @@ -65,7 +66,7 @@ public class WSPort extends DataPort { * @return The typeQName */ @Override - public QName getType() { + public DataType getType() { return getComponentPort().getType(); } @@ -74,8 +75,8 @@ public class WSPort extends DataPort { */ @Override public void copyType(DataPort port) throws GraphException { - QName newType = port.getType(); - QName type = getType(); + DataType newType = port.getType(); + DataType type = getType(); NodeImpl node = port.getNode(); if (node instanceof ForEachNode || node instanceof EndForEachNode) { http://git-wip-us.apache.org/repos/asf/airavata/blob/db456997/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java index a1c0103..c475747 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java @@ -467,7 +467,7 @@ public class Workflow implements Cloneable { List<InputNode> inputNodes = GraphUtil.getInputNodes(getGraph()); List<WorkflowInput> results=new ArrayList<WorkflowInput>(); for (InputNode port : inputNodes) { - results.add(new WorkflowInput(port.getID(), port.getParameterType().getLocalPart(), port.getDefaultValue(), port.getDefaultValue(), !port.isVisibility())); + results.add(new WorkflowInput(port.getID(), port.getParameterType(), port.getDefaultValue(), port.getDefaultValue(), !port.isVisibility())); } return results; } http://git-wip-us.apache.org/repos/asf/airavata/blob/db456997/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowInput.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowInput.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowInput.java index 8b8403b..6528d41 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowInput.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowInput.java @@ -21,9 +21,11 @@ package org.apache.airavata.workflow.model.wf; +import org.apache.airavata.model.appcatalog.appinterface.DataType; + public class WorkflowInput { private String name; - private String type; + private DataType type; private Object defaultValue; private Object value; private boolean optional; @@ -32,7 +34,7 @@ public class WorkflowInput { this(name, null, null, value, false); } - public WorkflowInput(String name,String type,Object defaultValue,Object value, boolean optional) throws InvalidDataFormatException { + public WorkflowInput(String name,DataType type,Object defaultValue,Object value, boolean optional) throws InvalidDataFormatException { setName(name); setType(type); setDefaultValue(defaultValue); @@ -48,11 +50,11 @@ public class WorkflowInput { this.name = name; } - public String getType() { + public DataType getType() { return type; } - private void setType(String type) { + private void setType(DataType type) { this.type = type; } http://git-wip-us.apache.org/repos/asf/airavata/blob/db456997/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInputUtil.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInputUtil.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInputUtil.java index 2d892f0..1295c07 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInputUtil.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInputUtil.java @@ -22,6 +22,7 @@ package org.apache.airavata.xbaya.invoker; import org.apache.airavata.common.utils.StringUtil; import org.apache.airavata.common.utils.XMLUtil; +import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.ws.WSComponentPort; import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; import org.apache.airavata.xbaya.XBayaConstants; @@ -32,7 +33,7 @@ import javax.xml.namespace.QName; public class WorkflowInputUtil { public static String createInputForGFacService(WSComponentPort port,String input){ - String paramType = port.getType().getLocalPart(); + DataType paramType = port.getType(); StringBuffer inputString = new StringBuffer("<"); if("StringParameterType".equals(paramType) || "URIParameterType".equals(paramType) || "DoubleParameterType".equals(paramType) || "IntegerParameterType".equals(paramType) @@ -40,7 +41,7 @@ public class WorkflowInputUtil { || "FileParameterType".equals(paramType)){ inputString.append(port.getName()).append(">"). append(getValueElement(input)).append("</").append(port.getName()).append(">"); - }else if(paramType.endsWith("ArrayType")){ + }else if(paramType.toString().endsWith("ArrayType")){ inputString.append(port.getName()).append(">"); String[] valueList = StringUtil.getElementsFromString(input); for(String inputValue:valueList){ @@ -63,22 +64,9 @@ public class WorkflowInputUtil { throw new WorkflowRuntimeException("Input parameter, " + name + ", cannot be empty"); } } - QName type = input.getType(); + DataType type = input.getType(); Object value; - if (LEADTypes.isKnownType(type)) { - // TODO check the type. - value = valueString; - } else { - try { - if(XBayaConstants.HTTP_SCHEMAS_AIRAVATA_APACHE_ORG_GFAC_TYPE.equals(input.getType().getNamespaceURI())){ - value = XMLUtil.stringToXmlElement3(WorkflowInputUtil.createInputForGFacService(input, valueString)); - }else { - throw new WorkflowRuntimeException("Input parameter, " + name + ", Unkown Type"); - } - } catch (RuntimeException e) { - throw new WorkflowRuntimeException("Input parameter, " + name + ", is not valid XML", e); - } - } + value = valueString; return value; } } http://git-wip-us.apache.org/repos/asf/airavata/blob/db456997/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java index 724b091..50d3a76 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java @@ -36,6 +36,7 @@ import javax.swing.JFileChooser; import javax.swing.JPanel; import javax.xml.namespace.QName; +import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.url.URLComponentRegistry; import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; import org.apache.airavata.workflow.model.graph.DataPort; @@ -248,7 +249,7 @@ public class DynamicNodeWindow { String function = ""; List<Port> toNodes = this.node.getOutputPort(0).getToPorts(); XmlElement returnElement = null; - QName returnType = null; + DataType returnType = null; if (toNodes.size() == 0) { function += SPACE + "void"; } else { http://git-wip-us.apache.org/repos/asf/airavata/blob/db456997/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java index 52b89a7..13762ed 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java @@ -29,6 +29,7 @@ import javax.swing.JPanel; import javax.xml.namespace.QName; import org.apache.airavata.common.utils.XMLUtil; +import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.graph.system.ConstantNode; import org.apache.airavata.xbaya.lead.LEADTypes; import org.apache.airavata.xbaya.ui.XBayaGUI; @@ -78,15 +79,10 @@ public class ConstantConfigurationDialog { * Shows the dialog. */ public void show() { - QName type = this.node.getType(); + DataType type = this.node.getType(); XBayaTextComponent textComponent; - if (LEADTypes.isKnownType(type)) { - textComponent = this.valueTextField; - this.valueLabel.setText("Default value"); - } else { - textComponent = this.valueTextArea; - this.valueLabel.setText("Default value (in XML)"); - } + textComponent = this.valueTextField; + this.valueLabel.setText("Default value"); this.valueLabel.setLabelFor(textComponent); final int index = 7; this.gridPanel.remove(index); @@ -120,13 +116,9 @@ public class ConstantConfigurationDialog { private void setInput() { String name = this.nameTextField.getText(); - QName type = this.node.getType(); + DataType type = this.node.getType(); String valueString; - if (LEADTypes.isKnownType(type)) { - valueString = this.valueTextField.getText(); - } else { - valueString = this.valueTextArea.getText(); - } + valueString = this.valueTextField.getText(); if (name.length() == 0) { String warning = "The name cannot be empty."; @@ -135,20 +127,11 @@ public class ConstantConfigurationDialog { } Object value = null; if (valueString.length() > 0) { - if (LEADTypes.isKnownType(type)) { - if (!this.node.isInputValid(valueString)) { - String warning = "The defalut value is not valid for " + this.node.getType() + "."; - this.xbayaGUI.getErrorWindow().error(warning); - } - value = valueString; - } else { - try { - value = XMLUtil.stringToXmlElement(valueString); - } catch (RuntimeException e) { - String warning = "The XML for the default value is not valid."; - this.xbayaGUI.getErrorWindow().error(warning, e); - } + if (!this.node.isInputValid(valueString)) { + String warning = "The defalut value is not valid for " + this.node.getType() + "."; + this.xbayaGUI.getErrorWindow().error(warning); } + value = valueString; } this.node.setName(name); http://git-wip-us.apache.org/repos/asf/airavata/blob/db456997/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java index 8b075c4..665f1da 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java @@ -30,6 +30,7 @@ import javax.xml.namespace.QName; import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.common.utils.XMLUtil; +import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.graph.Node.NodeExecutionState; import org.apache.airavata.workflow.model.graph.system.DifferedInputNode; import org.apache.airavata.xbaya.graph.controller.NodeController; @@ -81,29 +82,17 @@ public class DifferedInputConfigurationDialog { * Shows the dialog. */ public void show() { - QName type = this.node.getParameterType(); + DataType type = this.node.getParameterType(); XBayaTextComponent textComponent; - boolean knownType = LEADTypes.isKnownType(type); - if (knownType) { - textComponent = this.valueTextField; - this.valueLabel.setText("Default value"); - } else { - textComponent = this.valueTextArea; - this.valueLabel.setText("Default value (in XML)"); - } +// boolean knownType = LEADTypes.isKnownType(type); + textComponent = this.valueTextField; + this.valueLabel.setText("Default value"); this.valueLabel.setLabelFor(textComponent); final int index = 5; this.gridPanel.remove(index); this.gridPanel.add(textComponent, index); - if (knownType) { - this.gridPanel.layout(new double[] { 0, 1.0 / 2, 0, 1.0 / 2 }, - new double[] { 0, 1 }); - } else { - this.gridPanel.layout( - new double[] { 0, 1.0 / 3, 1.0 / 3, 1.0 / 3 }, - new double[] { 0, 1 }); - } - + this.gridPanel.layout(new double[] { 0, 1.0 / 2, 0, 1.0 / 2 }, + new double[] { 0, 1 }); // String name = this.node.getConfiguredName(); // if (name == null) { // name = this.node.getName(); @@ -144,13 +133,9 @@ public class DifferedInputConfigurationDialog { } private void setInput() { - QName type = this.node.getParameterType(); + DataType type = this.node.getParameterType(); XBayaTextComponent textComponent; - if (LEADTypes.isKnownType(type)) { - textComponent = this.valueTextField; - } else { - textComponent = this.valueTextArea; - } + textComponent = this.valueTextField; String name = this.nameTextField.getText(); String description = this.descriptionTextArea.getText(); @@ -164,21 +149,12 @@ public class DifferedInputConfigurationDialog { } Object value = null; if (valueString.length() > 0) { - if (LEADTypes.isKnownType(type)) { - if (!this.node.isInputValid(valueString)) { - String warning = "The defalut value is not valid for " - + this.node.getParameterType() + "."; - this.xbayaGUI.getErrorWindow().error(warning); - } - value = valueString; - } else { - try { - value = XMLUtil.stringToXmlElement(valueString); - } catch (RuntimeException e) { - String warning = "The XML for the default value is not valid."; - this.xbayaGUI.getErrorWindow().error(warning, e); - } + if (!this.node.isInputValid(valueString)) { + String warning = "The defalut value is not valid for " + + this.node.getParameterType() + "."; + this.xbayaGUI.getErrorWindow().error(warning); } + value = valueString; } XmlElement metadata; if (metadataText.length() == 0) { http://git-wip-us.apache.org/repos/asf/airavata/blob/db456997/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java index 84249a9..340d82b 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java @@ -29,6 +29,7 @@ import javax.swing.JPanel; import javax.xml.namespace.QName; import org.apache.airavata.common.utils.XMLUtil; +import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.graph.system.InputNode; import org.apache.airavata.xbaya.lead.LEADTypes; import org.apache.airavata.xbaya.ui.XBayaGUI; @@ -80,26 +81,16 @@ public class InputConfigurationDialog { * Shows the dialog. */ public void show() { - QName type = this.node.getParameterType(); + DataType type = this.node.getParameterType(); XBayaTextComponent textComponent; - boolean knownType = LEADTypes.isKnownType(type); - if (knownType) { - textComponent = this.valueTextField; - this.valueLabel.setText("Value"); - } else { - textComponent = this.valueTextArea; - this.valueLabel.setText("Value (in XML)"); - } + textComponent = this.valueTextField; + this.valueLabel.setText("Value"); + this.valueLabel.setLabelFor(textComponent); final int index = 3; this.gridPanel.remove(index); this.gridPanel.add(textComponent, index); - if (knownType) { - this.gridPanel.layout(new double[] { 0,0, 1.0 / 2}, new double[] { 0, 1 }); - } else { - this.gridPanel.layout(new double[] { 0, 1.0 / 3,0, 1.0 / 3}, new double[] { 0, 1 }); - } - + this.gridPanel.layout(new double[] { 0,0, 1.0 / 2}, new double[] { 0, 1 }); String name = this.node.getID(); // Show ID. this.nameTextField.setText(name); @@ -116,11 +107,7 @@ public class InputConfigurationDialog { } else { valueString = value.toString(); } - if (knownType) { - this.valueTextField.setText(valueString); - } else { - this.valueTextArea.setText(valueString); - } + this.valueTextField.setText(valueString); textComponent.setText(valueString); // XmlElement metadata = this.node.getMetadata(); // String metadataText; @@ -142,13 +129,9 @@ public class InputConfigurationDialog { } private void setInput() { - QName type = this.node.getParameterType(); + DataType type = this.node.getParameterType(); XBayaTextComponent textComponent; - if (LEADTypes.isKnownType(type)) { - textComponent = this.valueTextField; - } else { - textComponent = this.valueTextArea; - } + textComponent = this.valueTextField; String name = this.nameTextField.getText(); String description = this.descriptionTextArea.getText(); @@ -163,20 +146,11 @@ public class InputConfigurationDialog { } Object value = null; if (valueString.length() > 0) { - if (LEADTypes.isKnownType(type)) { - if (!this.node.isInputValid(valueString)) { - String warning = "The defalut value is not valid for " + this.node.getParameterType() + "."; - this.xbayaGUI.getErrorWindow().error(warning); - } - value = valueString; - } else { - try { - value = XMLUtil.stringToXmlElement(valueString); - } catch (RuntimeException e) { - String warning = "The XML for the default value is not valid."; - this.xbayaGUI.getErrorWindow().error(warning, e); - } + if (!this.node.isInputValid(valueString)) { + String warning = "The defalut value is not valid for " + this.node.getParameterType() + "."; + this.xbayaGUI.getErrorWindow().error(warning); } + value = valueString; } // XmlElement metadata; // if (metadataText.length() == 0) { http://git-wip-us.apache.org/repos/asf/airavata/blob/db456997/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/LaunchApplicationWindow.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/LaunchApplicationWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/LaunchApplicationWindow.java index 3740918..9637352 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/LaunchApplicationWindow.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/LaunchApplicationWindow.java @@ -149,9 +149,9 @@ public class LaunchApplicationWindow { List<DataPort> inputPorts = node.getInputPorts(); for(DataPort port : inputPorts){ String id = port.getName(); - QName parameterType = port.getType(); + DataType parameterType = port.getType(); JLabel nameLabel = new JLabel(id); - JLabel typeField = new JLabel(parameterType.getLocalPart()); + JLabel typeField = new JLabel(parameterType.toString()); XBayaTextField paramField = new XBayaTextField(); paramField.setText(""); this.parameterPanel.add(nameLabel); @@ -358,24 +358,8 @@ public class LaunchApplicationWindow { String value = parameterTextField.getText(); InputDataObjectType elem = new InputDataObjectType(); elem.setName(inputPort.getName()); - String type = inputPort.getType().getLocalPart().trim(); - DataType inpType = DataType.STRING; - if(type.equalsIgnoreCase("string")){ - inpType=DataType.STRING; - } - else if(type.equalsIgnoreCase("integer")){ - inpType=DataType.INTEGER; - } - else if(type.equalsIgnoreCase("uri")){ - inpType=DataType.URI; - } - else if(type.equalsIgnoreCase("stdour")){ - inpType=DataType.STDOUT; - } - else if(type.equalsIgnoreCase("stderr")){ - inpType=DataType.STDERR; - } - elem.setType(inpType); + + elem.setType(elem.getType()); elem.setValue(value); experiment.addToExperimentInputs(elem ); } @@ -385,24 +369,8 @@ public class LaunchApplicationWindow { DataPort outputPort = outputPorts.get(i); OutputDataObjectType elem = new OutputDataObjectType(); elem.setName(outputPort.getName()); - String type = outputPort.getType().getLocalPart().trim(); - DataType outType = DataType.STRING; - if(type.equalsIgnoreCase("string")){ - outType=DataType.STRING; - } - else if(type.equalsIgnoreCase("integer")){ - outType=DataType.INTEGER; - } - else if(type.equalsIgnoreCase("uri")){ - outType=DataType.URI; - } - else if(type.equalsIgnoreCase("stdour")){ - outType=DataType.STDOUT; - } - else if(type.equalsIgnoreCase("stderr")){ - outType=DataType.STDERR; - } - elem.setType(outType); + + elem.setType(elem.getType()); elem.setValue(""); experiment.addToExperimentOutputs(elem ); } http://git-wip-us.apache.org/repos/asf/airavata/blob/db456997/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java index 8f49623..3e9d1a6 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java @@ -122,9 +122,9 @@ public class WorkflowInterpreterLaunchWindow { Collection<InputNode> inputNodes = GraphUtil.getInputNodes(this.workflow.getGraph()); for (InputNode node : inputNodes) { String id = node.getID(); - QName parameterType = node.getParameterType(); + DataType parameterType = node.getParameterType(); JLabel nameLabel = new JLabel(id); - JLabel typeField = new JLabel(parameterType.getLocalPart()); + JLabel typeField = new JLabel(parameterType.toString()); XBayaTextField paramField = new XBayaTextField(); Object value = node.getDefaultValue(); @@ -306,7 +306,7 @@ public class WorkflowInterpreterLaunchWindow { // inputNode.setDefaultValue(value); InputDataObjectType elem = new InputDataObjectType(); elem.setName(inputNode.getID()); - elem.setType(DataType.STRING); + elem.setType(inputNode.getDataType()); elem.setValue(value); elem.setApplicationArgument(inputNode.getApplicationArgument()); elem.setInputOrder(inputNode.getInputOrder());
