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 [2/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/ODEInvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ODEInvokerWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ODEInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ODEInvokerWindow.java Tue May 22 17:58:06 2012
@@ -186,7 +186,7 @@ public class ODEInvokerWindow {
buttonPanel.add(this.invokeButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Execute Workflow (BPEL)", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Execute Workflow (BPEL)", mainPanel, buttonPanel);
}
protected void execute(boolean redeploy) {
@@ -197,15 +197,15 @@ public class ODEInvokerWindow {
try {
inputs = this.workflow.getInputs();
} catch (ComponentException e) {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
hide();
return;
} catch (RuntimeException e) {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
hide();
return;
} catch (Error e) {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
hide();
return;
}
@@ -226,7 +226,7 @@ public class ODEInvokerWindow {
// Topic
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;
}
URI workfowInstanceID = URI.create(StringUtil.convertToJavaIdentifier(topic));
@@ -236,14 +236,14 @@ public class ODEInvokerWindow {
// String xRegistry = this.xRegistryTextField.getText();
// URI xRegistryURL;
// if (xRegistry.length() == 0) {
- // this.engine.getErrorWindow().error("X-registry url is required");
+ // this.engine.getGUI().getErrorWindow().error("X-registry url is required");
// return;
// } else {
// try {
// xRegistryURL = new URI(xRegistry).parseServerAuthority();
//
// } catch (URISyntaxException e) {
- // this.engine.getErrorWindow().error(ErrorMessages.XREGISTRY_URL_WRONG, e);
+ // this.engine.getGUI().getErrorWindow().error(ErrorMessages.XREGISTRY_URL_WRONG, e);
// return;
// }
// }
@@ -257,7 +257,7 @@ public class ODEInvokerWindow {
try {
gfacURL = new URI(gfac).parseServerAuthority();
} catch (URISyntaxException e) {
- this.engine.getErrorWindow().error(ErrorMessages.GFAC_URL_WRONG, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.GFAC_URL_WRONG, e);
return;
}
}
@@ -280,7 +280,7 @@ public class ODEInvokerWindow {
resourceMapping.setGatekeeperEPR(new URI(this.gatekeeperField.getText()));
} catch (URISyntaxException e) {
hide();
- this.engine.getErrorWindow().error(e);
+ this.engine.getGUI().getErrorWindow().error(e);
return;
}
}
@@ -295,7 +295,7 @@ public class ODEInvokerWindow {
hide();
- String workflowName = this.engine.getWorkflow().getName();
+ String workflowName = this.engine.getGUI().getWorkflow().getName();
}
@@ -323,16 +323,16 @@ public class ODEInvokerWindow {
try {
workflowClient.setUserX509Credential(credential);
} catch (WorkflowEngineException e) {
- this.engine.getErrorWindow().error(ErrorMessages.GPEL_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.GPEL_ERROR, e);
return;
}
}
- 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;
}
@@ -347,7 +347,7 @@ public class ODEInvokerWindow {
buf.append(warning);
buf.append("\n");
}
- this.engine.getErrorWindow().warning(buf.toString());
+ this.engine.getGUI().getErrorWindow().warning(buf.toString());
return;
}
@@ -357,7 +357,7 @@ public class ODEInvokerWindow {
this.workflow.setGpelProcess(bpel.getGpelProcess());
this.workflow.setWorkflowWSDL(bpel.getWorkflowWSDL().getWsdlDefinitions());
} catch (GraphException e) {
- this.engine.getErrorWindow().error(ErrorMessages.GRAPH_NOT_READY_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.GRAPH_NOT_READY_ERROR, e);
return;
}
@@ -369,7 +369,7 @@ public class ODEInvokerWindow {
} catch (ComponentException e) {
// This should not happen when we create WSDL here, but if we use
// precompiled workflow, it might happen.
- this.engine.getErrorWindow().error(ErrorMessages.WORKFLOW_WSDL_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.WORKFLOW_WSDL_ERROR, e);
return;
}
List<Double> columnWeights = new ArrayList<Double>();
@@ -378,10 +378,10 @@ public class ODEInvokerWindow {
for (WSComponentPort input : inputs) {
// Somethign special for the control workflow
- if (-1 != engine.getWorkflow().getName().indexOf("Control_")) {
+ if (-1 != engine.getGUI().getWorkflow().getName().indexOf("Control_")) {
if ("epr".equals(input.getName())) {
input.setDefaultValue("https://pagodatree.cs.indiana.edu:17443/ode/processes/"
- + engine.getWorkflow().getName() + "?wsdl");
+ + engine.getGUI().getWorkflow().getName() + "?wsdl");
} else if ("operation".equals(input.getName())) {
input.setDefaultValue("Run");
} else if ("startTime".equals(input.getName())) {
@@ -481,7 +481,7 @@ public class ODEInvokerWindow {
if (false) {
// Some user wants to pass empty strings, so this check is disabled.
if (valueString.length() == 0) {
- this.engine.getErrorWindow().error("Input parameter, " + name + ", cannot be empty");
+ this.engine.getGUI().getErrorWindow().error("Input parameter, " + name + ", cannot be empty");
return null;
}
}
@@ -494,7 +494,7 @@ public class ODEInvokerWindow {
try {
value = XMLUtil.stringToXmlElement3(valueString);
} catch (RuntimeException e) {
- this.engine.getErrorWindow().error("Input parameter, " + name + ", is not valid XML", e);
+ this.engine.getGUI().getErrorWindow().error("Input parameter, " + name + ", is not valid XML", e);
return null;
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/PegasusInvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/PegasusInvokerWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/PegasusInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/PegasusInvokerWindow.java Tue May 22 17:58:06 2012
@@ -125,7 +125,7 @@ public class PegasusInvokerWindow {
buttonPanel.add(this.invokeButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Execute Workflow (Pegasus)", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Execute Workflow (Pegasus)", mainPanel, buttonPanel);
}
/**
@@ -133,7 +133,7 @@ public class PegasusInvokerWindow {
*/
protected void execute() {
/* ID of workflow (must be unique) */
- String workflowID = this.engine.getWorkflow().getName();
+ String workflowID = this.engine.getGUI().getWorkflow().getName();
try {
PegasusWebserviceStub stub;
@@ -195,7 +195,7 @@ public class PegasusInvokerWindow {
* restore all the field if workflow has been loaded before
*/
public void show() {
- this.workflow = this.engine.getWorkflow();
+ this.workflow = this.engine.getGUI().getWorkflow();
XBayaConfiguration configuration = this.engine.getConfiguration();
MonitorConfiguration monitorConfiguration = this.engine.getMonitor().getConfiguration();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/WaitDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/WaitDialog.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/WaitDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/WaitDialog.java Tue May 22 17:58:06 2012
@@ -121,7 +121,7 @@ public class WaitDialog {
JPanel buttonPanel = new JPanel();
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, this.title, label, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), this.title, label, buttonPanel);
this.dialog.getDialog().setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
this.dialog.getDialog().setCursor(SwingUtil.WAIT_CURSOR);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/XBayaDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/XBayaDialog.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/XBayaDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/XBayaDialog.java Tue May 22 17:58:06 2012
@@ -37,7 +37,7 @@ import javax.swing.JLabel;
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.widgets.XBayaComponent;
public class XBayaDialog {
@@ -62,8 +62,8 @@ public class XBayaDialog {
* @param mainPanel
* @param buttonPanel
*/
- public XBayaDialog(XBayaEngine engine, String title, XBayaComponent mainPanel, XBayaComponent buttonPanel) {
- this(engine.getGUI().getFrame(), title, mainPanel.getSwingComponent(), buttonPanel.getSwingComponent());
+ public XBayaDialog(XBayaGUI xbayaGUI, String title, XBayaComponent mainPanel, XBayaComponent buttonPanel) {
+ this(xbayaGUI.getFrame(), title, mainPanel.getSwingComponent(), buttonPanel.getSwingComponent());
}
/**
@@ -74,8 +74,8 @@ public class XBayaDialog {
* @param mainPanel
* @param buttonPanel
*/
- public XBayaDialog(XBayaEngine engine, String title, XBayaComponent mainPanel, JComponent buttonPanel) {
- this(engine.getGUI().getFrame(), title, mainPanel.getSwingComponent(), buttonPanel);
+ public XBayaDialog(XBayaGUI xbayaGUI, String title, XBayaComponent mainPanel, JComponent buttonPanel) {
+ this(xbayaGUI.getFrame(), title, mainPanel.getSwingComponent(), buttonPanel);
}
/**
@@ -87,9 +87,9 @@ public class XBayaDialog {
* @param mainPanel
* @param buttonPanel
*/
- public XBayaDialog(XBayaEngine engine, String title, String description, XBayaComponent mainPanel,
+ public XBayaDialog(XBayaGUI xbayaGUI, String title, String description, XBayaComponent mainPanel,
JComponent buttonPanel) {
- this(engine.getGUI().getFrame(), title, description, mainPanel.getSwingComponent(), buttonPanel);
+ this(xbayaGUI.getFrame(), title, description, mainPanel.getSwingComponent(), buttonPanel);
}
/**
@@ -100,8 +100,8 @@ public class XBayaDialog {
* @param mainPanel
* @param buttonPanel
*/
- public XBayaDialog(XBayaEngine engine, String title, JComponent mainPanel, JComponent buttonPanel) {
- this(engine.getGUI().getFrame(), title, mainPanel, buttonPanel);
+ public XBayaDialog(XBayaGUI xbayaGUI, String title, JComponent mainPanel, JComponent buttonPanel) {
+ this(xbayaGUI.getFrame(), title, mainPanel, buttonPanel);
}
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonEC2InvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonEC2InvokerWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonEC2InvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonEC2InvokerWindow.java Tue May 22 17:58:06 2012
@@ -159,7 +159,7 @@ public class AmazonEC2InvokerWindow {
buttonPanel.add(this.invokeButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Deploy Workflow", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Deploy Workflow", mainPanel, buttonPanel);
}
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonS3UtilsWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonS3UtilsWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonS3UtilsWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonS3UtilsWindow.java Tue May 22 17:58:06 2012
@@ -99,7 +99,7 @@ public class AmazonS3UtilsWindow {
s3Service = new RestS3Service(new AWSCredentials(AmazonCredential.getInstance().getAwsAccessKeyId(),
AmazonCredential.getInstance().getAwsSecretAccessKey()));
} catch (S3ServiceException s3ex) {
- xBayaEngine.getErrorWindow().error(s3ex);
+ xBayaEngine.getGUI().getErrorWindow().error(s3ex);
}
return s3Service;
}
@@ -173,7 +173,7 @@ public class AmazonS3UtilsWindow {
try {
this.credentialWindow.show();
} catch (Exception e1) {
- xBayaEngine.getErrorWindow().error(e1);
+ xBayaEngine.getGUI().getErrorWindow().error(e1);
}
return;
@@ -198,7 +198,7 @@ public class AmazonS3UtilsWindow {
window.fileTextField.setText("");
window.folderTextField.setText("");
} else {
- xBayaEngine.getErrorWindow().error(window.dialog.getDialog(),
+ xBayaEngine.getGUI().getErrorWindow().error(window.dialog.getDialog(),
"Please give input to every upload fields");
}
}
@@ -221,7 +221,7 @@ public class AmazonS3UtilsWindow {
window.folderTextField.setText("");
} else {
- xBayaEngine.getErrorWindow().error(window.dialog.getDialog(),
+ xBayaEngine.getGUI().getErrorWindow().error(window.dialog.getDialog(),
"Please give input to every download fields");
}
}
@@ -315,7 +315,7 @@ public class AmazonS3UtilsWindow {
}
});
- this.dialog = new XBayaDialog(xBayaEngine, "Amazon S3 Upload/Download Tool", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(xBayaEngine.getGUI(), "Amazon S3 Upload/Download Tool", mainPanel, buttonPanel);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/BucketsLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/BucketsLoader.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/BucketsLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/BucketsLoader.java Tue May 22 17:58:06 2012
@@ -111,7 +111,7 @@ public class BucketsLoader implements Ca
S3TreeModel.getInstance().connect();
} catch (S3ServiceException ex) {
- BucketsLoader.this.engine.getErrorWindow().error(BucketsLoader.this.parent,
+ BucketsLoader.this.engine.getGUI().getErrorWindow().error(BucketsLoader.this.parent,
"Cannot List S3 buckets", ex);
} finally {
BucketsLoader.this.loadingDialog.hide();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/ChangeCredentialWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/ChangeCredentialWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/ChangeCredentialWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/ChangeCredentialWindow.java Tue May 22 17:58:06 2012
@@ -116,7 +116,7 @@ public class ChangeCredentialWindow {
buttonPanel.add(cancelButton);
if (this.owner == null) {
- this.dialog = new XBayaDialog(this.engine, "S3 Toolkits", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "S3 Toolkits", mainPanel, buttonPanel);
} else {
this.dialog = new XBayaDialog(this.owner, "S3 Toolkits", mainPanel, buttonPanel);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/EC2InstancesManagementWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/EC2InstancesManagementWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/EC2InstancesManagementWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/EC2InstancesManagementWindow.java Tue May 22 17:58:06 2012
@@ -133,7 +133,7 @@ public class EC2InstancesManagementWindo
List<EC2InstanceResult> selected = EC2InstancesManagementWindow.this.list.getSelectedValues();
if (selected.size() == 0) {
- EC2InstancesManagementWindow.this.engine.getErrorWindow().info(
+ EC2InstancesManagementWindow.this.engine.getGUI().getErrorWindow().info(
EC2InstancesManagementWindow.this.dialog.getDialog(), "Warning", "No instances selected");
return;
}
@@ -181,7 +181,7 @@ public class EC2InstancesManagementWindo
buttonPanel.add(terminateButton);
buttonPanel.add(closeButton);
- this.dialog = new XBayaDialog(this.engine, "Amazon EC2 Managment Console", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Amazon EC2 Managment Console", mainPanel, buttonPanel);
this.dialog.getDialog().setPreferredSize(new Dimension(WIDTH, HEIGHT));
this.dialog.setDefaultButton(closeButton);
@@ -190,7 +190,7 @@ public class EC2InstancesManagementWindo
private boolean credentialSet() {
if (AmazonCredential.getInstance().getAwsAccessKeyId().isEmpty()
|| AmazonCredential.getInstance().getAwsSecretAccessKey().isEmpty()) {
- EC2InstancesManagementWindow.this.engine.getErrorWindow().warning(
+ EC2InstancesManagementWindow.this.engine.getGUI().getErrorWindow().warning(
EC2InstancesManagementWindow.this.dialog.getDialog(), "Error", "Aws Access Key not set!");
if (this.credentialWindow == null) {
@@ -200,7 +200,7 @@ public class EC2InstancesManagementWindo
this.credentialWindow.show();
return false;
} catch (Exception e1) {
- EC2InstancesManagementWindow.this.engine.getErrorWindow().error(e1);
+ EC2InstancesManagementWindow.this.engine.getGUI().getErrorWindow().error(e1);
}
}
return true;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/EC2LaunchWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/EC2LaunchWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/EC2LaunchWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/EC2LaunchWindow.java Tue May 22 17:58:06 2012
@@ -145,7 +145,7 @@ public class EC2LaunchWindow {
if (EC2LaunchWindow.this.amiTextField.getText() == null
|| EC2LaunchWindow.this.amiTextField.getText().isEmpty()
|| ((Integer) EC2LaunchWindow.this.numberOfInstanceSpinner.getValue()).intValue() <= 0) {
- EC2LaunchWindow.this.engine.getErrorWindow().info(EC2LaunchWindow.this.dialog.getDialog(),
+ EC2LaunchWindow.this.engine.getGUI().getErrorWindow().info(EC2LaunchWindow.this.dialog.getDialog(),
"Warning", "Please input all fields");
return;
}
@@ -167,10 +167,10 @@ public class EC2LaunchWindow {
EC2LaunchWindow.this.hide();
} catch (NumberFormatException nfe) {
- EC2LaunchWindow.this.engine.getErrorWindow().info(EC2LaunchWindow.this.dialog.getDialog(),
+ EC2LaunchWindow.this.engine.getGUI().getErrorWindow().info(EC2LaunchWindow.this.dialog.getDialog(),
"Warning", "Number of Instances is not numeric");
} catch (Exception ex) {
- EC2LaunchWindow.this.engine.getErrorWindow().error(EC2LaunchWindow.this.dialog.getDialog(),
+ EC2LaunchWindow.this.engine.getGUI().getErrorWindow().error(EC2LaunchWindow.this.dialog.getDialog(),
"Cannot start EC2 instances: " + ex.getMessage(), ex);
}
}
@@ -188,7 +188,7 @@ public class EC2LaunchWindow {
buttonPanel.add(lunchButton);
buttonPanel.add(closeButton);
- this.dialog = new XBayaDialog(this.engine, "Amazon EC2 Launcher", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Amazon EC2 Launcher", mainPanel, buttonPanel);
}
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/InstancesLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/InstancesLoader.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/InstancesLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/InstancesLoader.java Tue May 22 17:58:06 2012
@@ -92,10 +92,10 @@ public class InstancesLoader implements
}
} catch (AmazonServiceException ex) {
- InstancesLoader.this.engine.getErrorWindow().error(InstancesLoader.this.parent,
+ InstancesLoader.this.engine.getGUI().getErrorWindow().error(InstancesLoader.this.parent,
"Cannot load EC2 instances", ex);
} catch (AmazonClientException ex) {
- InstancesLoader.this.engine.getErrorWindow().error(InstancesLoader.this.parent,
+ InstancesLoader.this.engine.getGUI().getErrorWindow().error(InstancesLoader.this.parent,
"Cannot load EC2 instances", ex);
} finally {
InstancesLoader.this.loadingDialog.hide();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/S3Downloader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/S3Downloader.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/S3Downloader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/S3Downloader.java Tue May 22 17:58:06 2012
@@ -107,10 +107,10 @@ public class S3Downloader implements Can
out.newLine();
}
- S3Downloader.this.engine.getErrorWindow().info(S3Downloader.this.parent, "",
+ S3Downloader.this.engine.getGUI().getErrorWindow().info(S3Downloader.this.parent, "",
"Downloaded successfully!");
} catch (Exception ex) {
- S3Downloader.this.engine.getErrorWindow().error(S3Downloader.this.parent,
+ S3Downloader.this.engine.getGUI().getErrorWindow().error(S3Downloader.this.parent,
"Download failed! Please ensure every fields are filled correctly", ex);
} finally {
if (in != null) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/S3Uploader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/S3Uploader.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/S3Uploader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/S3Uploader.java Tue May 22 17:58:06 2012
@@ -93,7 +93,7 @@ public class S3Uploader implements Cance
s3.deleteObject(bucket, s3Object.getKey());
} else {
- S3Uploader.this.engine.getErrorWindow().info(S3Uploader.this.parent, "",
+ S3Uploader.this.engine.getGUI().getErrorWindow().info(S3Uploader.this.parent, "",
"Uploaded successfully!");
// add key to S3Tree
@@ -112,7 +112,7 @@ public class S3Uploader implements Cance
}
} catch (Exception ex) {
- S3Uploader.this.engine.getErrorWindow().error(S3Uploader.this.parent,
+ S3Uploader.this.engine.getGUI().getErrorWindow().error(S3Uploader.this.parent,
"Upload failed! Please ensure every fields are filled correctly", ex);
} finally {
// close loading dialog
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/URLRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/URLRegistryWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/URLRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/URLRegistryWindow.java Tue May 22 17:58:06 2012
@@ -78,14 +78,14 @@ public class URLRegistryWindow {
String urlString = this.urlTextField.getText();
if (urlString.length() == 0) {
- this.engine.getErrorWindow().error(ErrorMessages.URL_EMPTY);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.URL_EMPTY);
return;
}
URI url;
try {
url = new URI(urlString);
} catch (URISyntaxException e) {
- this.engine.getErrorWindow().error(ErrorMessages.URL_WRONG, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.URL_WRONG, e);
return;
}
@@ -126,7 +126,7 @@ public class URLRegistryWindow {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Web Registry", infoPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Web Registry", 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/component/WebResigtryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/WebResigtryWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/WebResigtryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/WebResigtryWindow.java Tue May 22 17:58:06 2012
@@ -77,14 +77,14 @@ public class WebResigtryWindow {
String urlString = this.urlTextField.getText();
if (urlString.length() == 0) {
- this.engine.getErrorWindow().error(ErrorMessages.URL_EMPTY);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.URL_EMPTY);
return;
}
URL url;
try {
url = new URL(urlString);
} catch (MalformedURLException e) {
- this.engine.getErrorWindow().error(ErrorMessages.URL_WRONG, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.URL_WRONG, e);
return;
}
@@ -125,7 +125,7 @@ public class WebResigtryWindow {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Web Registry", infoPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Web Registry", 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/descriptors/ApplicationDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java Tue May 22 17:58:06 2012
@@ -568,12 +568,12 @@ public class ApplicationDescriptionDialo
getOriginalHost(),getOriginalDeploymentDescription().getType()
.getApplicationName().getStringValue());
} catch (RegistryException e) {
- engine.getErrorWindow().error(e);
+ engine.getGUI().getErrorWindow().error(e);
}
}
setApplicationDescCreated(true);
} catch (RegistryException e) {
- engine.getErrorWindow().error(e);
+ engine.getGUI().getErrorWindow().error(e);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java Tue May 22 17:58:06 2012
@@ -177,7 +177,7 @@ public class DescriptorEditorDialog exte
title="Application Descriptions";
break;
}
- this.dialog = new XBayaDialog(this.engine, title, infoPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), title, infoPanel, buttonPanel);
this.dialog.setDefaultButton(editButton);
editButton.setEnabled(false);
removeButton.setEnabled(false);
@@ -291,7 +291,7 @@ public class DescriptorEditorDialog exte
}
loadDescriptors();
} catch (RegistryException e) {
- this.engine.getErrorWindow().error(e);
+ this.engine.getGUI().getErrorWindow().error(e);
}
}
return true;
@@ -317,7 +317,7 @@ public class DescriptorEditorDialog exte
((DefaultListModel)descriptorList.getModel()).addElement(d);
}
} catch (RegistryException e) {
- engine.getErrorWindow().error(e);
+ engine.getGUI().getErrorWindow().error(e);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java Tue May 22 17:58:06 2012
@@ -370,7 +370,7 @@ public class HostDescriptionDialog exten
getRegistry().saveHostDescription(desc);
setHostCreated(true);
} catch (RegistryException e) {
- getEngine().getErrorWindow().error(e);
+ getEngine().getGUI().getErrorWindow().error(e);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/amazon/InstanceConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/amazon/InstanceConfigurationDialog.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/amazon/InstanceConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/amazon/InstanceConfigurationDialog.java Tue May 22 17:58:06 2012
@@ -178,13 +178,13 @@ public class InstanceConfigurationDialog
public void actionPerformed(ActionEvent e) {
if (InstanceConfigurationDialog.this.idTextField.getText() == null
|| InstanceConfigurationDialog.this.idTextField.getText().isEmpty()) {
- InstanceConfigurationDialog.this.engine.getErrorWindow()
+ InstanceConfigurationDialog.this.engine.getGUI().getErrorWindow()
.error("Please input AMI ID or Instance ID");
return;
}
if (InstanceConfigurationDialog.this.usernameTextField.getText() == null
|| InstanceConfigurationDialog.this.usernameTextField.getText().isEmpty()) {
- InstanceConfigurationDialog.this.engine.getErrorWindow().error(
+ InstanceConfigurationDialog.this.engine.getGUI().getErrorWindow().error(
"Please input username to access instance");
return;
}
@@ -218,7 +218,7 @@ public class InstanceConfigurationDialog
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Instance Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Instance 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/dynamic/DynamicNodeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java Tue May 22 17:58:06 2012
@@ -198,10 +198,10 @@ public class DynamicNodeWindow {
}
- this.engine.getWorkflow().removeNode(this.node);
+ this.engine.getGUI().getWorkflow().removeNode(this.node);
} catch (Exception e) {
- this.engine.getErrorWindow().error(e);
+ this.engine.getGUI().getErrorWindow().error(e);
}
}
@@ -235,7 +235,7 @@ public class DynamicNodeWindow {
JPanel buttonPanel = new JPanel();
buttonPanel.add(okButton);
- this.dialog = new XBayaDialog(this.engine, this.node.getName(), infoPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), this.node.getName(), infoPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
@@ -333,7 +333,7 @@ public class DynamicNodeWindow {
WSNode fromWsNode = (WSNode) fromNode;
if (null != fromPort && fromPort instanceof DataPort) {
DataPort fromDataPort = (DataPort) fromPort;
- WsdlDefinitions wsdl = engine.getWorkflow().getWSDLs().get(fromWsNode.getWSDLID());
+ WsdlDefinitions wsdl = engine.getGUI().getWorkflow().getWSDLs().get(fromWsNode.getWSDLID());
Iterator<XmlNamespace> itr = wsdl.xml().namespaces().iterator();
try {
XmlElement schema = wsdl.getTypes().element("schema").clone();
@@ -364,9 +364,9 @@ public class DynamicNodeWindow {
SchemaCompilerUtil.compile(args);
} catch (XmlBuilderException e) {
- this.engine.getErrorWindow().error(e);
+ this.engine.getGUI().getErrorWindow().error(e);
} catch (CloneNotSupportedException e) {
- this.engine.getErrorWindow().error(e);
+ this.engine.getGUI().getErrorWindow().error(e);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -406,7 +406,7 @@ public class DynamicNodeWindow {
// node.setOperationName(getOperationName(code));
// node.setClassName(getPackageName(code)+"."+getClassName(code));
// } catch (IOException 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/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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -116,12 +116,12 @@ public class DynamicWorkflowRunnerWindow
* Shows the dialog.
*/
public void show() {
- this.workflow = this.engine.getWorkflow();
+ this.workflow = this.engine.getGUI().getWorkflow();
List<String> urlList=null;
try {
urlList = this.engine.getConfiguration().getJcrComponentRegistry().getRegistry().getGFacDescriptorList();
} catch (RegistryException e) {
- engine.getErrorWindow().error(e);
+ engine.getGUI().getErrorWindow().error(e);
}
// When run xbaya continously urls can be repeating, so first remove everything and then add
this.gfacUrlListField.removeAllItems();
@@ -133,7 +133,7 @@ public class DynamicWorkflowRunnerWindow
this.gfacUrlListField.setEditable(true);
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;
}
@@ -287,7 +287,7 @@ public class DynamicWorkflowRunnerWindow
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Invoke workflow", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Invoke workflow", mainPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
@@ -296,7 +296,7 @@ public class DynamicWorkflowRunnerWindow
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;
}
@@ -309,7 +309,7 @@ public class DynamicWorkflowRunnerWindow
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());
// This is to enable service interaction with the back end
if (this.interactChkBox.isSelected()) {
LinkedList<String> nodeIDs = new LinkedList<String>();
@@ -343,7 +343,7 @@ public class DynamicWorkflowRunnerWindow
// try {
// this.engine.getConfiguration().setXRegistryURL(new URI(xregistryUrl));
// } catch (URISyntaxException e) {
- // this.engine.getErrorWindow().error(e);
+ // this.engine.getGUI().getErrorWindow().error(e);
// }
// }
@@ -352,7 +352,7 @@ public class DynamicWorkflowRunnerWindow
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);
@@ -377,7 +377,7 @@ public class DynamicWorkflowRunnerWindow
// try {
// mapping.setGatekeeperEPR(new URI(hostBean.getGateKeeperendPointReference()));
// } catch (Exception e) {
- // this.engine.getErrorWindow().error(e);
+ // this.engine.getGUI().getErrorWindow().error(e);
// }
//
// }
@@ -408,9 +408,9 @@ public class DynamicWorkflowRunnerWindow
try {
workflowInterpreter.cleanup();
} catch (MonitorException e1) {
- DynamicWorkflowRunnerWindow.this.engine.getErrorWindow().error(e1);
+ DynamicWorkflowRunnerWindow.this.engine.getGUI().getErrorWindow().error(e1);
}
- DynamicWorkflowRunnerWindow.this.engine.getErrorWindow().error(e);
+ DynamicWorkflowRunnerWindow.this.engine.getGUI().getErrorWindow().error(e);
}
}
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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -130,7 +130,7 @@ public class ConstantConfigurationDialog
if (name.length() == 0) {
String warning = "The name cannot be empty.";
- this.engine.getErrorWindow().error(warning);
+ this.engine.getGUI().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.getErrorWindow().error(warning);
+ this.engine.getGUI().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.getErrorWindow().error(warning, e);
+ this.engine.getGUI().getErrorWindow().error(warning, e);
}
}
}
@@ -206,7 +206,7 @@ public class ConstantConfigurationDialog
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Constant Configuration", this.gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -148,7 +148,7 @@ public class DifferedInputConfigurationD
if (name.length() == 0) {
String warning = "The name cannot be empty.";
- this.engine.getErrorWindow().error(warning);
+ this.engine.getGUI().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.getErrorWindow().error(warning);
+ this.engine.getGUI().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.getErrorWindow().error(warning, e);
+ this.engine.getGUI().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.getErrorWindow().error(warning, e);
+ this.engine.getGUI().getErrorWindow().error(warning, e);
return;
}
}
@@ -244,7 +244,7 @@ public class DifferedInputConfigurationD
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine,
+ this.dialog = new XBayaDialog(this.engine.getGUI(),
"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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -107,7 +107,7 @@ public class EndBlockConfigurationDialog
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
hide();
@@ -157,7 +157,7 @@ public class EndBlockConfigurationDialog
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Endif Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -105,7 +105,7 @@ public class EndForEachConfigurationDial
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
hide();
@@ -155,7 +155,7 @@ public class EndForEachConfigurationDial
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "EndForEach Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -107,7 +107,7 @@ public class EndifConfigurationDialog {
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
hide();
@@ -157,7 +157,7 @@ public class EndifConfigurationDialog {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Endif Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -105,7 +105,7 @@ public class ForEachConfigurationDialog
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
hide();
@@ -155,7 +155,7 @@ public class ForEachConfigurationDialog
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "ForEach Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -109,12 +109,12 @@ public class IfConfigurationDialog {
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
if (xpathString.length() == 0) {
String warning = "XPath cannot be empty.";
- this.engine.getErrorWindow().error(warning);
+ this.engine.getGUI().getErrorWindow().error(warning);
return;
}
// Check if it's a valid XPath.
@@ -126,7 +126,7 @@ public class IfConfigurationDialog {
// xpath = new XisXPath(xpathString);
// } catch (RuntimeException e) {
// String warning = "XPath is in wrong format.";
- // this.engine.getErrorWindow().error(warning, e);
+ // this.engine.getGUI().getErrorWindow().error(warning, e);
// return;
// }
this.node.setXPath(xpathString);
@@ -183,7 +183,7 @@ public class IfConfigurationDialog {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "If Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -159,7 +159,7 @@ public class InputConfigurationDialog {
if (name.length() == 0) {
String warning = "The name cannot be empty.";
- this.engine.getErrorWindow().error(warning);
+ this.engine.getGUI().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.getErrorWindow().error(warning);
+ this.engine.getGUI().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.getErrorWindow().error(warning, e);
+ this.engine.getGUI().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.getErrorWindow().error(warning, e);
+ this.engine.getGUI().getErrorWindow().error(warning, e);
return;
}
}
@@ -254,7 +254,7 @@ public class InputConfigurationDialog {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Input Parameter Configuration", this.gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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/MemoConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/MemoConfigurationDialog.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/MemoConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/MemoConfigurationDialog.java Tue May 22 17:58:06 2012
@@ -108,7 +108,7 @@ public class MemoConfigurationDialog {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Memo", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Memo", 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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -101,7 +101,7 @@ public class OutputConfigurationDialog {
if (name.length() == 0) {
String warning = "The name cannot be empty.";
- this.engine.getErrorWindow().error(warning);
+ this.engine.getGUI().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.getErrorWindow().error(warning, e);
+ this.engine.getGUI().getErrorWindow().error(warning, e);
return;
}
}
@@ -166,7 +166,7 @@ public class OutputConfigurationDialog {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Input Parameter Configuration", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -103,7 +103,7 @@ public class ReceiveConfigurationDialog
// Do nothing.
}
} catch (GraphException e) {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
hide();
@@ -153,7 +153,7 @@ public class ReceiveConfigurationDialog
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Receive Configuration", gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -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.getErrorWindow().warning(S3FileChooser.this.dialog.getDialog(), "Error",
+ S3FileChooser.this.engine.getGUI().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.getErrorWindow().error(e1);
+ S3FileChooser.this.engine.getGUI().getErrorWindow().error(e1);
}
return;
@@ -115,7 +115,7 @@ public class S3FileChooser implements Tr
bucketsLoader.load(s3Service, S3FileChooser.this.s3Tree);
} catch (S3ServiceException s3ex) {
- S3FileChooser.this.engine.getErrorWindow().error(s3ex);
+ S3FileChooser.this.engine.getGUI().getErrorWindow().error(s3ex);
}
}
});
@@ -146,7 +146,7 @@ public class S3FileChooser implements Tr
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Amazon S3 Input Chooser", scrollPane, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -122,7 +122,7 @@ public class StreamSourceConfigurationDi
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Configure Streaming Data source", this.gridPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -102,7 +102,7 @@ public class ServiceInteractionWindow {
buttonPanel.add(sendButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Deploy workflow to ODE and Registry", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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/graph/ws/WSNodeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/WSNodeWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/WSNodeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/WSNodeWindow.java Tue May 22 17:58:06 2012
@@ -133,7 +133,7 @@ public class WSNodeWindow {
JPanel buttonPanel = new JPanel();
buttonPanel.add(okButton);
- this.dialog = new XBayaDialog(this.engine, this.node.getName(), infoPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), this.node.getName(), infoPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/monitor/MonitorConfigurationWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/monitor/MonitorConfigurationWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/monitor/MonitorConfigurationWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/monitor/MonitorConfigurationWindow.java Tue May 22 17:58:06 2012
@@ -93,7 +93,7 @@ public class MonitorConfigurationWindow
boolean pull = this.pullCheckBox.isSelected();
if (broker.length() == 0) {
- this.engine.getErrorWindow().error("Broker URL cannot be empty");
+ this.engine.getGUI().getErrorWindow().error("Broker URL cannot be empty");
return;
}
URI brokerURL;
@@ -101,27 +101,27 @@ public class MonitorConfigurationWindow
brokerURL = new URI(broker).parseServerAuthority();
} catch (URISyntaxException e) {
String message = "Broker URL is in a wrong format";
- this.engine.getErrorWindow().error(message, e);
+ this.engine.getGUI().getErrorWindow().error(message, e);
return;
}
if (topic.length() == 0) {
String message = "Topic cannot be empty";
- this.engine.getErrorWindow().error(message);
+ this.engine.getGUI().getErrorWindow().error(message);
return;
}
URI messageBoxURL = null;
if (pull) {
if (messageBox.length() == 0) {
- this.engine.getErrorWindow().error("Message box URL cannot be empty");
+ this.engine.getGUI().getErrorWindow().error("Message box URL cannot be empty");
return;
}
try {
messageBoxURL = new URI(messageBox).parseServerAuthority();
} catch (URISyntaxException e) {
String message = "Message box URL is in a wrong format";
- this.engine.getErrorWindow().error(message, e);
+ this.engine.getGUI().getErrorWindow().error(message, e);
return;
}
} else {
@@ -190,7 +190,7 @@ public class MonitorConfigurationWindow
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Notification Configuration", infoPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Notification Configuration", 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/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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -127,7 +127,7 @@ public class MonitorWindow {
JPanel buttonPanel = new JPanel();
buttonPanel.add(okButton);
- this.dialog = new XBayaDialog(this.engine, "Notification", infoPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "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/MyProxyDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyDialog.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyDialog.java Tue May 22 17:58:06 2012
@@ -119,37 +119,37 @@ public class MyProxyDialog {
String lifetimeString = this.lifetimeField.getText();
if (server.length() == 0) {
- this.engine.getErrorWindow().error(ErrorMessages.MYPROXY_HOST_EMPTY);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.MYPROXY_HOST_EMPTY);
return;
}
if (portString.length() == 0) {
- this.engine.getErrorWindow().error(ErrorMessages.MYPROXY_PORT_EMPTY);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.MYPROXY_PORT_EMPTY);
return;
}
int port;
try {
port = Integer.parseInt(portString);
} catch (NumberFormatException e) {
- this.engine.getErrorWindow().error(ErrorMessages.MYPROXY_PORT_WRONG, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.MYPROXY_PORT_WRONG, e);
return;
}
if (username.length() == 0) {
- this.engine.getErrorWindow().error(ErrorMessages.USERNAME_EMPTY);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.USERNAME_EMPTY);
return;
}
if (passphrase.length() < 6) {
- this.engine.getErrorWindow().error(ErrorMessages.MYPROXY_PASSPHRASE_WRONG);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.MYPROXY_PASSPHRASE_WRONG);
return;
}
if (lifetimeString.length() == 0) {
- this.engine.getErrorWindow().error(ErrorMessages.MYPROXY_LIFETIME_EMPTY);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.MYPROXY_LIFETIME_EMPTY);
return;
}
int lifetime;
try {
lifetime = Integer.parseInt(lifetimeString);
} catch (NumberFormatException e) {
- this.engine.getErrorWindow().error(ErrorMessages.MYPROXY_LIFETIME_WRONG, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.MYPROXY_LIFETIME_WRONG, e);
return;
}
@@ -218,7 +218,7 @@ public class MyProxyDialog {
buttonPanel.add(this.okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, TITLE, DESCRIPTION, mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), TITLE, DESCRIPTION, 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/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=1341577&r1=1341576&r2=1341577&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 Tue May 22 17:58:06 2012
@@ -90,7 +90,7 @@ public class MyProxyLoader implements Ca
logger.error(e.getMessage(), e);
} else {
String message = ErrorMessages.MYPROXY_LOAD_ERROR + "\n" + e.getMessage();
- this.engine.getErrorWindow().error(message, e);
+ this.engine.getGUI().getErrorWindow().error(message, e);
this.waitDialog.hide();
}
@@ -98,11 +98,11 @@ public class MyProxyLoader implements Ca
if (this.canceled) {
logger.error(e.getMessage(), e);
} else {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
this.waitDialog.hide();
}
} catch (Error e) {
- this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
this.waitDialog.hide();
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java Tue May 22 17:58:06 2012
@@ -89,21 +89,21 @@ public class JCRRegistryWindow {
String password = new String(this.passwordTextField.getPassword());
if (urlString.length() == 0) {
- this.engine.getErrorWindow().error(ErrorMessages.URL_EMPTY);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.URL_EMPTY);
return;
}
URI url;
try {
url = new URI(urlString);
} catch (URISyntaxException e) {
- this.engine.getErrorWindow().error(ErrorMessages.URL_WRONG, e);
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.URL_WRONG, e);
return;
}
JCRComponentRegistry registry = null;
try {
registry = new JCRComponentRegistry(url, username, password);
} catch (Exception e) {
- this.engine.getErrorWindow().error(e.getMessage());
+ this.engine.getGUI().getErrorWindow().error(e.getMessage());
return;
}
XBayaConfiguration configuration = this.engine.getConfiguration();
@@ -192,7 +192,7 @@ public class JCRRegistryWindow {
buttonPanel.add(cancelButton);
buttonPanel.getSwingComponent().setBorder(BorderFactory.createEtchedBorder());
- this.dialog = new XBayaDialog(this.engine, "JCR Registry", infoPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "JCR Registry", 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/registry/NewJCRRegistryUserDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java?rev=1341577&r1=1341576&r2=1341577&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java Tue May 22 17:58:06 2012
@@ -115,16 +115,16 @@ public class NewJCRRegistryUserDialog {
setUserCreated(true);
} catch (URISyntaxException e) {
e.printStackTrace();
- engine.getErrorWindow().error(e.getMessage());
+ engine.getGUI().getErrorWindow().error(e.getMessage());
} catch (AuthorizableExistsException e) {
e.printStackTrace();
- engine.getErrorWindow().error(e.getMessage());
+ engine.getGUI().getErrorWindow().error(e.getMessage());
} catch (RepositoryException e) {
e.printStackTrace();
- engine.getErrorWindow().error(e.getMessage());
+ engine.getGUI().getErrorWindow().error(e.getMessage());
}
} else {
- engine.getErrorWindow().error(status);
+ engine.getGUI().getErrorWindow().error(status);
}
}
@@ -218,7 +218,7 @@ public class NewJCRRegistryUserDialog {
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "JCR Registry New User", infoPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "JCR Registry New User", infoPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
updateControlData();
}