You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/05/25 19:23:13 UTC
svn commit: r1342741 [2/3] - in
/incubator/airavata/trunk/modules/xbaya-gui/src:
main/java/org/apache/airavata/xbaya/component/registry/
main/java/org/apache/airavata/xbaya/interpretor/
main/java/org/apache/airavata/xbaya/invoker/ main/java/org/apache/...
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java Fri May 25 17:23:11 2012
@@ -48,15 +48,19 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.ws.WSNode;
import org.apache.airavata.workflow.model.ode.ODEClient;
import org.apache.airavata.workflow.model.wf.Workflow;
+import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.interpretor.GUIWorkflowInterpreterInteractorImpl;
import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
+import org.apache.airavata.xbaya.interpretor.WorkflowInterpreterConfiguration;
import org.apache.airavata.xbaya.jython.script.JythonScript;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.monitor.MonitorException;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.graph.ws.WSNodeGUI;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
+import org.apache.airavata.xbaya.ui.utils.MyProxyChecker;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
@@ -390,9 +394,12 @@ public class DynamicWorkflowRunnerWindow
*/
@Override
public void run() {
+ XBayaConfiguration conf = DynamicWorkflowRunnerWindow.this.engine.getConfiguration();
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getJcrComponentRegistry().getRegistry(), conf, DynamicWorkflowRunnerWindow.this.engine.getGUI(), new MyProxyChecker(DynamicWorkflowRunnerWindow.this.engine), DynamicWorkflowRunnerWindow.this.engine.getMonitor());
WorkflowInterpreter workflowInterpreter = new WorkflowInterpreter(
- DynamicWorkflowRunnerWindow.this.engine, topicString);
+ workflowInterpreterConfiguration, topicString, new GUIWorkflowInterpreterInteractorImpl(engine, engine.getGUI().getWorkflow()));
+ DynamicWorkflowRunnerWindow.this.engine.registerWorkflowInterpreter(workflowInterpreter);
workflowInterpreter.setRunWithCrossProduct(isRunCrossProduct);
try {
MonitorConfiguration notifConfig = DynamicWorkflowRunnerWindow.this.engine.getMonitor()
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java Fri May 25 17:23:11 2012
@@ -30,8 +30,8 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.workflow.model.graph.system.ConstantNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.lead.LEADTypes;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
@@ -42,7 +42,7 @@ import org.xmlpull.infoset.XmlElement;
public class ConstantConfigurationDialog {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private ConstantNode node;
@@ -68,8 +68,8 @@ public class ConstantConfigurationDialog
* @param node
* @param engine
*/
- public ConstantConfigurationDialog(ConstantNode node, XBayaEngine engine) {
- this.engine = engine;
+ public ConstantConfigurationDialog(ConstantNode node, XBayaGUI xbayaGUI) {
+ this.xbayaGUI=xbayaGUI;
this.node = node;
initGui();
}
@@ -130,7 +130,7 @@ public class ConstantConfigurationDialog
if (name.length() == 0) {
String warning = "The name cannot be empty.";
- this.engine.getGUI().getErrorWindow().error(warning);
+ this.xbayaGUI.getErrorWindow().error(warning);
return;
}
Object value = null;
@@ -138,7 +138,7 @@ public class ConstantConfigurationDialog
if (LEADTypes.isKnownType(type)) {
if (!this.node.isInputValid(valueString)) {
String warning = "The defalut value is not valid for " + this.node.getType() + ".";
- this.engine.getGUI().getErrorWindow().error(warning);
+ this.xbayaGUI.getErrorWindow().error(warning);
}
value = valueString;
} else {
@@ -146,7 +146,7 @@ public class ConstantConfigurationDialog
value = XMLUtil.stringToXmlElement(valueString);
} catch (RuntimeException e) {
String warning = "The XML for the default value is not valid.";
- this.engine.getGUI().getErrorWindow().error(warning, e);
+ this.xbayaGUI.getErrorWindow().error(warning, e);
}
}
}
@@ -154,7 +154,7 @@ public class ConstantConfigurationDialog
this.node.setName(name);
this.node.setValue(value);
hide();
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
/**
@@ -206,7 +206,7 @@ public class ConstantConfigurationDialog
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "Constant Configuration", this.gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "Constant Configuration", this.gridPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java Fri May 25 17:23:11 2012
@@ -17,9 +17,9 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.workflow.model.graph.system.DifferedInputNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.lead.LEADTypes;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.graph.system.DifferedInputNodeGUI;
import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler.NodeState;
@@ -34,7 +34,7 @@ import org.xmlpull.infoset.XmlElement;
* @author Chathura Herath
*/
public class DifferedInputConfigurationDialog {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private DifferedInputNode node;
@@ -60,8 +60,8 @@ public class DifferedInputConfigurationD
* @param node
* @param engine
*/
- public DifferedInputConfigurationDialog(DifferedInputNode node, XBayaEngine engine) {
- this.engine = engine;
+ public DifferedInputConfigurationDialog(DifferedInputNode node, XBayaGUI xbayaGUI) {
+ this.xbayaGUI=xbayaGUI;
this.node = node;
initGui();
}
@@ -148,7 +148,7 @@ public class DifferedInputConfigurationD
if (name.length() == 0) {
String warning = "The name cannot be empty.";
- this.engine.getGUI().getErrorWindow().error(warning);
+ this.xbayaGUI.getErrorWindow().error(warning);
return;
}
Object value = null;
@@ -157,7 +157,7 @@ public class DifferedInputConfigurationD
if (!this.node.isInputValid(valueString)) {
String warning = "The defalut value is not valid for "
+ this.node.getParameterType() + ".";
- this.engine.getGUI().getErrorWindow().error(warning);
+ this.xbayaGUI.getErrorWindow().error(warning);
}
value = valueString;
} else {
@@ -165,7 +165,7 @@ public class DifferedInputConfigurationD
value = XMLUtil.stringToXmlElement(valueString);
} catch (RuntimeException e) {
String warning = "The XML for the default value is not valid.";
- this.engine.getGUI().getErrorWindow().error(warning, e);
+ this.xbayaGUI.getErrorWindow().error(warning, e);
}
}
}
@@ -177,7 +177,7 @@ public class DifferedInputConfigurationD
metadata = XMLUtil.stringToXmlElement(metadataText);
} catch (RuntimeException e) {
String warning = "The metadata is ill-formed.";
- this.engine.getGUI().getErrorWindow().error(warning, e);
+ this.xbayaGUI.getErrorWindow().error(warning, e);
return;
}
}
@@ -190,7 +190,7 @@ public class DifferedInputConfigurationD
NodeController.getGUI(this.node).setBodyColor(NodeState.FINISHED.color);
hide();
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
/**
@@ -244,7 +244,7 @@ public class DifferedInputConfigurationD
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(),
+ this.dialog = new XBayaDialog(this.xbayaGUI,
"Input Parameter Configuration", this.gridPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndBlockConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndBlockConfigurationDialog.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndBlockConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndBlockConfigurationDialog.java Fri May 25 17:23:11 2012
@@ -31,7 +31,7 @@ import javax.swing.SpinnerNumberModel;
import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.graph.system.EndBlockNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
@@ -40,7 +40,7 @@ import org.apache.airavata.xbaya.ui.widg
public class EndBlockConfigurationDialog {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private EndBlockNode node;
@@ -58,8 +58,8 @@ public class EndBlockConfigurationDialog
* @param node
* @param engine
*/
- public EndBlockConfigurationDialog(EndBlockNode node, XBayaEngine engine) {
- this.engine = engine;
+ public EndBlockConfigurationDialog(EndBlockNode node, XBayaGUI xbayaGUI) {
+ this.xbayaGUI=xbayaGUI;
this.node = node;
initGui();
}
@@ -107,11 +107,11 @@ public class EndBlockConfigurationDialog
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.xbayaGUI.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
hide();
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
/**
@@ -157,7 +157,7 @@ public class EndBlockConfigurationDialog
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "Endif Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "Endif Configuration", gridPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndForEachConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndForEachConfigurationDialog.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndForEachConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndForEachConfigurationDialog.java Fri May 25 17:23:11 2012
@@ -31,7 +31,7 @@ import javax.swing.SpinnerNumberModel;
import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.graph.system.EndForEachNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
@@ -40,7 +40,7 @@ import org.apache.airavata.xbaya.ui.widg
public class EndForEachConfigurationDialog {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private EndForEachNode node;
@@ -58,8 +58,8 @@ public class EndForEachConfigurationDial
* @param node
* @param engine
*/
- public EndForEachConfigurationDialog(EndForEachNode node, XBayaEngine engine) {
- this.engine = engine;
+ public EndForEachConfigurationDialog(EndForEachNode node, XBayaGUI xbayaGUI) {
+ this.xbayaGUI=xbayaGUI;
this.node = node;
initGui();
}
@@ -105,11 +105,11 @@ public class EndForEachConfigurationDial
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.xbayaGUI.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
hide();
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
/**
@@ -155,7 +155,7 @@ public class EndForEachConfigurationDial
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "EndForEach Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "EndForEach Configuration", gridPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndifConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndifConfigurationDialog.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndifConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/EndifConfigurationDialog.java Fri May 25 17:23:11 2012
@@ -31,7 +31,7 @@ import javax.swing.SpinnerNumberModel;
import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.graph.system.EndifNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
@@ -40,7 +40,7 @@ import org.apache.airavata.xbaya.ui.widg
public class EndifConfigurationDialog {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private EndifNode node;
@@ -58,8 +58,8 @@ public class EndifConfigurationDialog {
* @param node
* @param engine
*/
- public EndifConfigurationDialog(EndifNode node, XBayaEngine engine) {
- this.engine = engine;
+ public EndifConfigurationDialog(EndifNode node, XBayaGUI xbayaGUI) {
+ this.xbayaGUI=xbayaGUI;
this.node = node;
initGui();
}
@@ -107,11 +107,11 @@ public class EndifConfigurationDialog {
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.xbayaGUI.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
hide();
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
/**
@@ -157,7 +157,7 @@ public class EndifConfigurationDialog {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "Endif Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "Endif Configuration", gridPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ForEachConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ForEachConfigurationDialog.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ForEachConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ForEachConfigurationDialog.java Fri May 25 17:23:11 2012
@@ -31,7 +31,7 @@ import javax.swing.SpinnerNumberModel;
import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.graph.system.ForEachNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
@@ -40,7 +40,7 @@ import org.apache.airavata.xbaya.ui.widg
public class ForEachConfigurationDialog {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private ForEachNode node;
@@ -58,8 +58,8 @@ public class ForEachConfigurationDialog
* @param node
* @param engine
*/
- public ForEachConfigurationDialog(ForEachNode node, XBayaEngine engine) {
- this.engine = engine;
+ public ForEachConfigurationDialog(ForEachNode node, XBayaGUI xbayaGUI) {
+ this.xbayaGUI=xbayaGUI;
this.node = node;
initGui();
}
@@ -105,11 +105,11 @@ public class ForEachConfigurationDialog
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.xbayaGUI.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
hide();
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
/**
@@ -155,7 +155,7 @@ public class ForEachConfigurationDialog
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "ForEach Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "ForEach Configuration", gridPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/IfConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/IfConfigurationDialog.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/IfConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/IfConfigurationDialog.java Fri May 25 17:23:11 2012
@@ -31,7 +31,7 @@ import javax.swing.SpinnerNumberModel;
import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.graph.system.IfNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
@@ -40,7 +40,7 @@ import org.apache.airavata.xbaya.ui.widg
public class IfConfigurationDialog {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private IfNode node;
@@ -60,8 +60,8 @@ public class IfConfigurationDialog {
* @param node
* @param engine
*/
- public IfConfigurationDialog(IfNode node, XBayaEngine engine) {
- this.engine = engine;
+ public IfConfigurationDialog(IfNode node, XBayaGUI xbayaGUI) {
+ this.xbayaGUI = xbayaGUI;
this.node = node;
initGui();
}
@@ -109,12 +109,12 @@ public class IfConfigurationDialog {
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.xbayaGUI.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
if (xpathString.length() == 0) {
String warning = "XPath cannot be empty.";
- this.engine.getGUI().getErrorWindow().error(warning);
+ this.xbayaGUI.getErrorWindow().error(warning);
return;
}
// Check if it's a valid XPath.
@@ -126,13 +126,13 @@ public class IfConfigurationDialog {
// xpath = new XisXPath(xpathString);
// } catch (RuntimeException e) {
// String warning = "XPath is in wrong format.";
- // this.engine.getGUI().getErrorWindow().error(warning, e);
+ // this.xbayaGUI.getErrorWindow().error(warning, e);
// return;
// }
this.node.setXPath(xpathString);
hide();
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
/**
@@ -183,7 +183,7 @@ public class IfConfigurationDialog {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "If Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "If Configuration", gridPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java Fri May 25 17:23:11 2012
@@ -31,8 +31,8 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.workflow.model.graph.system.InputNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.lead.LEADTypes;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
@@ -43,7 +43,7 @@ import org.xmlpull.infoset.XmlElement;
public class InputConfigurationDialog {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private InputNode node;
@@ -71,8 +71,8 @@ public class InputConfigurationDialog {
* @param node
* @param engine
*/
- public InputConfigurationDialog(InputNode node, XBayaEngine engine) {
- this.engine = engine;
+ public InputConfigurationDialog(InputNode node, XBayaGUI xbayaGUI) {
+ this.xbayaGUI=xbayaGUI;
this.node = node;
initGui();
}
@@ -159,7 +159,7 @@ public class InputConfigurationDialog {
if (name.length() == 0) {
String warning = "The name cannot be empty.";
- this.engine.getGUI().getErrorWindow().error(warning);
+ this.xbayaGUI.getErrorWindow().error(warning);
return;
}
Object value = null;
@@ -167,7 +167,7 @@ public class InputConfigurationDialog {
if (LEADTypes.isKnownType(type)) {
if (!this.node.isInputValid(valueString)) {
String warning = "The defalut value is not valid for " + this.node.getParameterType() + ".";
- this.engine.getGUI().getErrorWindow().error(warning);
+ this.xbayaGUI.getErrorWindow().error(warning);
}
value = valueString;
} else {
@@ -175,7 +175,7 @@ public class InputConfigurationDialog {
value = XMLUtil.stringToXmlElement(valueString);
} catch (RuntimeException e) {
String warning = "The XML for the default value is not valid.";
- this.engine.getGUI().getErrorWindow().error(warning, e);
+ this.xbayaGUI.getErrorWindow().error(warning, e);
}
}
}
@@ -187,7 +187,7 @@ public class InputConfigurationDialog {
metadata = XMLUtil.stringToXmlElement(metadataText);
} catch (RuntimeException e) {
String warning = "The metadata is ill-formed.";
- this.engine.getGUI().getErrorWindow().error(warning, e);
+ this.xbayaGUI.getErrorWindow().error(warning, e);
return;
}
}
@@ -199,7 +199,7 @@ public class InputConfigurationDialog {
this.node.setMetadata(metadata);
this.node.setVisibility(Boolean.parseBoolean(visibilityText));
hide();
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
/**
@@ -254,7 +254,7 @@ public class InputConfigurationDialog {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "Input Parameter Configuration", this.gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "Input Parameter Configuration", this.gridPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java Fri May 25 17:23:11 2012
@@ -30,7 +30,7 @@ import javax.swing.JPanel;
import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.workflow.model.graph.system.OutputNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
@@ -40,7 +40,7 @@ import org.xmlpull.infoset.XmlElement;
public class OutputConfigurationDialog {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private OutputNode node;
@@ -58,8 +58,8 @@ public class OutputConfigurationDialog {
* @param node
* @param engine
*/
- public OutputConfigurationDialog(OutputNode node, XBayaEngine engine) {
- this.engine = engine;
+ public OutputConfigurationDialog(OutputNode node, XBayaGUI xbayaGUI) {
+ this.xbayaGUI=xbayaGUI;
this.node = node;
initGui();
}
@@ -101,7 +101,7 @@ public class OutputConfigurationDialog {
if (name.length() == 0) {
String warning = "The name cannot be empty.";
- this.engine.getGUI().getErrorWindow().error(warning);
+ this.xbayaGUI.getErrorWindow().error(warning);
return;
}
@@ -113,7 +113,7 @@ public class OutputConfigurationDialog {
metadata = XMLUtil.stringToXmlElement(metadataText);
} catch (RuntimeException e) {
String warning = "The metadata is ill-formed.";
- this.engine.getGUI().getErrorWindow().error(warning, e);
+ this.xbayaGUI.getErrorWindow().error(warning, e);
return;
}
}
@@ -123,7 +123,7 @@ public class OutputConfigurationDialog {
this.node.setDescription(description);
this.node.setMetadata(metadata);
hide();
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
/**
@@ -166,7 +166,7 @@ public class OutputConfigurationDialog {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "Input Parameter Configuration", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "Input Parameter Configuration", mainPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ReceiveConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ReceiveConfigurationDialog.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ReceiveConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ReceiveConfigurationDialog.java Fri May 25 17:23:11 2012
@@ -32,6 +32,7 @@ import javax.swing.SpinnerNumberModel;
import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.graph.system.ReceiveNode;
import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
@@ -40,7 +41,7 @@ import org.apache.airavata.xbaya.ui.widg
public class ReceiveConfigurationDialog {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private ReceiveNode node;
@@ -58,8 +59,8 @@ public class ReceiveConfigurationDialog
* @param node
* @param engine
*/
- public ReceiveConfigurationDialog(ReceiveNode node, XBayaEngine engine) {
- this.engine = engine;
+ public ReceiveConfigurationDialog(ReceiveNode node, XBayaGUI xbayaGUI) {
+ this.xbayaGUI=xbayaGUI;
this.node = node;
initGui();
}
@@ -103,11 +104,11 @@ public class ReceiveConfigurationDialog
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.xbayaGUI.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
hide();
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
/**
@@ -153,7 +154,7 @@ public class ReceiveConfigurationDialog
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "Receive Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "Receive Configuration", gridPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/S3FileChooser.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/S3FileChooser.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/S3FileChooser.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/S3FileChooser.java Fri May 25 17:23:11 2012
@@ -32,8 +32,8 @@ import javax.swing.event.TreeSelectionLi
import javax.swing.tree.DefaultMutableTreeNode;
import org.apache.airavata.workflow.model.graph.system.S3InputNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.core.amazon.AmazonCredential;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.dialogs.amazon.BucketsLoader;
import org.apache.airavata.xbaya.ui.dialogs.amazon.ChangeCredentialWindow;
@@ -46,7 +46,7 @@ import org.jets3t.service.security.AWSCr
public class S3FileChooser implements TreeSelectionListener {
private XBayaDialog dialog;
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
protected S3InputNode inputNode;
private String chosenFile;
@@ -59,8 +59,8 @@ public class S3FileChooser implements Tr
* @param engine
* @param inputNode
*/
- public S3FileChooser(XBayaEngine engine, S3InputNode inputNode) {
- this.engine = engine;
+ public S3FileChooser(XBayaGUI xbayaGUI, S3InputNode inputNode) {
+ this.xbayaGUI=xbayaGUI;
this.inputNode = inputNode;
initGUI();
}
@@ -88,7 +88,7 @@ public class S3FileChooser implements Tr
public void actionPerformed(ActionEvent e) {
if (AmazonCredential.getInstance().getAwsAccessKeyId().isEmpty()
|| AmazonCredential.getInstance().getAwsSecretAccessKey().isEmpty()) {
- S3FileChooser.this.engine.getGUI().getErrorWindow().warning(S3FileChooser.this.dialog.getDialog(), "Error",
+ S3FileChooser.this.xbayaGUI.getErrorWindow().warning(S3FileChooser.this.dialog.getDialog(), "Error",
"Aws Access Key not set!");
if (this.credentialWindow == null) {
@@ -97,7 +97,7 @@ public class S3FileChooser implements Tr
try {
this.credentialWindow.show();
} catch (Exception e1) {
- S3FileChooser.this.engine.getGUI().getErrorWindow().error(e1);
+ S3FileChooser.this.xbayaGUI.getErrorWindow().error(e1);
}
return;
@@ -110,12 +110,12 @@ public class S3FileChooser implements Tr
S3Service s3Service = new RestS3Service(new AWSCredentials(AmazonCredential.getInstance()
.getAwsAccessKeyId(), AmazonCredential.getInstance().getAwsSecretAccessKey()));
- BucketsLoader bucketsLoader = new BucketsLoader(S3FileChooser.this.engine,
+ BucketsLoader bucketsLoader = new BucketsLoader(S3FileChooser.this.xbayaGUI,
S3FileChooser.this.dialog.getDialog());
bucketsLoader.load(s3Service, S3FileChooser.this.s3Tree);
} catch (S3ServiceException s3ex) {
- S3FileChooser.this.engine.getGUI().getErrorWindow().error(s3ex);
+ S3FileChooser.this.xbayaGUI.getErrorWindow().error(s3ex);
}
}
});
@@ -146,7 +146,7 @@ public class S3FileChooser implements Tr
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "Amazon S3 Input Chooser", scrollPane, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "Amazon S3 Input Chooser", scrollPane, buttonPanel);
}
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/StreamSourceConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/StreamSourceConfigurationDialog.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/StreamSourceConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/StreamSourceConfigurationDialog.java Fri May 25 17:23:11 2012
@@ -28,7 +28,7 @@ import javax.swing.JButton;
import javax.swing.JPanel;
import org.apache.airavata.workflow.model.graph.system.StreamSourceNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
@@ -36,7 +36,7 @@ import org.apache.airavata.xbaya.ui.widg
public class StreamSourceConfigurationDialog {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private StreamSourceNode node;
@@ -58,8 +58,8 @@ public class StreamSourceConfigurationDi
* @param node
* @param engine
*/
- public StreamSourceConfigurationDialog(StreamSourceNode node, XBayaEngine engine) {
- this.engine = engine;
+ public StreamSourceConfigurationDialog(StreamSourceNode node, XBayaGUI xbayaGUI) {
+ this.xbayaGUI = xbayaGUI;
this.node = node;
initGui();
}
@@ -84,7 +84,7 @@ public class StreamSourceConfigurationDi
this.node.setConfigured(true);
this.node.setDescription(this.descriptionTextField.getText());
hide();
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
/**
@@ -122,7 +122,7 @@ public class StreamSourceConfigurationDi
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "Configure Streaming Data source", this.gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "Configure Streaming Data source", this.gridPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/ServiceInteractionWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/ServiceInteractionWindow.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/ServiceInteractionWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/ServiceInteractionWindow.java Fri May 25 17:23:11 2012
@@ -27,7 +27,8 @@ import javax.swing.AbstractAction;
import javax.swing.JButton;
import javax.swing.JPanel;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.monitor.Monitor;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.WaitDialog;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.views.MonitorPanel;
@@ -38,7 +39,7 @@ import org.apache.airavata.xbaya.ui.widg
public class ServiceInteractionWindow {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private XBayaDialog dialog;
@@ -50,9 +51,12 @@ public class ServiceInteractionWindow {
private String nodeID;
- public ServiceInteractionWindow(XBayaEngine engine, String nodeID) {
- this.engine = engine;
+ private Monitor monitor;
+
+ public ServiceInteractionWindow(XBayaGUI xbayaGUI, String nodeID, Monitor monitor) {
+ this.xbayaGUI=xbayaGUI;
this.nodeID = nodeID;
+ this.monitor=monitor;
initGui();
}
@@ -63,7 +67,7 @@ public class ServiceInteractionWindow {
GridPanel mainPanel = new GridPanel();
- MonitorPanel monitorPanel = new MonitorPanel(this.engine, this.nodeID);
+ MonitorPanel monitorPanel = new MonitorPanel(this.xbayaGUI, this.nodeID, monitor);
this.consoleTextArea = new XBayaTextArea();
XBayaLabel consoleLabel = new XBayaLabel("Console", this.consoleTextArea);
@@ -102,7 +106,7 @@ public class ServiceInteractionWindow {
buttonPanel.add(sendButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "Deploy workflow to ODE and Registry", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "Deploy workflow to ODE and Registry", mainPanel, buttonPanel);
this.dialog.setDefaultButton(sendButton);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/monitor/MonitorWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/monitor/MonitorWindow.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/monitor/MonitorWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/monitor/MonitorWindow.java Fri May 25 17:23:11 2012
@@ -29,9 +29,9 @@ import javax.swing.JButton;
import javax.swing.JPanel;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.monitor.MonitorEventData;
import org.apache.airavata.xbaya.monitor.MonitorUtil;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
@@ -41,7 +41,7 @@ import org.xmlpull.infoset.XmlElement;
public class MonitorWindow {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private XBayaDialog dialog;
@@ -59,8 +59,8 @@ public class MonitorWindow {
* @param engine
* The XBayaEngine
*/
- public MonitorWindow(XBayaEngine engine) {
- this.engine = engine;
+ public MonitorWindow(XBayaGUI xbayaGUI) {
+ this.xbayaGUI=xbayaGUI;
init();
}
@@ -127,7 +127,7 @@ public class MonitorWindow {
JPanel buttonPanel = new JPanel();
buttonPanel.add(okButton);
- this.dialog = new XBayaDialog(this.engine.getGUI(), "Notification", infoPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "Notification", infoPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyLoader.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyLoader.java Fri May 25 17:23:11 2012
@@ -51,7 +51,7 @@ public class MyProxyLoader implements Ca
this.engine = engine;
this.waitDialog = new WaitDialog(this, "Loading Proxy", "Loading a proxy.\n" + "Please wait for a moment.",
- this.engine);
+ this.engine.getGUI());
}
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/amazon/InstanceNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/amazon/InstanceNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/amazon/InstanceNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/amazon/InstanceNodeGUI.java Fri May 25 17:23:11 2012
@@ -30,8 +30,8 @@ import java.util.List;
import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.workflow.model.graph.amazon.InstanceNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.amazon.InstanceConfigurationDialog;
import org.apache.airavata.xbaya.ui.graph.PortGUI;
import org.apache.airavata.xbaya.ui.graph.system.ConfigurableNodeGUI;
@@ -59,9 +59,9 @@ public class InstanceNodeGUI extends Con
* @see org.apache.airavata.xbaya.ui.graph.system.ConfigurableNodeGUI#showConfigurationDialog(org.apache.airavata.xbaya.XBayaEngine)
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (this.configDialog == null) {
- this.configDialog = new InstanceConfigurationDialog(this.node, engine);
+ this.configDialog = new InstanceConfigurationDialog(this.node, xbayaGUI);
}
this.configDialog.show();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/subworkflow/SubWorkflowNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/subworkflow/SubWorkflowNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/subworkflow/SubWorkflowNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/subworkflow/SubWorkflowNodeGUI.java Fri May 25 17:23:11 2012
@@ -29,6 +29,7 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.subworkflow.SubWorkflowNode;
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.graph.NodeGUI;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.slf4j.Logger;
@@ -61,7 +62,7 @@ public class SubWorkflowNodeGUI extends
public void mouseClicked(MouseEvent event, XBayaEngine engine) {
logger.info(event.toString());
if (event.getClickCount() >= 2) {
- openWorkflowTab(engine);
+ openWorkflowTab(engine.getGUI());
}
}
@@ -74,14 +75,14 @@ public class SubWorkflowNodeGUI extends
}
}
- public void openWorkflowTab(XBayaEngine engine) {
+ public void openWorkflowTab(XBayaGUI xbayaGUI) {
try {
Workflow workflow = this.node.getComponent().getWorkflow();
- engine.getGUI().selectOrCreateGraphCanvas(workflow);
+ xbayaGUI.selectOrCreateGraphCanvas(workflow);
} catch (GraphException e) {
- engine.getGUI().getErrorWindow().error(ErrorMessages.GRAPH_FORMAT_ERROR, e);
+ xbayaGUI.getErrorWindow().error(ErrorMessages.GRAPH_FORMAT_ERROR, e);
} catch (ComponentException e) {
- engine.getGUI().getErrorWindow().error(ErrorMessages.COMPONENT_FORMAT_ERROR, e);
+ xbayaGUI.getErrorWindow().error(ErrorMessages.COMPONENT_FORMAT_ERROR, e);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConfigurableNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConfigurableNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConfigurableNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConfigurableNodeGUI.java Fri May 25 17:23:11 2012
@@ -31,6 +31,7 @@ import java.awt.event.MouseEvent;
import org.apache.airavata.workflow.model.graph.impl.NodeImpl;
import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.graph.NodeGUI;
public abstract class ConfigurableNodeGUI extends NodeGUI {
@@ -72,14 +73,14 @@ public abstract class ConfigurableNodeGU
@Override
public void mouseClicked(MouseEvent event, XBayaEngine engine) {
if (isInConfig(event.getPoint())) {
- showConfigurationDialog(engine);
+ showConfigurationDialog(engine.getGUI());
}
}
/**
* @param engine
*/
- protected abstract void showConfigurationDialog(XBayaEngine engine);
+ protected abstract void showConfigurationDialog(XBayaGUI xbayaGUI);
/**
* Checks if a user's click is to select the configuration
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConstantNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConstantNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConstantNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConstantNodeGUI.java Fri May 25 17:23:11 2012
@@ -22,7 +22,7 @@
package org.apache.airavata.xbaya.ui.graph.system;
import org.apache.airavata.workflow.model.graph.system.ConstantNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.ConstantConfigurationDialog;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
@@ -49,15 +49,15 @@ public class ConstantNodeGUI extends Con
* @param engine
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (this.node.isConnected()) {
if (this.configurationWindow == null) {
- this.configurationWindow = new ConstantConfigurationDialog(this.node, engine);
+ this.configurationWindow = new ConstantConfigurationDialog(this.node, xbayaGUI);
}
this.configurationWindow.show();
} else {
- engine.getGUI().getErrorWindow().info(ErrorMessages.CONSTANT_NOT_CONNECTED_WARNING);
+ xbayaGUI.getErrorWindow().info(ErrorMessages.CONSTANT_NOT_CONNECTED_WARNING);
}
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputHandler.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputHandler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputHandler.java Fri May 25 17:23:11 2012
@@ -12,8 +12,8 @@ import java.util.List;
import org.apache.airavata.workflow.model.graph.DataPort;
import org.apache.airavata.workflow.model.graph.Node;
import org.apache.airavata.workflow.model.graph.system.DifferedInputNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
/**
* @author Chathura Herath
@@ -21,7 +21,7 @@ import org.apache.airavata.xbaya.graph.c
public class DifferedInputHandler {
- public static void handleDifferredInputsofDependentNodes(Node node, final XBayaEngine engine){
+ public static void handleDifferredInputsofDependentNodes(Node node, final XBayaGUI xbayaGUI){
List<DataPort> inputPorts = node.getInputPorts();
for (DataPort dataPort : inputPorts) {
Node fromNode = dataPort.getFromNode();
@@ -34,7 +34,7 @@ public class DifferedInputHandler {
@Override
public void run() {
- ((DifferedInputNodeGUI)NodeController.getGUI(differedInputNode)).showConfigurationDialog(engine );
+ ((DifferedInputNodeGUI)NodeController.getGUI(differedInputNode)).showConfigurationDialog(xbayaGUI);
}
};
new Thread(task).start();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputNodeGUI.java Fri May 25 17:23:11 2012
@@ -10,7 +10,7 @@ package org.apache.airavata.xbaya.ui.gra
import java.awt.Color;
import org.apache.airavata.workflow.model.graph.system.DifferedInputNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.DifferedInputConfigurationDialog;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
@@ -47,17 +47,17 @@ public class DifferedInputNodeGUI extend
* @param engine
*/
@Override
- public void showConfigurationDialog(XBayaEngine engine) {
+ public void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (testAndSetConfigDisplay()) {
if (this.inputNode.isConnected()) {
if (this.configurationWindow == null) {
this.configurationWindow = new DifferedInputConfigurationDialog(
- this.inputNode, engine);
+ this.inputNode, xbayaGUI);
}
this.configurationWindow.show();
} else {
- engine.getGUI().getErrorWindow().info(
+ xbayaGUI.getErrorWindow().info(
ErrorMessages.INPUT_NOT_CONNECTED_WARNING);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndBlockNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndBlockNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndBlockNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndBlockNodeGUI.java Fri May 25 17:23:11 2012
@@ -30,8 +30,8 @@ import java.util.List;
import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.workflow.model.graph.system.EndBlockNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.EndBlockConfigurationDialog;
import org.apache.airavata.xbaya.ui.graph.PortGUI;
@@ -58,9 +58,9 @@ public class EndBlockNodeGUI extends Con
* @param engine
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (this.configurationWindow == null) {
- this.configurationWindow = new EndBlockConfigurationDialog(this.node, engine);
+ this.configurationWindow = new EndBlockConfigurationDialog(this.node, xbayaGUI);
}
this.configurationWindow.show();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndForEachNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndForEachNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndForEachNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndForEachNodeGUI.java Fri May 25 17:23:11 2012
@@ -29,8 +29,8 @@ import java.awt.Rectangle;
import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.workflow.model.graph.system.EndForEachNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.EndForEachConfigurationDialog;
public class EndForEachNodeGUI extends ConfigurableNodeGUI {
@@ -47,9 +47,9 @@ public class EndForEachNodeGUI extends C
* @param engine
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (this.configurationWindow == null) {
- this.configurationWindow = new EndForEachConfigurationDialog(this.node, engine);
+ this.configurationWindow = new EndForEachConfigurationDialog(this.node, xbayaGUI);
}
this.configurationWindow.show();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndifNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndifNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndifNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndifNodeGUI.java Fri May 25 17:23:11 2012
@@ -30,8 +30,8 @@ import java.util.List;
import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.workflow.model.graph.system.EndifNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.EndifConfigurationDialog;
import org.apache.airavata.xbaya.ui.graph.PortGUI;
@@ -58,9 +58,9 @@ public class EndifNodeGUI extends Config
* @param engine
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (this.configurationWindow == null) {
- this.configurationWindow = new EndifConfigurationDialog(this.node, engine);
+ this.configurationWindow = new EndifConfigurationDialog(this.node, xbayaGUI);
}
this.configurationWindow.show();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ForEachNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ForEachNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ForEachNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ForEachNodeGUI.java Fri May 25 17:23:11 2012
@@ -30,8 +30,8 @@ import java.awt.Rectangle;
import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.workflow.model.graph.impl.PortImpl;
import org.apache.airavata.workflow.model.graph.system.ForEachNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.ForEachConfigurationDialog;
public class ForEachNodeGUI extends ConfigurableNodeGUI {
@@ -60,9 +60,9 @@ public class ForEachNodeGUI extends Conf
* @param engine
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (this.configurationWindow == null) {
- this.configurationWindow = new ForEachConfigurationDialog(this.node, engine);
+ this.configurationWindow = new ForEachConfigurationDialog(this.node, xbayaGUI);
}
this.configurationWindow.show();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java Fri May 25 17:23:11 2012
@@ -31,8 +31,8 @@ import java.util.List;
import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.workflow.model.graph.impl.PortImpl;
import org.apache.airavata.workflow.model.graph.system.IfNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.IfConfigurationDialog;
import org.apache.airavata.xbaya.ui.graph.PortGUI;
@@ -62,9 +62,9 @@ public class IfNodeGUI extends Configura
* @param engine
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (this.configurationWindow == null) {
- this.configurationWindow = new IfConfigurationDialog(this.node, engine);
+ this.configurationWindow = new IfConfigurationDialog(this.node, xbayaGUI);
}
this.configurationWindow.show();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/InputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/InputNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/InputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/InputNodeGUI.java Fri May 25 17:23:11 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.ui.gra
import java.awt.Color;
import org.apache.airavata.workflow.model.graph.system.InputNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.InputConfigurationDialog;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
@@ -54,15 +54,15 @@ public class InputNodeGUI extends Config
* @param engine
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (this.inputNode.isConnected()) {
if (this.configurationWindow == null) {
- this.configurationWindow = new InputConfigurationDialog(this.inputNode, engine);
+ this.configurationWindow = new InputConfigurationDialog(this.inputNode, xbayaGUI);
}
this.configurationWindow.show();
} else {
- engine.getGUI().getErrorWindow().info(ErrorMessages.INPUT_NOT_CONNECTED_WARNING);
+ xbayaGUI.getErrorWindow().info(ErrorMessages.INPUT_NOT_CONNECTED_WARNING);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/OutputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/OutputNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/OutputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/OutputNodeGUI.java Fri May 25 17:23:11 2012
@@ -22,14 +22,11 @@
package org.apache.airavata.xbaya.ui.graph.system;
import java.awt.Color;
-import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.airavata.common.exception.UtilsException;
import org.apache.airavata.common.utils.BrowserLauncher;
-import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.workflow.model.graph.system.OutputNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.OutputConfigurationDialog;
public class OutputNodeGUI extends ConfigurableNodeGUI {
@@ -58,7 +55,7 @@ public class OutputNodeGUI extends Confi
* @param engine
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (this.node instanceof OutputNode) {
@@ -77,7 +74,7 @@ public class OutputNodeGUI extends Confi
}
}
if (this.configurationWindow == null) {
- this.configurationWindow = new OutputConfigurationDialog(this.outputNode, engine);
+ this.configurationWindow = new OutputConfigurationDialog(this.outputNode, xbayaGUI);
}
this.configurationWindow.show();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ReceiveNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ReceiveNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ReceiveNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ReceiveNodeGUI.java Fri May 25 17:23:11 2012
@@ -29,8 +29,8 @@ import java.awt.Rectangle;
import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.workflow.model.graph.system.ReceiveNode;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.ReceiveConfigurationDialog;
public class ReceiveNodeGUI extends ConfigurableNodeGUI {
@@ -56,9 +56,9 @@ public class ReceiveNodeGUI extends Conf
* @param engine
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (this.configurationDialog == null) {
- this.configurationDialog = new ReceiveConfigurationDialog(this.node, engine);
+ this.configurationDialog = new ReceiveConfigurationDialog(this.node, xbayaGUI);
}
this.configurationDialog.show();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/S3InputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/S3InputNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/S3InputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/S3InputNodeGUI.java Fri May 25 17:23:11 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.ui.gra
import java.awt.Color;
import org.apache.airavata.workflow.model.graph.system.S3InputNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.S3FileChooser;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
@@ -54,13 +54,13 @@ public class S3InputNodeGUI extends Conf
* @param engine
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (!this.inputNode.isConnected()) {
- engine.getGUI().getErrorWindow().info(ErrorMessages.INPUT_NOT_CONNECTED_WARNING);
+ xbayaGUI.getErrorWindow().info(ErrorMessages.INPUT_NOT_CONNECTED_WARNING);
} else {
if (this.s3FileChooser == null) {
- this.s3FileChooser = new S3FileChooser(engine, this.inputNode);
+ this.s3FileChooser = new S3FileChooser(xbayaGUI, this.inputNode);
}
this.s3FileChooser.show();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/StreamSourceNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/StreamSourceNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/StreamSourceNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/StreamSourceNodeGUI.java Fri May 25 17:23:11 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.ui.gra
import java.awt.Color;
import org.apache.airavata.workflow.model.graph.system.StreamSourceNode;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.system.StreamSourceConfigurationDialog;
public class StreamSourceNodeGUI extends ConfigurableNodeGUI {
@@ -54,9 +54,9 @@ public class StreamSourceNodeGUI extends
* @param engine
*/
@Override
- protected void showConfigurationDialog(XBayaEngine engine) {
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI) {
if (this.configurationWindow == null) {
- this.configurationWindow = new StreamSourceConfigurationDialog(this.inputNode, engine);
+ this.configurationWindow = new StreamSourceConfigurationDialog(this.inputNode, xbayaGUI);
}
this.configurationWindow.show();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java Fri May 25 17:23:11 2012
@@ -31,6 +31,8 @@ import java.awt.event.MouseEvent;
import org.apache.airavata.workflow.model.graph.ws.WSNode;
import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.monitor.Monitor;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.graph.ws.ServiceInteractionWindow;
import org.apache.airavata.xbaya.ui.dialogs.graph.ws.WSNodeWindow;
import org.apache.airavata.xbaya.ui.graph.NodeGUI;
@@ -76,8 +78,8 @@ public class WSNodeGUI extends NodeGUI {
this.window.show();
}
- protected void showConfigurationDialog(XBayaEngine engine) {
- new ServiceInteractionWindow(engine, this.node.getID()).show();
+ protected void showConfigurationDialog(XBayaGUI xbayaGUI, Monitor monitor) {
+ new ServiceInteractionWindow(xbayaGUI, this.node.getID(),monitor).show();
}
@@ -106,7 +108,7 @@ public class WSNodeGUI extends NodeGUI {
if (event.getClickCount() >= 2) {
showWindow(engine);
} else if (this.interactiveMode && (isInteractable()) && isInConfig(event.getPoint())) {
- showConfigurationDialog(engine);
+ showConfigurationDialog(engine.getGUI(),engine.getMonitor());
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java Fri May 25 17:23:11 2012
@@ -35,12 +35,10 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.apache.airavata.common.utils.WSDLUtil;
-import org.apache.airavata.workflow.model.component.ComponentException;
import org.apache.airavata.workflow.model.graph.ControlPort;
import org.apache.airavata.workflow.model.graph.EPRPort;
import org.apache.airavata.workflow.model.graph.Edge;
import org.apache.airavata.workflow.model.graph.Graph;
-import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.graph.Node;
import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.workflow.model.graph.amazon.InstanceNode;
@@ -50,17 +48,14 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.util.GraphUtil;
import org.apache.airavata.workflow.model.graph.ws.WSGraph;
import org.apache.airavata.workflow.model.wf.Workflow;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.monitor.MonitorEvent;
import org.apache.airavata.xbaya.monitor.MonitorEventData;
import org.apache.airavata.xbaya.monitor.MonitorUtil;
import org.apache.airavata.xbaya.monitor.MonitorUtil.EventType;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
import org.apache.airavata.xbaya.ui.graph.NodeGUI;
-import org.apache.airavata.xbaya.workflow.WorkflowClient;
-import org.apache.airavata.xbaya.workflow.WorkflowClient.WorkflowType;
-import org.apache.airavata.xbaya.workflow.WorkflowEngineException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
@@ -99,7 +94,7 @@ public class MonitorEventHandler impleme
private static Logger logger = LoggerFactory.getLogger(MonitorEventHandler.class);
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private int sliderValue;
@@ -115,8 +110,8 @@ public class MonitorEventHandler impleme
* @param engine
* @param dataModel
*/
- public MonitorEventHandler(XBayaEngine engine) {
- this.engine = engine;
+ public MonitorEventHandler(XBayaGUI xbayaGUI) {
+ this.xbayaGUI=xbayaGUI;
this.incorrectWorkflowIDs = Collections.synchronizedSet(new HashSet<URI>());
this.triedWorkflowIDs = Collections.synchronizedSet(new HashSet<URI>());
this.resourcePaintableMap = new HashMap<Node, LinkedList<ResourcePaintable>>();
@@ -163,14 +158,14 @@ public class MonitorEventHandler impleme
this.sliderValue = newValue;
// Repaints only the active canvas.
- this.engine.getGUI().getGraphCanvas().repaint();
+ this.xbayaGUI.getGraphCanvas().repaint();
}
private void handleEvent(MonitorEvent event, boolean forward) {
EventType type = event.getType();
URI workflowID = event.getWorkflowID();
- List<GraphCanvas> graphCanvases = this.engine.getGUI().getGraphCanvases();
+ List<GraphCanvas> graphCanvases = this.xbayaGUI.getGraphCanvases();
boolean found = false;
for (GraphCanvas graphCanvas : graphCanvases) {
Workflow workflow = graphCanvas.getWorkflow();
@@ -420,19 +415,20 @@ public class MonitorEventHandler impleme
// Do not try to load a workflow that failed before.
return;
}
- WorkflowClient client = this.engine.getWorkflowClient();
- Workflow loadedWorkflow = client.load(workflowInstanceID, WorkflowType.INSTANCE);
- GraphCanvas canvas = this.engine.getGUI().newGraphCanvas(true);
- canvas.setWorkflow(loadedWorkflow);
- } catch (GraphException e) {
- this.incorrectWorkflowIDs.add(workflowInstanceID);
- logger.error(e.getMessage(), e);
- } catch (WorkflowEngineException e) {
- this.incorrectWorkflowIDs.add(workflowInstanceID);
- logger.error(e.getMessage(), e);
- } catch (ComponentException e) {
- this.incorrectWorkflowIDs.add(workflowInstanceID);
- logger.error(e.getMessage(), e);
+ //There is not workflow client assigned in the engine. thus the following code is commented
+// WorkflowClient client = this.engine.getWorkflowClient();
+// Workflow loadedWorkflow = client.load(workflowInstanceID, WorkflowType.INSTANCE);
+// GraphCanvas canvas = this.xbayaGUI.newGraphCanvas(true);
+// canvas.setWorkflow(loadedWorkflow);
+// } catch (GraphException e) {
+// this.incorrectWorkflowIDs.add(workflowInstanceID);
+// logger.error(e.getMessage(), e);
+// } catch (WorkflowEngineException e) {
+// this.incorrectWorkflowIDs.add(workflowInstanceID);
+// logger.error(e.getMessage(), e);
+// } catch (ComponentException e) {
+// this.incorrectWorkflowIDs.add(workflowInstanceID);
+// logger.error(e.getMessage(), e);
} catch (RuntimeException e) {
this.incorrectWorkflowIDs.add(workflowInstanceID);
logger.error(e.getMessage(), e);
@@ -528,7 +524,7 @@ public class MonitorEventHandler impleme
}
private void resetAll() {
- List<GraphCanvas> graphCanvases = this.engine.getGUI().getGraphCanvases();
+ List<GraphCanvas> graphCanvases = this.xbayaGUI.getGraphCanvases();
for (GraphCanvas graphCanvas : graphCanvases) {
Graph graph = graphCanvas.getGraph();
for (Node node : graph.getNodes()) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java Fri May 25 17:23:11 2012
@@ -50,7 +50,7 @@ public class MonitorStarter implements C
this.engine = engine;
this.startingDialog = new WaitDialog(this, "Starting Monitoring", "Subscribing to notification.\n"
- + "Please wait for a moment.", this.engine);
+ + "Please wait for a moment.", this.engine.getGUI());
}
/**