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/22 19:58:09 UTC
svn commit: r1341577 [3/3] - in /incubator/airavata/trunk/modules:
workflow-model/ xbaya-gui/src/main/java/org/apache/airavata/xbaya/
xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/
xbaya-gui/src/main/java/org/apache/airavata/xbay...
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/ParameterPropertyWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/ParameterPropertyWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/ParameterPropertyWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/ParameterPropertyWindow.java Tue May 22 17:58:06 2012
@@ -73,7 +73,7 @@ public class ParameterPropertyWindow {
* Shows the dialog.
*/
public void show() {
- this.graph = this.engine.getWorkflow().getGraph();
+ this.graph = this.engine.getGUI().getWorkflow().getGraph();
this.nodes = this.graph.getNodes();
this.inputNodes = GraphUtil.getInputNodes(this.graph);
this.outputNodes = GraphUtil.getOutputNodes(this.graph);
@@ -100,7 +100,7 @@ public class ParameterPropertyWindow {
inputMetadata = XMLUtil.stringToXmlElement(inputMetadataText);
} catch (RuntimeException e) {
String warning = "The input metadata is ill-formed.";
- this.engine.getErrorWindow().error(warning, e);
+ this.engine.getGUI().getErrorWindow().error(warning, e);
return;
}
}
@@ -114,7 +114,7 @@ public class ParameterPropertyWindow {
outputMetadata = XMLUtil.stringToXmlElement(outputMetadataText);
} catch (RuntimeException e) {
String warning = "The output metadata is ill-formed.";
- this.engine.getErrorWindow().error(warning, e);
+ this.engine.getGUI().getErrorWindow().error(warning, e);
return;
}
}
@@ -164,7 +164,7 @@ public class ParameterPropertyWindow {
});
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Workflow Paremeter Properties", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Workflow Paremeter Properties", mainPanel, buttonPanel);
this.dialog.setDefaultButton(this.okButton);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowPropertyWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowPropertyWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowPropertyWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowPropertyWindow.java Tue May 22 17:58:06 2012
@@ -31,21 +31,21 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import org.apache.airavata.common.utils.StringUtil;
+import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.common.utils.XMLUtil;
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.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
import org.apache.airavata.xbaya.ui.widgets.XBayaTextArea;
import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
-import org.apache.airavata.common.utils.WSConstants;
import org.xmlpull.infoset.XmlElement;
public class WorkflowPropertyWindow {
- private XBayaEngine engine;
+ private XBayaGUI xbayaGUI;
private XBayaDialog dialog;
@@ -67,8 +67,8 @@ public class WorkflowPropertyWindow {
/**
* @param engine
*/
- public WorkflowPropertyWindow(XBayaEngine engine) {
- this.engine = engine;
+ public WorkflowPropertyWindow(XBayaGUI xbayaGUI) {
+ this.xbayaGUI = xbayaGUI;
initGui();
}
@@ -76,7 +76,7 @@ public class WorkflowPropertyWindow {
* Shows the dialog.
*/
public void show() {
- this.workflow = this.engine.getWorkflow();
+ this.workflow = this.xbayaGUI.getWorkflow();
String name = this.workflow.getName();
this.nameTextField.setText(name);
@@ -118,9 +118,9 @@ public class WorkflowPropertyWindow {
}
private boolean isWorkflowNameAlreadyPresent(String name){
- List<GraphCanvas> graphCanvases = engine.getGUI().getGraphCanvases();
+ List<GraphCanvas> graphCanvases = xbayaGUI.getGraphCanvases();
for (GraphCanvas graphCanvas : graphCanvases) {
- if (graphCanvas!=engine.getGUI().getGraphCanvas()){
+ if (graphCanvas!=xbayaGUI.getGraphCanvas()){
String existingName = graphCanvas.getWorkflow().getGraph().getName();
if (name.equals(existingName)){
return true;
@@ -144,18 +144,18 @@ public class WorkflowPropertyWindow {
metadata = XMLUtil.stringToXmlElement(metadataText);
} catch (RuntimeException e) {
String warning = "The metadata is ill-formed.";
- this.engine.getErrorWindow().error(warning, e);
+ this.xbayaGUI.getErrorWindow().error(warning, e);
return;
}
}
- GraphCanvas graphCanvas = this.engine.getGUI().getGraphCanvas();
+ GraphCanvas graphCanvas = this.xbayaGUI.getGraphCanvas();
graphCanvas.setNameAndDescription(name, description);
graphCanvas.getWorkflow().setMetadata(metadata);
hide();
} else {
this.nameTextField.setText(StringUtil.convertToJavaIdentifier(name));
- JOptionPane.showMessageDialog(this.engine.getGUI().getFrame(),
+ JOptionPane.showMessageDialog(this.xbayaGUI.getFrame(),
"Invalid Name or a Workflow under the same name already exists. Please consider the Name suggsted", "Invalid Name", JOptionPane.OK_OPTION);
}
}
@@ -210,7 +210,7 @@ public class WorkflowPropertyWindow {
buttonPanel.add(this.okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Workflow Properties", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.xbayaGUI, "Workflow Properties", mainPanel, buttonPanel);
this.dialog.setDefaultButton(this.okButton);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java Tue May 22 17:58:06 2012
@@ -97,7 +97,7 @@ public class ExperimentMenu {
this.deleteWorkflowfromRegistryItem.addActionListener(new AbstractAction() {
public void actionPerformed(ActionEvent e) {
try {
- ExperimentMenu.this.registryAccesser.deleteOGCEWorkflow(ExperimentMenu.this.engine.getWorkflow()
+ ExperimentMenu.this.registryAccesser.deleteOGCEWorkflow(ExperimentMenu.this.engine.getGUI().getWorkflow()
.getQname());
} catch (RegistryException e1) {
throw new WorkflowRuntimeException(e1);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java Tue May 22 17:58:06 2012
@@ -114,7 +114,7 @@ public class RegistryLoaderWindow {
try {
session = val.getSession();
} catch (RepositoryException e) {
- RegistryLoaderWindow.this.engine.getErrorWindow().error(
+ RegistryLoaderWindow.this.engine.getGUI().getErrorWindow().error(
ErrorMessages.UNEXPECTED_ERROR, e);
}
if (session != null && session.isLive()) {
@@ -126,14 +126,14 @@ public class RegistryLoaderWindow {
}
});
} catch (RuntimeException e) {
- RegistryLoaderWindow.this.engine.getErrorWindow().error(
+ RegistryLoaderWindow.this.engine.getGUI().getErrorWindow().error(
ErrorMessages.REGISTRY_WORKFLOW_LIST_LOAD_ERROR, e);
hide();
} catch (Error e) {
- RegistryLoaderWindow.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ RegistryLoaderWindow.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
hide();
} catch (RegistryException e) {
- RegistryLoaderWindow.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ RegistryLoaderWindow.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
hide();
}
}
@@ -162,7 +162,7 @@ public class RegistryLoaderWindow {
engine.getGUI().getGraphCanvas().setWorkflowFile(null);
// RegistryLoaderWindow.this.engine.setWorkflow(workflow);
} catch (Exception e) {
- RegistryLoaderWindow.this.engine.getErrorWindow().error(e);
+ RegistryLoaderWindow.this.engine.getGUI().getErrorWindow().error(e);
}
}
@@ -238,7 +238,7 @@ public class RegistryLoaderWindow {
});
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Load a Workflow from the Registry", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Load a Workflow from the Registry", mainPanel, buttonPanel);
this.dialog.setDefaultButton(this.okButton);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java Tue May 22 17:58:06 2012
@@ -80,7 +80,7 @@ public class RegistryWorkflowPublisherWi
* Show the workflow name and description
*/
public void show() {
- this.workflow = this.engine.getWorkflow();
+ this.workflow = this.engine.getGUI().getWorkflow();
String name = this.workflow.getName();
this.nameTextField.setText(name);
@@ -129,7 +129,7 @@ public class RegistryWorkflowPublisherWi
mainPanel.add(chkMakePublic);
mainPanel.layout(2, 2, 0, 0);
- this.dialog = new XBayaDialog(this.engine, "Save Workflow to Registry", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Save Workflow to Registry", mainPanel, buttonPanel);
this.dialog.setDefaultButton(this.okButton);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java Tue May 22 17:58:06 2012
@@ -109,11 +109,11 @@ public class WorkflowInterpreterLaunchWi
* Shows the dialog.
*/
public void show() {
- this.workflow = this.engine.getWorkflow();
+ this.workflow = this.engine.getGUI().getWorkflow();
MonitorConfiguration notifConfig = this.engine.getMonitor().getConfiguration();
if (notifConfig.getBrokerURL() == null) {
- this.engine.getErrorWindow().error(ErrorMessages.BROKER_URL_NOT_SET_ERROR);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.BROKER_URL_NOT_SET_ERROR);
return;
}
@@ -226,7 +226,7 @@ public class WorkflowInterpreterLaunchWi
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Launch workflow", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Launch workflow", mainPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
@@ -235,7 +235,7 @@ public class WorkflowInterpreterLaunchWi
String topic = this.topicTextField.getText();
if (topic.length() == 0) {
- this.engine.getErrorWindow().error(ErrorMessages.TOPIC_EMPTY_ERROR);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.TOPIC_EMPTY_ERROR);
return;
}
@@ -248,7 +248,7 @@ public class WorkflowInterpreterLaunchWi
notifConfig.setTopic(topic);
arguments.add("-" + JythonScript.TOPIC_VARIABLE);
arguments.add(topic);
- Collection<WSNode> wsNodes = GraphUtil.getWSNodes(this.engine.getWorkflow().getGraph());
+ Collection<WSNode> wsNodes = GraphUtil.getWSNodes(this.engine.getGUI().getWorkflow().getGraph());
for (WSNode node : wsNodes) {
((WSNodeGUI) NodeController.getGUI(node)).setInteractiveMode(false);
}
@@ -271,7 +271,7 @@ public class WorkflowInterpreterLaunchWi
try {
this.engine.getConfiguration().setWorkflowInterpreterURL(new URI(workflowInterpreterUrl));
} catch (URISyntaxException e) {
- this.engine.getErrorWindow().error(e);
+ this.engine.getGUI().getErrorWindow().error(e);
}
}
@@ -280,7 +280,7 @@ public class WorkflowInterpreterLaunchWi
try {
this.engine.getConfiguration().setGFacURL(new URI(gFacUrl));
} catch (URISyntaxException e) {
- this.engine.getErrorWindow().error(e);
+ this.engine.getGUI().getErrorWindow().error(e);
}
}
this.engine.getConfiguration().setTopic(topic);
@@ -298,7 +298,7 @@ public class WorkflowInterpreterLaunchWi
WorkflowInterpreterLaunchWindow.this.engine.getMonitor().start();
} catch (MonitorException e1) {
- WorkflowInterpreterLaunchWindow.this.engine.getErrorWindow().error(e1);
+ WorkflowInterpreterLaunchWindow.this.engine.getGUI().getErrorWindow().error(e1);
}
try {
@@ -350,7 +350,7 @@ public class WorkflowInterpreterLaunchWi
stub._getServiceClient().addHeader(AXIOMUtil.stringToOM(XMLUtil.xmlElementToString(builder.getXml())));
stub.launchWorkflow(workflow.toXMLText(), topicString,inputNameVals);
} catch (Exception e) {
- WorkflowInterpreterLaunchWindow.this.engine.getErrorWindow().error(e);
+ WorkflowInterpreterLaunchWindow.this.engine.getGUI().getErrorWindow().error(e);
}
}
}.start();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java Tue May 22 17:58:06 2012
@@ -354,7 +354,7 @@ public class GraphCanvas implements XBay
} catch (GraphException e) {
// Should not happen
logger.error(e.getMessage(), e);
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
@@ -392,7 +392,7 @@ public class GraphCanvas implements XBay
} catch (GraphException e) {
// Should not happen
logger.error(e.getMessage(), e);
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
@@ -586,7 +586,7 @@ public class GraphCanvas implements XBay
try {
freePort.copyType((DataPort) draggedPort);
} catch (GraphException e) {
- engine.getErrorWindow().error(e);
+ engine.getGUI().getErrorWindow().error(e);
return;
}
// selectInputPort(freePort);
@@ -617,7 +617,7 @@ public class GraphCanvas implements XBay
try {
this.dynamicNodeWithFreePort.removeLastDynamicallyAddedInPort();
} catch (GraphException e) {
- this.engine.getErrorWindow().error(e);
+ this.engine.getGUI().getErrorWindow().error(e);
}
}
@@ -876,10 +876,10 @@ public class GraphCanvas implements XBay
selectEdge(edge);
} catch (GraphException e) {
logger.error(e.getMessage(), e);
- this.engine.getErrorWindow().warning(e.getMessage());
+ this.engine.getGUI().getErrorWindow().warning(e.getMessage());
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR);
}
}
@@ -1266,11 +1266,11 @@ public class GraphCanvas implements XBay
this.nodePopup.remove(rerunItem);
this.nodePopup.remove(breakPointItem);
- if (this.engine.getWorkflow().getExecutionState() == WorkflowExecutionState.PAUSED && !(node instanceof InputNode)) {
+ if (this.engine.getGUI().getWorkflow().getExecutionState() == WorkflowExecutionState.PAUSED && !(node instanceof InputNode)) {
this.nodePopup.add(rerunItem);
}
- if (this.engine.getWorkflow().getExecutionState() != WorkflowExecutionState.NONE) {
+ if (this.engine.getGUI().getWorkflow().getExecutionState() != WorkflowExecutionState.NONE) {
if (node.isBreak()) {
breakPointItem.setText("Remove break Point");
} else {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/dynamic/DynamicNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/dynamic/DynamicNodeGUI.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/dynamic/DynamicNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/dynamic/DynamicNodeGUI.java Tue May 22 17:58:06 2012
@@ -67,7 +67,7 @@ public class DynamicNodeGUI extends Node
try {
this.window.show();
} catch (Throwable e) {
- engine.getErrorWindow().error(e);
+ engine.getGUI().getErrorWindow().error(e);
}
}
}
\ No newline at end of file
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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -79,9 +79,9 @@ public class SubWorkflowNodeGUI extends
Workflow workflow = this.node.getComponent().getWorkflow();
engine.getGUI().selectOrCreateGraphCanvas(workflow);
} catch (GraphException e) {
- engine.getErrorWindow().error(ErrorMessages.GRAPH_FORMAT_ERROR, e);
+ engine.getGUI().getErrorWindow().error(ErrorMessages.GRAPH_FORMAT_ERROR, e);
} catch (ComponentException e) {
- engine.getErrorWindow().error(ErrorMessages.COMPONENT_FORMAT_ERROR, e);
+ engine.getGUI().getErrorWindow().error(ErrorMessages.COMPONENT_FORMAT_ERROR, e);
}
}
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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -57,7 +57,7 @@ public class ConstantNodeGUI extends Con
this.configurationWindow.show();
} else {
- engine.getErrorWindow().info(ErrorMessages.CONSTANT_NOT_CONNECTED_WARNING);
+ engine.getGUI().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/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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -57,7 +57,7 @@ public class DifferedInputNodeGUI extend
this.configurationWindow.show();
} else {
- engine.getErrorWindow().info(
+ engine.getGUI().getErrorWindow().info(
ErrorMessages.INPUT_NOT_CONNECTED_WARNING);
}
}
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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -62,7 +62,7 @@ public class InputNodeGUI extends Config
this.configurationWindow.show();
} else {
- engine.getErrorWindow().info(ErrorMessages.INPUT_NOT_CONNECTED_WARNING);
+ engine.getGUI().getErrorWindow().info(ErrorMessages.INPUT_NOT_CONNECTED_WARNING);
}
}
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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -57,7 +57,7 @@ public class S3InputNodeGUI extends Conf
protected void showConfigurationDialog(XBayaEngine engine) {
if (!this.inputNode.isConnected()) {
- engine.getErrorWindow().info(ErrorMessages.INPUT_NOT_CONNECTED_WARNING);
+ engine.getGUI().getErrorWindow().info(ErrorMessages.INPUT_NOT_CONNECTED_WARNING);
} else {
if (this.s3FileChooser == null) {
this.s3FileChooser = new S3FileChooser(engine, this.inputNode);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java Tue May 22 17:58:06 2012
@@ -66,9 +66,9 @@ public class WorkflowNodeGUI extends Nod
Workflow workflow = this.node.getComponent().getWorkflow();
engine.getGUI().selectOrCreateGraphCanvas(workflow);
} catch (GraphException e) {
- engine.getErrorWindow().error(ErrorMessages.GRAPH_FORMAT_ERROR, e);
+ engine.getGUI().getErrorWindow().error(ErrorMessages.GRAPH_FORMAT_ERROR, e);
} catch (ComponentException e) {
- engine.getErrorWindow().error(ErrorMessages.COMPONENT_FORMAT_ERROR, e);
+ engine.getGUI().getErrorWindow().error(ErrorMessages.COMPONENT_FORMAT_ERROR, e);
}
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java Tue May 22 17:58:06 2012
@@ -104,7 +104,7 @@ public class EditMenuItem {
public void actionPerformed(ActionEvent e) {
if (this.window == null) {
- this.window = engine.getWorkflowPropertyWindow();
+ this.window = engine.getGUI().getWorkflowPropertyWindow();
}
this.window.show();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java Tue May 22 17:58:06 2012
@@ -237,9 +237,9 @@ public class RunMenuItem implements Eve
try {
engine.getMonitor().asynchronousStop();
} catch (RuntimeException e) {
- engine.getErrorWindow().error(ErrorMessages.MONITOR_ERROR, e);
+ engine.getGUI().getErrorWindow().error(ErrorMessages.MONITOR_ERROR, e);
} catch (Error e) {
- engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
}
};
@@ -312,7 +312,7 @@ public class RunMenuItem implements Eve
int count = 0;
//there is a possibility the ealier run is not yet cleanedup yet.. so wait until it finishes
// and sets the execution state to NONE as the last task of scheduleDynamically
- while(engine.getWorkflow().getExecutionState() != WorkflowExecutionState.NONE){
+ while(engine.getGUI().getWorkflow().getExecutionState() != WorkflowExecutionState.NONE){
try {
Thread.sleep(500);
} catch (InterruptedException e) {
@@ -368,7 +368,7 @@ public class RunMenuItem implements Eve
try {
this.window.show();
} catch (Exception e1) {
- engine.getErrorWindow().error(e1);
+ engine.getGUI().getErrorWindow().error(e1);
}
}
@@ -429,7 +429,7 @@ public class RunMenuItem implements Eve
}
engine.getWorkflowInterpreter().cleanup();
} catch (MonitorException e) {
- this.engine.getErrorWindow().error(e);
+ this.engine.getGUI().getErrorWindow().error(e);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java Tue May 22 17:58:06 2012
@@ -311,7 +311,7 @@ public class XBayaMenuItem implements XB
.getRegistry());
serviceDescriptionDialog.open();
} catch (Exception e1) {
- engine.getErrorWindow().error(e1);
+ engine.getGUI().getErrorWindow().error(e1);
}
}
}
@@ -332,7 +332,7 @@ public class XBayaMenuItem implements XB
engine);
applicationDescriptionDialog.open();
} catch (Exception e1) {
- engine.getErrorWindow().error(e1);
+ engine.getGUI().getErrorWindow().error(e1);
}
}
}
@@ -353,7 +353,7 @@ public class XBayaMenuItem implements XB
engine);
hostDescriptionDialog.open();
} catch (Exception e1) {
- engine.getErrorWindow().error(e1);
+ engine.getGUI().getErrorWindow().error(e1);
}
}
}
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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -107,18 +107,18 @@ public class MonitorStarter implements C
if (this.canceled) {
logger.error(e.getMessage(), e);
} else {
- this.engine.getErrorWindow().error(ErrorMessages.MONITOR_SUBSCRIPTION_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.MONITOR_SUBSCRIPTION_ERROR, e);
this.startingDialog.hide();
}
} catch (RuntimeException e) {
if (this.canceled) {
logger.error(e.getMessage(), e);
} else {
- this.engine.getErrorWindow().error(ErrorMessages.MONITOR_SUBSCRIPTION_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.MONITOR_SUBSCRIPTION_ERROR, e);
this.startingDialog.hide();
}
} catch (Error e) {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
this.startingDialog.hide();
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java Tue May 22 17:58:06 2012
@@ -255,7 +255,7 @@ public class JCRBrowserPanel extends JPa
}
} catch (Exception e) {
e.printStackTrace();
- getEngine().getErrorWindow().error(e);
+ getEngine().getGUI().getErrorWindow().error(e);
}
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java Tue May 22 17:58:06 2012
@@ -198,7 +198,7 @@ public class MonitorPanel implements XBa
try {
BrowserLauncher.openURL(url);
} catch (Exception e) {
- MonitorPanel.this.engine.getErrorWindow().error(e.getMessage(), e);
+ MonitorPanel.this.engine.getGUI().getErrorWindow().error(e.getMessage(), e);
}
}
} else if (MonitorUtil.getType(message) == MonitorUtil.EventType.SENDING_RESULT) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaToolBar.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaToolBar.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaToolBar.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaToolBar.java Tue May 22 17:58:06 2012
@@ -174,7 +174,7 @@ public class XBayaToolBar implements XBa
*/
public void actionPerformed(ActionEvent e1) {
try {
- Workflow workflow = engine.getWorkflow();
+ Workflow workflow = engine.getGUI().getWorkflow();
WorkflowExecutionState executionState = workflow.getExecutionState();
if (executionState == WorkflowExecutionState.RUNNING || executionState == WorkflowExecutionState.STEP) {
workflow.setExecutionState(WorkflowExecutionState.PAUSED);
@@ -202,10 +202,10 @@ public class XBayaToolBar implements XBa
*/
public void actionPerformed(ActionEvent e2) {
try {
- if (engine.getWorkflow().getExecutionState() == WorkflowExecutionState.PAUSED) {
- engine.getWorkflow().setExecutionState(WorkflowExecutionState.STEP);
+ if (engine.getGUI().getWorkflow().getExecutionState() == WorkflowExecutionState.PAUSED) {
+ engine.getGUI().getWorkflow().setExecutionState(WorkflowExecutionState.STEP);
} else {
- throw new IllegalStateException("Unknown state :" + engine.getWorkflow().getExecutionState());
+ throw new IllegalStateException("Unknown state :" + engine.getGUI().getWorkflow().getExecutionState());
}
} catch (RuntimeException e) {
XBayaToolBar.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
@@ -224,11 +224,11 @@ public class XBayaToolBar implements XBa
*/
public void actionPerformed(ActionEvent e1) {
try {
- if (engine.getWorkflow().getExecutionState() != WorkflowExecutionState.NONE
- || engine.getWorkflow().getExecutionState() != WorkflowExecutionState.STOPPED) {
- engine.getWorkflow().setExecutionState(WorkflowExecutionState.STOPPED);
+ if (engine.getGUI().getWorkflow().getExecutionState() != WorkflowExecutionState.NONE
+ || engine.getGUI().getWorkflow().getExecutionState() != WorkflowExecutionState.STOPPED) {
+ engine.getGUI().getWorkflow().setExecutionState(WorkflowExecutionState.STOPPED);
} else {
- throw new IllegalStateException("Unknown state :" + engine.getWorkflow().getExecutionState());
+ throw new IllegalStateException("Unknown state :" + engine.getGUI().getWorkflow().getExecutionState());
}
} catch (RuntimeException e) {
XBayaToolBar.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java Tue May 22 17:58:06 2012
@@ -345,16 +345,16 @@ public class ComponentSelector implement
} catch (ComponentException e) {
selectComponent(null);
- ComponentSelector.this.engine.getErrorWindow().error(ErrorMessages.COMPONENT_FORMAT_ERROR, e);
+ ComponentSelector.this.engine.getGUI().getErrorWindow().error(ErrorMessages.COMPONENT_FORMAT_ERROR, e);
} catch (ComponentRegistryException e) {
selectComponent(null);
- ComponentSelector.this.engine.getErrorWindow().error(ErrorMessages.COMPONENT_LOAD_ERROR, e);
+ ComponentSelector.this.engine.getGUI().getErrorWindow().error(ErrorMessages.COMPONENT_LOAD_ERROR, e);
} catch (RuntimeException e) {
selectComponent(null);
- ComponentSelector.this.engine.getErrorWindow().error(ErrorMessages.COMPONENT_LOAD_ERROR, e);
+ ComponentSelector.this.engine.getGUI().getErrorWindow().error(ErrorMessages.COMPONENT_LOAD_ERROR, e);
} catch (Exception e) {
selectComponent(null);
- ComponentSelector.this.engine.getErrorWindow().error(ErrorMessages.COMPONENT_LOAD_ERROR, e);
+ ComponentSelector.this.engine.getGUI().getErrorWindow().error(ErrorMessages.COMPONENT_LOAD_ERROR, e);
}
}
}.start();
@@ -487,13 +487,13 @@ public class ComponentSelector implement
try {
updateSelectedRegistry();
} catch (ComponentRegistryException e) {
- ComponentSelector.this.engine.getErrorWindow().error(
+ ComponentSelector.this.engine.getGUI().getErrorWindow().error(
ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
} catch (RuntimeException e) {
- ComponentSelector.this.engine.getErrorWindow().error(
+ ComponentSelector.this.engine.getGUI().getErrorWindow().error(
ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
} catch (Error e) {
- ComponentSelector.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ ComponentSelector.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
}
}.start();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java Tue May 22 17:58:06 2012
@@ -79,7 +79,7 @@ public class XBayaUtil {
throws URISyntaxException {
XBayaConfiguration configuration = engine.getConfiguration();
- Workflow workflow = engine.getWorkflow();
+ Workflow workflow = engine.getGUI().getWorkflow();
LeadContextHeader leadContext = buildLeadContextHeader(workflow, configuration, monitorConfiguration, nodeId,
resourceMapping);