Repository: airavata Updated Branches: refs/heads/gfac_appcatalog_int 4b27ce8a0 -> f09c742b8
XBaya - Replaced DataObjectType with Input and OutputDataObjectType Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f09c742b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f09c742b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f09c742b Branch: refs/heads/gfac_appcatalog_int Commit: f09c742b8f4bb6cb91c61b852e82e414250a5bd7 Parents: 4b27ce8 Author: shamrath <[email protected]> Authored: Thu Nov 6 19:40:55 2014 -0500 Committer: shamrath <[email protected]> Committed: Thu Nov 6 19:40:55 2014 -0500 ---------------------------------------------------------------------- .../ui/experiment/LaunchApplicationWindow.java | 58 +++++++++----------- .../WorkflowInterpreterLaunchWindow.java | 17 ++++-- 2 files changed, 36 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/f09c742b/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 9fb6884..3740918 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 @@ -21,48 +21,25 @@ package org.apache.airavata.xbaya.ui.experiment; -import java.awt.event.ActionEvent; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.swing.AbstractAction; -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.border.EtchedBorder; -import javax.xml.namespace.QName; - import org.apache.airavata.api.Airavata.Client; -import org.apache.airavata.common.utils.XMLUtil; +import org.apache.airavata.model.appcatalog.appinterface.DataType; +import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; +import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; import org.apache.airavata.model.error.AiravataClientConnectException; import org.apache.airavata.model.error.AiravataClientException; import org.apache.airavata.model.error.AiravataSystemException; import org.apache.airavata.model.error.InvalidRequestException; import org.apache.airavata.model.workspace.Project; import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling; -import org.apache.airavata.model.workspace.experiment.DataObjectType; -import org.apache.airavata.model.workspace.experiment.DataType; import org.apache.airavata.model.workspace.experiment.Experiment; import org.apache.airavata.model.workspace.experiment.UserConfigurationData; import org.apache.airavata.workflow.model.graph.DataPort; import org.apache.airavata.workflow.model.graph.impl.NodeImpl; -import org.apache.airavata.workflow.model.graph.system.InputNode; -import org.apache.airavata.workflow.model.graph.system.OutputNode; -import org.apache.airavata.workflow.model.graph.util.GraphUtil; import org.apache.airavata.workflow.model.wf.Workflow; -import org.apache.airavata.ws.monitor.MonitorConfiguration; import org.apache.airavata.xbaya.ThriftClientData; import org.apache.airavata.xbaya.ThriftServiceType; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog; -import org.apache.airavata.xbaya.ui.utils.ErrorMessages; import org.apache.airavata.xbaya.ui.widgets.GridPanel; import org.apache.airavata.xbaya.ui.widgets.XBayaLabel; import org.apache.airavata.xbaya.ui.widgets.XBayaTextField; @@ -70,7 +47,22 @@ import org.apache.airavata.xbaya.util.XBayaUtil; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xmlpull.infoset.XmlElement; + +import javax.swing.AbstractAction; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.border.EtchedBorder; +import javax.xml.namespace.QName; +import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class LaunchApplicationWindow { @@ -364,8 +356,8 @@ public class LaunchApplicationWindow { DataPort inputPort = inputPorts.get(i); XBayaTextField parameterTextField = this.parameterTextFields.get(i); String value = parameterTextField.getText(); - DataObjectType elem = new DataObjectType(); - elem.setKey(inputPort.getName()); + InputDataObjectType elem = new InputDataObjectType(); + elem.setName(inputPort.getName()); String type = inputPort.getType().getLocalPart().trim(); DataType inpType = DataType.STRING; if(type.equalsIgnoreCase("string")){ @@ -391,8 +383,8 @@ public class LaunchApplicationWindow { for (int i = 0; i < outputPorts.size(); i++) { DataPort outputPort = outputPorts.get(i); - DataObjectType elem = new DataObjectType(); - elem.setKey(outputPort.getName()); + OutputDataObjectType elem = new OutputDataObjectType(); + elem.setName(outputPort.getName()); String type = outputPort.getType().getLocalPart().trim(); DataType outType = DataType.STRING; if(type.equalsIgnoreCase("string")){ @@ -443,10 +435,10 @@ public class LaunchApplicationWindow { while(output.equals("")){ output = ""; fullOutput = "Experiment Completed Successfully. Output(s) are shown below:\n"; - List<DataObjectType> outputs = airavataClient.getExperimentOutputs(experiment.getExperimentID()); + List<OutputDataObjectType> outputs = airavataClient.getExperimentOutputs(experiment.getExperimentID()); for(int i1=0; i1<outputs.size(); i1++){ output = outputs.get(i1).getValue(); - fullOutput+= outputs.get(i1).getKey()+": "+output+"\n"; + fullOutput+= outputs.get(i1).getName()+": "+output+"\n"; } } JOptionPane.showMessageDialog(null, fullOutput); http://git-wip-us.apache.org/repos/asf/airavata/blob/f09c742b/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 76a745a..c0533b4 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 @@ -26,6 +26,8 @@ import org.apache.airavata.api.Airavata.Client; import org.apache.airavata.api.client.AiravataClientFactory; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.common.utils.XMLUtil; +import org.apache.airavata.model.appcatalog.appinterface.DataType; +import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; import org.apache.airavata.model.error.AiravataClientConnectException; import org.apache.airavata.model.error.AiravataClientException; import org.apache.airavata.model.error.AiravataSystemException; @@ -33,8 +35,6 @@ import org.apache.airavata.model.error.InvalidRequestException; import org.apache.airavata.model.util.ExperimentModelUtil; import org.apache.airavata.model.workspace.Project; import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling; -import org.apache.airavata.model.workspace.experiment.DataObjectType; -import org.apache.airavata.model.workspace.experiment.DataType; import org.apache.airavata.model.workspace.experiment.Experiment; import org.apache.airavata.model.workspace.experiment.UserConfigurationData; import org.apache.airavata.orchestrator.client.OrchestratorClientFactory; @@ -47,7 +47,6 @@ import org.apache.airavata.xbaya.ThriftServiceType; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.messaging.MonitorException; import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog; -import org.apache.airavata.xbaya.ui.utils.ErrorMessages; import org.apache.airavata.xbaya.ui.widgets.GridPanel; import org.apache.airavata.xbaya.ui.widgets.XBayaLabel; import org.apache.airavata.xbaya.ui.widgets.XBayaTextField; @@ -57,7 +56,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xmlpull.infoset.XmlElement; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; import javax.swing.border.EtchedBorder; import javax.xml.namespace.QName; import java.awt.event.ActionEvent; @@ -301,8 +306,8 @@ public class WorkflowInterpreterLaunchWindow { inputNode.getID(); String value = parameterTextField.getText(); // inputNode.setDefaultValue(value); - DataObjectType elem = new DataObjectType(); - elem.setKey(inputNode.getID()); + InputDataObjectType elem = new InputDataObjectType(); + elem.setName(inputNode.getID()); elem.setType(DataType.STRING); elem.setValue(value); experiment.addToExperimentInputs(elem );
