You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/10/31 21:56:46 UTC
svn commit: r1195667 [7/12] - in /incubator/airavata/trunk/modules:
commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/
commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/
commons/registry-api/src/main/java/org...
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/globus/GridFTPFileTransferClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/globus/GridFTPFileTransferClient.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/globus/GridFTPFileTransferClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/globus/GridFTPFileTransferClient.java Mon Oct 31 20:56:37 2011
@@ -19,220 +19,220 @@
*
*/
-package org.apache.airavata.xbaya.globus;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.globusonline.transfer.APIError;
-import org.globusonline.transfer.BaseTransferAPIClient;
-import org.globusonline.transfer.JSONTransferAPIClient;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class GridFTPFileTransferClient {
- private JSONTransferAPIClient client;
- private static DateFormat isoDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
-
- public GridFTPFileTransferClient(JSONTransferAPIClient client) {
- this.client = client;
- }
-
- public static void main(String args[]) {
- String username = "heshan";
- String caFile = "/home/heshan/Dev/globusonline/transfer-api-client-java.git/trunk/ca/gd-bundle_ca.cert";
- String certFile = "/tmp/x509up_u780936";
- String keyFile = "/tmp/x509up_u780936";
- String baseUrl = null;
-
- String sourceEndpoint = "xsede#ranger";
- String sourceFilePath = "~/tmp.log";
- String destEndpoint = "xsede#trestles";
- String destFilePath = "~/tmp.log.copy";
-
- // String destEndpoint = "heshan#my_testEndpoint";
- // String sourceFilePath = "~/var_tables.mod";
- try {
- JSONTransferAPIClient c = new JSONTransferAPIClient(username, caFile, certFile, keyFile, baseUrl);
- System.out.println("base url: " + c.getBaseUrl());
- GridFTPFileTransferClient e = new GridFTPFileTransferClient(c);
- e.transfer(sourceEndpoint, sourceFilePath, destEndpoint, destFilePath);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Transfers a file from source endpoint to destination endpoint.
- *
- * @param sourceEndpoint
- * Source endpoint
- * @param sourceFilePath
- * Source file path
- * @param destEndpoint
- * Destination endpoint
- * @param destFilePath
- * Destination file path
- * @throws IOException
- * IOException
- * @throws JSONException
- * JSONException
- * @throws GeneralSecurityException
- * GeneralSecurityException
- * @throws APIError
- * APIError
- */
- public void transfer(String sourceEndpoint, String sourceFilePath, String destEndpoint, String destFilePath)
- throws IOException, JSONException, GeneralSecurityException, APIError {
- System.out.println("Starting transfer...");
-
- // displayTasksummary();
- // displayTaskList(60 * 60 * 24 * 7); // tasks at most a week old
- // displayEndpointList();
-
- if (!autoActivate(sourceEndpoint) || !autoActivate(destEndpoint)) {
- System.err.println("Unable to auto activate go tutorial endpoints, " + " exiting");
- return;
- }
-
- // displayLs(sourceEndpoint, "~");
- // displayLs(destEndpoint, "~");
-
- JSONTransferAPIClient.Result r = client.getResult(FileTransferConstants.SUBMISSION_ID_ENDPOINT);
- String submissionId = r.document.getString(FileTransferConstants.VALUE);
- JSONObject transfer = new JSONObject();
- transfer.put(FileTransferConstants.DATA_TYPE, FileTransferConstants.TRANSFER);
- transfer.put(FileTransferConstants.SUBMISSION_ID, submissionId);
- JSONObject item = new JSONObject();
- item.put(FileTransferConstants.DATA_TYPE, FileTransferConstants.TRANSFER_ITEM);
- item.put(FileTransferConstants.SOURCE_ENDPOINT, sourceEndpoint);
- item.put(FileTransferConstants.SOURCE_PATH, sourceFilePath);
- item.put(FileTransferConstants.DESTINATION_ENDPOINT, destEndpoint);
- item.put(FileTransferConstants.DESTINATION_PATH, destFilePath);
- transfer.append(FileTransferConstants.DATA, item);
-
- r = client.postResult(FileTransferConstants.TRANSFER_ENDPOINT, transfer.toString(), null);
- String taskId = r.document.getString(FileTransferConstants.TASK_ID);
- if (!waitForTask(taskId, 120)) {
- System.out.println("Transfer not complete after 2 minutes, exiting");
- return;
- }
-
- System.out.println("Transfer completed...");
-
- // displayTasksummary();
- // displayLs(destEndpoint, "~");
- }
-
- public void displayTasksummary() throws IOException, JSONException, GeneralSecurityException, APIError {
- JSONTransferAPIClient.Result r = client.getResult("/tasksummary");
- System.out.println("Task Summary for " + client.getUsername() + ": ");
- Iterator keysIter = r.document.sortedKeys();
- while (keysIter.hasNext()) {
- String key = (String) keysIter.next();
- if (!key.equals("DATA_TYPE"))
- System.out.println(" " + key + ": " + r.document.getString(key));
- }
- }
-
- public void displayTaskList(long maxAge) throws IOException, JSONException, GeneralSecurityException, APIError {
- Map<String, String> params = new HashMap<String, String>();
- if (maxAge > 0) {
- long minTime = System.currentTimeMillis() - 1000 * maxAge;
- params.put("filter", "request_time:" + isoDateFormat.format(new Date(minTime)) + ",");
- }
- JSONTransferAPIClient.Result r = client.getResult("/task_list", params);
-
- int length = r.document.getInt("length");
- if (length == 0) {
- System.out.println("No tasks were submitted in the last " + maxAge + " seconds");
- return;
- }
- JSONArray tasksArray = r.document.getJSONArray("DATA");
- for (int i = 0; i < tasksArray.length(); i++) {
- JSONObject taskObject = tasksArray.getJSONObject(i);
- System.out.println("Task " + taskObject.getString("task_id") + ":");
- displayTask(taskObject);
- }
- }
-
- private static void displayTask(JSONObject taskObject) throws JSONException {
- Iterator keysIter = taskObject.sortedKeys();
- while (keysIter.hasNext()) {
- String key = (String) keysIter.next();
- if (!key.equals("DATA_TYPE") && !key.equals("LINKS") && !key.endsWith("_link")) {
- System.out.println(" " + key + ": " + taskObject.getString(key));
- }
- }
- }
-
- public boolean autoActivate(String endpointName) throws IOException, JSONException, GeneralSecurityException,
- APIError {
- // Note: in a later release, auto-activation will be done at
- // /autoactivate instead.
- String resource = BaseTransferAPIClient.endpointPath(endpointName) + "/autoactivate";
- JSONTransferAPIClient.Result r = client.postResult(resource, null, null);
- String code = r.document.getString("code");
- if (code.startsWith("AutoActivationFailed")) {
- return false;
- }
- return true;
- }
-
- public void displayLs(String endpointName, String path) throws IOException, JSONException,
- GeneralSecurityException, APIError {
- Map<String, String> params = new HashMap<String, String>();
- if (path != null) {
- params.put("path", path);
- }
- String resource = BaseTransferAPIClient.endpointPath(endpointName) + "/ls";
- JSONTransferAPIClient.Result r = client.getResult(resource, params);
- System.out.println("Contents of " + path + " on " + endpointName + ":");
-
- JSONArray fileArray = r.document.getJSONArray("DATA");
- for (int i = 0; i < fileArray.length(); i++) {
- JSONObject fileObject = fileArray.getJSONObject(i);
- System.out.println(" " + fileObject.getString("name"));
- Iterator keysIter = fileObject.sortedKeys();
- while (keysIter.hasNext()) {
- String key = (String) keysIter.next();
- if (!key.equals("DATA_TYPE") && !key.equals("LINKS") && !key.endsWith("_link") && !key.equals("name")) {
- System.out.println(" " + key + ": " + fileObject.getString(key));
- }
- }
- }
-
- }
-
- public boolean waitForTask(String taskId, int timeout) throws IOException, JSONException, GeneralSecurityException,
- APIError {
- String status = "ACTIVE";
- JSONTransferAPIClient.Result r;
-
- String resource = "/task/" + taskId;
- Map<String, String> params = new HashMap<String, String>();
- params.put("fields", "status");
-
- while (timeout > 0 && status.equals("ACTIVE")) {
- r = client.getResult(resource, params);
- status = r.document.getString("status");
- try {
- Thread.sleep(10000);
- } catch (InterruptedException e) {
- return false;
- }
- timeout -= 10;
- }
-
- if (status.equals("ACTIVE"))
- return false;
- return true;
- }
-}
+package org.apache.airavata.xbaya.globus;
+
+import org.globusonline.transfer.APIError;
+import org.globusonline.transfer.BaseTransferAPIClient;
+import org.globusonline.transfer.JSONTransferAPIClient;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+public class GridFTPFileTransferClient {
+ private JSONTransferAPIClient client;
+ private static DateFormat isoDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
+
+ public GridFTPFileTransferClient(JSONTransferAPIClient client) {
+ this.client = client;
+ }
+
+ public static void main(String args[]) {
+ String username = "heshan";
+ String caFile = "/home/heshan/Dev/globusonline/transfer-api-client-java.git/trunk/ca/gd-bundle_ca.cert";
+ String certFile = "/tmp/x509up_u780936";
+ String keyFile = "/tmp/x509up_u780936";
+ String baseUrl = null;
+
+ String sourceEndpoint = "xsede#ranger";
+ String sourceFilePath = "~/tmp.log";
+ String destEndpoint = "xsede#trestles";
+ String destFilePath = "~/tmp.log.copy";
+
+ // String destEndpoint = "heshan#my_testEndpoint";
+ // String sourceFilePath = "~/var_tables.mod";
+ try {
+ JSONTransferAPIClient c = new JSONTransferAPIClient(username, caFile, certFile, keyFile, baseUrl);
+ System.out.println("base url: " + c.getBaseUrl());
+ GridFTPFileTransferClient e = new GridFTPFileTransferClient(c);
+ e.transfer(sourceEndpoint, sourceFilePath, destEndpoint, destFilePath);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Transfers a file from source endpoint to destination endpoint.
+ *
+ * @param sourceEndpoint
+ * Source endpoint
+ * @param sourceFilePath
+ * Source file path
+ * @param destEndpoint
+ * Destination endpoint
+ * @param destFilePath
+ * Destination file path
+ * @throws IOException
+ * IOException
+ * @throws JSONException
+ * JSONException
+ * @throws GeneralSecurityException
+ * GeneralSecurityException
+ * @throws APIError
+ * APIError
+ */
+ public void transfer(String sourceEndpoint, String sourceFilePath, String destEndpoint, String destFilePath)
+ throws IOException, JSONException, GeneralSecurityException, APIError {
+ System.out.println("Starting transfer...");
+
+ // displayTasksummary();
+ // displayTaskList(60 * 60 * 24 * 7); // tasks at most a week old
+ // displayEndpointList();
+
+ if (!autoActivate(sourceEndpoint) || !autoActivate(destEndpoint)) {
+ System.err.println("Unable to auto activate go tutorial endpoints, " + " exiting");
+ return;
+ }
+
+ // displayLs(sourceEndpoint, "~");
+ // displayLs(destEndpoint, "~");
+
+ JSONTransferAPIClient.Result r = client.getResult(FileTransferConstants.SUBMISSION_ID_ENDPOINT);
+ String submissionId = r.document.getString(FileTransferConstants.VALUE);
+ JSONObject transfer = new JSONObject();
+ transfer.put(FileTransferConstants.DATA_TYPE, FileTransferConstants.TRANSFER);
+ transfer.put(FileTransferConstants.SUBMISSION_ID, submissionId);
+ JSONObject item = new JSONObject();
+ item.put(FileTransferConstants.DATA_TYPE, FileTransferConstants.TRANSFER_ITEM);
+ item.put(FileTransferConstants.SOURCE_ENDPOINT, sourceEndpoint);
+ item.put(FileTransferConstants.SOURCE_PATH, sourceFilePath);
+ item.put(FileTransferConstants.DESTINATION_ENDPOINT, destEndpoint);
+ item.put(FileTransferConstants.DESTINATION_PATH, destFilePath);
+ transfer.append(FileTransferConstants.DATA, item);
+
+ r = client.postResult(FileTransferConstants.TRANSFER_ENDPOINT, transfer.toString(), null);
+ String taskId = r.document.getString(FileTransferConstants.TASK_ID);
+ if (!waitForTask(taskId, 120)) {
+ System.out.println("Transfer not complete after 2 minutes, exiting");
+ return;
+ }
+
+ System.out.println("Transfer completed...");
+
+ // displayTasksummary();
+ // displayLs(destEndpoint, "~");
+ }
+
+ public void displayTasksummary() throws IOException, JSONException, GeneralSecurityException, APIError {
+ JSONTransferAPIClient.Result r = client.getResult("/tasksummary");
+ System.out.println("Task Summary for " + client.getUsername() + ": ");
+ Iterator keysIter = r.document.sortedKeys();
+ while (keysIter.hasNext()) {
+ String key = (String) keysIter.next();
+ if (!key.equals("DATA_TYPE"))
+ System.out.println(" " + key + ": " + r.document.getString(key));
+ }
+ }
+
+ public void displayTaskList(long maxAge) throws IOException, JSONException, GeneralSecurityException, APIError {
+ Map<String, String> params = new HashMap<String, String>();
+ if (maxAge > 0) {
+ long minTime = System.currentTimeMillis() - 1000 * maxAge;
+ params.put("filter", "request_time:" + isoDateFormat.format(new Date(minTime)) + ",");
+ }
+ JSONTransferAPIClient.Result r = client.getResult("/task_list", params);
+
+ int length = r.document.getInt("length");
+ if (length == 0) {
+ System.out.println("No tasks were submitted in the last " + maxAge + " seconds");
+ return;
+ }
+ JSONArray tasksArray = r.document.getJSONArray("DATA");
+ for (int i = 0; i < tasksArray.length(); i++) {
+ JSONObject taskObject = tasksArray.getJSONObject(i);
+ System.out.println("Task " + taskObject.getString("task_id") + ":");
+ displayTask(taskObject);
+ }
+ }
+
+ private static void displayTask(JSONObject taskObject) throws JSONException {
+ Iterator keysIter = taskObject.sortedKeys();
+ while (keysIter.hasNext()) {
+ String key = (String) keysIter.next();
+ if (!key.equals("DATA_TYPE") && !key.equals("LINKS") && !key.endsWith("_link")) {
+ System.out.println(" " + key + ": " + taskObject.getString(key));
+ }
+ }
+ }
+
+ public boolean autoActivate(String endpointName) throws IOException, JSONException, GeneralSecurityException,
+ APIError {
+ // Note: in a later release, auto-activation will be done at
+ // /autoactivate instead.
+ String resource = BaseTransferAPIClient.endpointPath(endpointName) + "/autoactivate";
+ JSONTransferAPIClient.Result r = client.postResult(resource, null, null);
+ String code = r.document.getString("code");
+ if (code.startsWith("AutoActivationFailed")) {
+ return false;
+ }
+ return true;
+ }
+
+ public void displayLs(String endpointName, String path) throws IOException, JSONException,
+ GeneralSecurityException, APIError {
+ Map<String, String> params = new HashMap<String, String>();
+ if (path != null) {
+ params.put("path", path);
+ }
+ String resource = BaseTransferAPIClient.endpointPath(endpointName) + "/ls";
+ JSONTransferAPIClient.Result r = client.getResult(resource, params);
+ System.out.println("Contents of " + path + " on " + endpointName + ":");
+
+ JSONArray fileArray = r.document.getJSONArray("DATA");
+ for (int i = 0; i < fileArray.length(); i++) {
+ JSONObject fileObject = fileArray.getJSONObject(i);
+ System.out.println(" " + fileObject.getString("name"));
+ Iterator keysIter = fileObject.sortedKeys();
+ while (keysIter.hasNext()) {
+ String key = (String) keysIter.next();
+ if (!key.equals("DATA_TYPE") && !key.equals("LINKS") && !key.endsWith("_link") && !key.equals("name")) {
+ System.out.println(" " + key + ": " + fileObject.getString(key));
+ }
+ }
+ }
+
+ }
+
+ public boolean waitForTask(String taskId, int timeout) throws IOException, JSONException, GeneralSecurityException,
+ APIError {
+ String status = "ACTIVE";
+ JSONTransferAPIClient.Result r;
+
+ String resource = "/task/" + taskId;
+ Map<String, String> params = new HashMap<String, String>();
+ params.put("fields", "status");
+
+ while (timeout > 0 && status.equals("ACTIVE")) {
+ r = client.getResult(resource, params);
+ status = r.document.getString("status");
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ return false;
+ }
+ timeout -= 10;
+ }
+
+ if (status.equals("ACTIVE"))
+ return false;
+ return true;
+ }
+}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/GPELClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/GPELClient.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/GPELClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/GPELClient.java Mon Oct 31 20:56:37 2011
@@ -100,7 +100,6 @@ public class GPELClient extends Workflow
* @param userX509Credential
* @throws WorkflowEngineException
*/
- @Override
public void setUserX509Credential(UserX509Credential userX509Credential) throws WorkflowEngineException {
this.gpelUserX509Credential = userX509Credential;
connect();
@@ -112,7 +111,6 @@ public class GPELClient extends Workflow
* @return The workflow template ID.
* @throws WorkflowEngineException
*/
- @Override
public synchronized URI deploy(Workflow workflow, boolean redeploy) throws WorkflowEngineException {
if (workflow.getGpelProcess() == null) {
throw new IllegalStateException("BPEL script has to have been generated.");
@@ -270,7 +268,6 @@ public class GPELClient extends Workflow
* @throws WorkflowEngineException
* @throws ComponentException
*/
- @Override
public synchronized Workflow load(URI id, WorkflowType workflowType) throws GraphException,
WorkflowEngineException, ComponentException {
logger.debug("ID: " + id.toString() + " Type:" + workflowType);
@@ -416,7 +413,6 @@ public class GPELClient extends Workflow
* @return The List of GcSearchResult.
* @throws WorkflowEngineException
*/
- @Override
@SuppressWarnings("boxing")
public synchronized GcSearchList list(int maxNum, WorkflowType type) throws WorkflowEngineException {
logger.debug("Maxnum: " + maxNum + " Type: " + type);
@@ -456,7 +452,6 @@ public class GPELClient extends Workflow
* @throws ComponentException
* @throws GraphException
*/
- @Override
public synchronized GcInstance instantiate(Workflow workflow, URI dscURL, String name)
throws WorkflowEngineException, ComponentException, GraphException {
if (!isConnected()) {
@@ -538,7 +533,6 @@ public class GPELClient extends Workflow
* @throws WorkflowEngineException
* @Deprecated This one doesn't support hierarchical workflows. Use instantiate(workflow, dscURL) instead.
*/
- @Override
@Deprecated
public synchronized GcInstance instantiate(Workflow workflow, Map<String, WsdlDefinitions> wsdlMap)
throws WorkflowEngineException {
@@ -586,7 +580,6 @@ public class GPELClient extends Workflow
* @return The WSDL of the workflow.
* @throws WorkflowEngineException
*/
- @Override
public synchronized WsdlDefinitions start(final GcInstance instance) throws WorkflowEngineException {
if (!isConnected()) {
throw new IllegalStateException("The BPEL Engine has not configured.");
@@ -611,7 +604,6 @@ public class GPELClient extends Workflow
}
}
- @Override
public synchronized void connect() throws WorkflowEngineException {
if (this.engineURL == null) {
if (this.client != null) {
@@ -646,12 +638,10 @@ public class GPELClient extends Workflow
}
}
- @Override
public void setXRegistryUrl(URI xRegistryURL) {
// nothing to be done here as we don't need Xregistry info for GPEL client
}
- @Override
public void setXBayaEngine(XBayaEngine xBayaEngine) {
// nothing to be done here as we don't need XBayaEngine info for GPEL client
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/component/gui/GPELRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/component/gui/GPELRegistryWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/component/gui/GPELRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/component/gui/GPELRegistryWindow.java Mon Oct 31 20:56:37 2011
@@ -140,7 +140,6 @@ public class GPELRegistryWindow {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
ok();
}
@@ -148,7 +147,6 @@ public class GPELRegistryWindow {
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELConfigurationWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELConfigurationWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELConfigurationWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELConfigurationWindow.java Mon Oct 31 20:56:37 2011
@@ -129,7 +129,6 @@ public class GPELConfigurationWindow {
this.okButton = new JButton("OK");
this.okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
ok();
}
@@ -137,7 +136,6 @@ public class GPELConfigurationWindow {
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployWindow.java Mon Oct 31 20:56:37 2011
@@ -178,7 +178,6 @@ public class GPELDeployWindow {
this.newButton = new JButton("Deploy New");
this.newButton.setDefaultCapable(true);
this.newButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
deploy(false);
}
@@ -187,7 +186,6 @@ public class GPELDeployWindow {
this.redeployButton = new JButton("Redeploy");
this.redeployButton.setDefaultCapable(true);
this.redeployButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
deploy(true);
}
@@ -195,7 +193,6 @@ public class GPELDeployWindow {
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployer.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployer.java Mon Oct 31 20:56:37 2011
@@ -60,7 +60,6 @@ public class GPELDeployer implements Can
/**
* @see org.apache.airavata.xbaya.gui.Cancelable#cancel()
*/
- @Override
public void cancel() {
this.canceled = true;
this.deployThread.interrupt();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java Mon Oct 31 20:56:37 2011
@@ -317,7 +317,6 @@ public class GPELInvokeWindow {
this.deployNewAndInvokeButton = new JButton("Deploy New and Invoke");
this.deployNewAndInvokeButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
execute(true);
}
@@ -325,7 +324,6 @@ public class GPELInvokeWindow {
this.redeployAndInvokeButton = new JButton("Redeploy and Invoke");
this.redeployAndInvokeButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
execute(true);
}
@@ -333,7 +331,6 @@ public class GPELInvokeWindow {
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java Mon Oct 31 20:56:37 2011
@@ -78,7 +78,6 @@ public class GPELInvoker implements Canc
/**
* @see org.apache.airavata.xbaya.gui.Cancelable#cancel()
*/
- @Override
public void cancel() {
this.canceled = true;
this.invokeThread.interrupt();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoadWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoadWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoadWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoadWindow.java Mon Oct 31 20:56:37 2011
@@ -90,7 +90,6 @@ public class GPELLoadWindow {
final GcSearchList resultList = workflowClient.list();
SwingUtilities.invokeLater(new Runnable() {
- @Override
public void run() {
if (resultList == null || resultList.size() == 0) {
GPELLoadWindow.this.list.getList().setListData(new String[] { "No workflow" });
@@ -140,7 +139,6 @@ public class GPELLoadWindow {
private void initGUI() {
this.list = new XBayaList<GcSearchResult>();
this.list.addListSelectionListener(new ListSelectionListener() {
- @Override
public void valueChanged(ListSelectionEvent e) {
if (e.getValueIsAdjusting() == false) {
if (GPELLoadWindow.this.list.getSelectedIndex() != -1) {
@@ -186,7 +184,6 @@ public class GPELLoadWindow {
JPanel buttonPanel = new JPanel();
this.okButton = new JButton("OK");
this.okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
ok();
}
@@ -195,7 +192,6 @@ public class GPELLoadWindow {
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoader.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoader.java Mon Oct 31 20:56:37 2011
@@ -62,7 +62,6 @@ public class GPELLoader implements Cance
/**
* @see org.apache.airavata.xbaya.gui.Cancelable#cancel()
*/
- @Override
public void cancel() {
this.canceled = true;
this.loadThread.interrupt();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELMenu.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELMenu.java Mon Oct 31 20:56:37 2011
@@ -82,7 +82,6 @@ public class GPELMenu implements EventLi
/**
* @see org.apache.airavata.xbaya.event.EventListener#eventReceived(org.apache.airavata.xbaya.event.Event)
*/
- @Override
public void eventReceived(Event event) {
boolean connected;
@@ -142,7 +141,6 @@ public class GPELMenu implements EventLi
/**
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
- @Override
public void actionPerformed(ActionEvent e) {
if (this.window == null) {
@@ -165,7 +163,6 @@ public class GPELMenu implements EventLi
item.addActionListener(new AbstractAction() {
private GPELConfigurationWindow window;
- @Override
public void actionPerformed(ActionEvent e) {
if (this.window == null) {
this.window = new GPELConfigurationWindow(GPELMenu.this.engine);
@@ -183,7 +180,6 @@ public class GPELMenu implements EventLi
item.addActionListener(new AbstractAction() {
private GPELDeployWindow window;
- @Override
public void actionPerformed(ActionEvent event) {
if (this.window == null) {
this.window = new GPELDeployWindow(GPELMenu.this.engine);
@@ -201,7 +197,6 @@ public class GPELMenu implements EventLi
item.addActionListener(new AbstractAction() {
private GPELLoadWindow window;
- @Override
public void actionPerformed(ActionEvent event) {
if (this.window == null) {
this.window = new GPELLoadWindow(GPELMenu.this.engine);
@@ -219,7 +214,6 @@ public class GPELMenu implements EventLi
item.addActionListener(new AbstractAction() {
private GPELInvokeWindow window;
- @Override
public void actionPerformed(ActionEvent event) {
if (this.window == null) {
this.window = new GPELInvokeWindow(GPELMenu.this.engine);
@@ -237,7 +231,6 @@ public class GPELMenu implements EventLi
item.addActionListener(new AbstractAction() {
private GPELInvokeWindow window;
- @Override
public void actionPerformed(ActionEvent event) {
if (this.window == null) {
this.window = new GPELInvokeWindow(GPELMenu.this.engine);
@@ -255,7 +248,6 @@ public class GPELMenu implements EventLi
item.addActionListener(new AbstractAction() {
private GPELRegistryWindow window;
- @Override
public void actionPerformed(ActionEvent e) {
if (this.window == null) {
this.window = new GPELRegistryWindow(GPELMenu.this.engine);
@@ -273,7 +265,6 @@ public class GPELMenu implements EventLi
item.addActionListener(new AbstractAction() {
private WorkflowModifierGUI modifierGUI;
- @Override
public void actionPerformed(ActionEvent event) {
if (this.modifierGUI == null) {
this.modifierGUI = new WorkflowModifierGUI(GPELMenu.this.engine);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Edge.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Edge.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Edge.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Edge.java Mon Oct 31 20:56:37 2011
@@ -30,7 +30,6 @@ public interface Edge extends GraphPiece
*
* @return the gui
*/
- @Override
public EdgeGUI getGUI();
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ForEachExecutableNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ForEachExecutableNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ForEachExecutableNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ForEachExecutableNode.java Mon Oct 31 20:56:37 2011
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*
- */
+*/
package org.apache.airavata.xbaya.graph;
public interface ForEachExecutableNode extends Node {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Graph.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Graph.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Graph.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Graph.java Mon Oct 31 20:56:37 2011
@@ -34,7 +34,6 @@ public interface Graph extends GraphPiec
*
* @return the gui
*/
- @Override
public GraphGUI getGUI();
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java Mon Oct 31 20:56:37 2011
@@ -35,7 +35,6 @@ public interface Node extends GraphPiece
*
* @return the gui
*/
- @Override
public NodeGUI getGUI();
/**
@@ -221,7 +220,7 @@ public interface Node extends GraphPiece
public boolean getRequireJoin();
/**
- * @return
- */
- public boolean isFinished();
+ * @return
+ */
+ public boolean isFinished();
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java Mon Oct 31 20:56:37 2011
@@ -63,7 +63,6 @@ public interface Port extends GraphPiece
*
* @return the gui
*/
- @Override
public PortGUI getGUI();
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/InstanceConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/InstanceConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/InstanceConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/InstanceConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -175,7 +175,6 @@ public class InstanceConfigurationDialog
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
if (InstanceConfigurationDialog.this.idTextField.getText() == null
|| InstanceConfigurationDialog.this.idTextField.getText().isEmpty()) {
@@ -210,7 +209,6 @@ public class InstanceConfigurationDialog
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java Mon Oct 31 20:56:37 2011
@@ -207,7 +207,7 @@ public class BasicTypeMapping {
// Object output = this.outputMessage.getObjectPart(name);
// return output;
- XmlElement outputElement = element;
+ XmlElement outputElement = (XmlElement) element;
Iterator valueElementItr = outputElement.elements(null, name).iterator();
LinkedList<String> ret = new LinkedList<String>();
while (valueElementItr.hasNext()) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepNode.java Mon Oct 31 20:56:37 2011
@@ -73,7 +73,6 @@ public class CepNode extends NodeImpl im
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public synchronized NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new CepNodeGUI(this);
@@ -98,13 +97,11 @@ public class CepNode extends NodeImpl im
GraphUtil.validateConnection(edge);
}
- @Override
public void setName(String name) {
super.setName(name);
this.createID();
}
- @Override
public DataPort getFreeInPort() {
List<DataPort> inputPorts = this.getInputPorts();
for (DataPort dataPort : inputPorts) {
@@ -139,7 +136,6 @@ public class CepNode extends NodeImpl im
return port;
}
- @Override
public void removeLastDynamicallyAddedInPort() throws GraphException {
List<DataPort> inputPorts = this.getInputPorts();
@@ -181,7 +177,6 @@ public class CepNode extends NodeImpl im
// this.getComponent().setClassName(className);
// }
- @Override
public XmlElement toXML() {
XmlElement nodeElement = XMLUtil.BUILDER.newFragment(GraphSchema.NS, GraphSchema.NODE_TAG);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepPort.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepPort.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepPort.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepPort.java Mon Oct 31 20:56:37 2011
@@ -75,7 +75,6 @@ public class CepPort extends DataPort {
this.id = id;
}
- @Override
public void setComponentPort(ComponentPort componentPort) {
super.setComponentPort(componentPort);
this.componentPort = (CepComponentPort) componentPort;
@@ -106,7 +105,6 @@ public class CepPort extends DataPort {
// return this.uuid;
// }
- @Override
protected XmlElement toXML() {
XmlElement portElement = super.toXML();
portElement.setAttributeValue(GraphSchema.NS, GraphSchema.PORT_TYPE_ATTRIBUTE, GraphSchema.PORT_TYPE_CEP);
@@ -115,7 +113,6 @@ public class CepPort extends DataPort {
return portElement;
}
- @Override
public void setNode(NodeImpl node) {
super.setNode(node);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CombineMultipleStreamNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CombineMultipleStreamNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CombineMultipleStreamNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CombineMultipleStreamNode.java Mon Oct 31 20:56:37 2011
@@ -55,7 +55,6 @@ public class CombineMultipleStreamNode e
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public synchronized CombineMultipleStreamNodeGUI getGUI() {
if (this.gui == null) {
this.gui = new CombineMultipleStreamNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicNode.java Mon Oct 31 20:56:37 2011
@@ -58,7 +58,6 @@ public class DynamicNode extends NodeImp
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public synchronized NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new DynamicNodeGUI(this);
@@ -83,7 +82,6 @@ public class DynamicNode extends NodeImp
GraphUtil.validateConnection(edge);
}
- @Override
public DataPort getFreeInPort() {
List<DataPort> inputPorts = this.getInputPorts();
for (DataPort dataPort : inputPorts) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicPort.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicPort.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicPort.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicPort.java Mon Oct 31 20:56:37 2011
@@ -60,7 +60,6 @@ public class DynamicPort extends DataPor
return getComponentPort().getType();
}
- @Override
public void setComponentPort(ComponentPort componentPort) {
super.setComponentPort(componentPort);
this.componentPort = (DynamicComponentPort) componentPort;
@@ -83,7 +82,6 @@ public class DynamicPort extends DataPor
return this.componentPort;
}
- @Override
public void setNode(NodeImpl node) {
super.setNode(node);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CepNodeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CepNodeWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CepNodeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CepNodeWindow.java Mon Oct 31 20:56:37 2011
@@ -171,7 +171,6 @@ public class CepNodeWindow {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
ok();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CombineMultipleStreamNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CombineMultipleStreamNodeGUI.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CombineMultipleStreamNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CombineMultipleStreamNodeGUI.java Mon Oct 31 20:56:37 2011
@@ -45,7 +45,6 @@ public class CombineMultipleStreamNodeGU
this.node = node;
}
- @Override
public void mouseClicked(MouseEvent event, XBayaEngine engine) {
if (event.getClickCount() >= 2) {
showWindow(engine);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CombineMultipleStreamWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CombineMultipleStreamWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CombineMultipleStreamWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CombineMultipleStreamWindow.java Mon Oct 31 20:56:37 2011
@@ -124,7 +124,6 @@ public class CombineMultipleStreamWindow
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
ok();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java Mon Oct 31 20:56:37 2011
@@ -229,7 +229,6 @@ public class DynamicNodeWindow {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java Mon Oct 31 20:56:37 2011
@@ -32,6 +32,7 @@ import java.util.List;
import java.util.UUID;
import javax.swing.AbstractAction;
+import javax.swing.DefaultComboBoxModel;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
@@ -41,14 +42,18 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.xbaya.XBayaConfiguration;
+import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.xbaya.appwrapper.HostDescriptionRegistrationWindow;
import org.apache.airavata.xbaya.graph.system.InputNode;
import org.apache.airavata.xbaya.graph.util.GraphUtil;
import org.apache.airavata.xbaya.graph.ws.WSNode;
import org.apache.airavata.xbaya.graph.ws.gui.WSNodeGUI;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.gui.GridPanel;
+import org.apache.airavata.xbaya.gui.XBayaComboBox;
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
import org.apache.airavata.xbaya.gui.XBayaTextField;
@@ -59,6 +64,7 @@ import org.apache.airavata.xbaya.monitor
import org.apache.airavata.xbaya.ode.ODEClient;
import org.apache.airavata.xbaya.util.XBayaUtil;
import org.apache.airavata.xbaya.wf.Workflow;
+import org.ogce.schemas.gfac.beans.HostBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
@@ -253,7 +259,6 @@ public class DynamicWorkflowRunnerWindow
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
execute();
}
@@ -261,7 +266,6 @@ public class DynamicWorkflowRunnerWindow
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/EdgeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/EdgeGUI.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/EdgeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/EdgeGUI.java Mon Oct 31 20:56:37 2011
@@ -74,7 +74,6 @@ public class EdgeGUI implements GraphPie
* @see org.apache.airavata.xbaya.graph.gui.GraphPieceGUI#mouseClicked(java.awt.event.MouseEvent,
* org.apache.airavata.xbaya.XBayaEngine)
*/
- @Override
public void mouseClicked(MouseEvent event, XBayaEngine engine) {
// Nothing
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java Mon Oct 31 20:56:37 2011
@@ -1108,12 +1108,10 @@ public class GraphCanvas {
this.panel.addMouseMotionListener(new MouseMotionListener() {
- @Override
public void mouseDragged(MouseEvent event) {
GraphCanvas.this.mouseDragged(event);
}
- @Override
public void mouseMoved(MouseEvent event) {
GraphCanvas.this.mouseMoved(event);
}
@@ -1136,7 +1134,6 @@ public class GraphCanvas {
// Set up drag and drop
DropTargetListener dropTargetListener = new DropTargetAdapter() {
- @Override
public void drop(DropTargetDropEvent event) {
GraphCanvas.this.drop(event);
}
@@ -1155,7 +1152,6 @@ public class GraphCanvas {
this.nodePopup = new JPopupMenu();
JMenuItem deleteItem = new JMenuItem("Delete");
deleteItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent event) {
try {
removeSelectedNode();
@@ -1178,7 +1174,6 @@ public class GraphCanvas {
rerunItem = new JMenuItem("ReRun");
rerunItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent event) {
try {
rerunSelectedNode();
@@ -1195,7 +1190,6 @@ public class GraphCanvas {
breakPointItem = new JMenuItem("Add break Point");
breakPointItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent event) {
try {
toggleBreakPointToNode();
@@ -1232,7 +1226,6 @@ public class GraphCanvas {
this.labelNodesItem.add(labelBPEL);
labelBPEL.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
GraphUtil.setLabelsToNodes(GraphCanvas.this.multipleSelectedNodes, "BPEL"
@@ -1256,7 +1249,6 @@ public class GraphCanvas {
this.labelNodesItem.add(customLabelItem);
customLabelItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
String label = JOptionPane.showInputDialog("Enter the label");
if (null == label || "".equals(label)) {
@@ -1323,7 +1315,6 @@ public class GraphCanvas {
deleteItem.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
- @Override
public void actionPerformed(ActionEvent e) {
removeSelectedEdge();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphGUI.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphGUI.java Mon Oct 31 20:56:37 2011
@@ -56,7 +56,6 @@ public class GraphGUI implements GraphPi
* @see org.apache.airavata.xbaya.graph.gui.GraphPieceGUI#mouseClicked(java.awt.event.MouseEvent,
* org.apache.airavata.xbaya.XBayaEngine)
*/
- @Override
public void mouseClicked(MouseEvent event, XBayaEngine engine) {
GraphPiece piece = getGraphPieceAt(event.getPoint());
if (piece != null) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/NodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/NodeGUI.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/NodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/NodeGUI.java Mon Oct 31 20:56:37 2011
@@ -139,7 +139,6 @@ public abstract class NodeGUI implements
* @see org.apache.airavata.xbaya.graph.gui.GraphPieceGUI#mouseClicked(java.awt.event.MouseEvent,
* org.apache.airavata.xbaya.XBayaEngine)
*/
- @Override
public void mouseClicked(MouseEvent event, XBayaEngine engine) {
// Nothing by default
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/PortGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/PortGUI.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/PortGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/PortGUI.java Mon Oct 31 20:56:37 2011
@@ -88,7 +88,6 @@ public class PortGUI implements GraphPie
* @see org.apache.airavata.xbaya.graph.gui.GraphPieceGUI#mouseClicked(java.awt.event.MouseEvent,
* org.apache.airavata.xbaya.XBayaEngine)
*/
- @Override
public void mouseClicked(MouseEvent event, XBayaEngine engine) {
// Nothing
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java Mon Oct 31 20:56:37 2011
@@ -69,7 +69,6 @@ public abstract class EdgeImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Edge#getGUI()
*/
- @Override
public EdgeGUI getGUI() {
if (this.gui == null) {
this.gui = new EdgeGUI(this);
@@ -80,7 +79,6 @@ public abstract class EdgeImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Edge#getFromPort()
*/
- @Override
public PortImpl getFromPort() {
return this.fromPort;
}
@@ -88,7 +86,6 @@ public abstract class EdgeImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Edge#getToPort()
*/
- @Override
public PortImpl getToPort() {
return this.toPort;
}
@@ -164,7 +161,6 @@ public abstract class EdgeImpl implement
*
* @return The label
*/
- @Override
public String getLabel() {
return this.label;
}
@@ -175,7 +171,6 @@ public abstract class EdgeImpl implement
* @param label
* The label to set.
*/
- @Override
public void setLabel(String label) {
this.label = label;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java Mon Oct 31 20:56:37 2011
@@ -99,7 +99,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#getGUI()
*/
- @Override
public GraphGUI getGUI() {
return this.gui;
}
@@ -107,7 +106,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#getID()
*/
- @Override
public String getID() {
if (this.id == null) {
// No other choice but to prompt
@@ -137,7 +135,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#setName(java.lang.String)
*/
- @Override
public void setName(String name) {
this.name = name;
}
@@ -145,7 +142,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#getName()
*/
- @Override
public String getName() {
return this.name;
}
@@ -153,7 +149,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#getDescription()
*/
- @Override
public String getDescription() {
return this.description;
}
@@ -161,7 +156,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#setDescription(java.lang.String)
*/
- @Override
public void setDescription(String description) {
this.description = description;
}
@@ -169,7 +163,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#getNodes()
*/
- @Override
public List<NodeImpl> getNodes() {
return this.nodes;
}
@@ -177,7 +170,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#getPorts()
*/
- @Override
public List<PortImpl> getPorts() {
return this.ports;
}
@@ -185,7 +177,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#getEdges()
*/
- @Override
public List<EdgeImpl> getEdges() {
return this.edges;
}
@@ -193,7 +184,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#removeNode(org.apache.airavata.xbaya.graph.Node)
*/
- @Override
public void removeNode(Node node) throws GraphException {
if (node == null) {
throw new IllegalArgumentException("null");
@@ -290,7 +280,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#getNode(java.lang.String)
*/
- @Override
public NodeImpl getNode(String nodeID) {
for (NodeImpl node : this.nodes) {
if (nodeID.equals(node.getID())) {
@@ -325,7 +314,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#getPort(java.lang.String)
*/
- @Override
public PortImpl getPort(String portID) {
for (PortImpl port : this.ports) {
if (portID.equals(port.getID())) {
@@ -339,7 +327,6 @@ public abstract class GraphImpl implemen
* @see org.apache.airavata.xbaya.graph.Graph#addEdge(org.apache.airavata.xbaya.graph.Port,
* org.apache.airavata.xbaya.graph.Port)
*/
- @Override
public Edge addEdge(Port fromPort, Port toPort) throws GraphException {
if (containsEdge(fromPort, toPort)) {
// The edge already exists. Doesn't create a new one.
@@ -379,7 +366,6 @@ public abstract class GraphImpl implemen
* @throws GraphException
* @see org.apache.airavata.xbaya.graph.Graph#removeEdge(org.apache.airavata.xbaya.graph.Edge)
*/
- @Override
public void removeEdge(Edge edge) throws GraphException {
if (!this.edges.contains(edge)) {
throw new GraphException("The graph doesn't contain the specified edge.");
@@ -407,7 +393,6 @@ public abstract class GraphImpl implemen
* @see org.apache.airavata.xbaya.graph.Graph#removeEdge(org.apache.airavata.xbaya.graph.Port,
* org.apache.airavata.xbaya.graph.Port)
*/
- @Override
public void removeEdge(Port fromPort, Port toPort) throws GraphException {
Collection<? extends Edge> fromEdges = fromPort.getEdges();
for (Edge fromEdge : fromEdges) {
@@ -425,7 +410,6 @@ public abstract class GraphImpl implemen
* @see org.apache.airavata.xbaya.graph.Graph#containsEdge(org.apache.airavata.xbaya.graph.Port,
* org.apache.airavata.xbaya.graph.Port)
*/
- @Override
public boolean containsEdge(Port fromPort, Port toPort) {
for (Edge fromEdge : fromPort.getEdges()) {
Collection<? extends Edge> toEdges = toPort.getEdges();
@@ -440,7 +424,6 @@ public abstract class GraphImpl implemen
* @throws GraphException
* @see org.apache.airavata.xbaya.graph.Graph#importGraph(org.apache.airavata.xbaya.graph.Graph)
*/
- @Override
public void importGraph(Graph graph) throws GraphException {
// Does not support other implementations.
@@ -472,7 +455,6 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#toXML()
*/
- @Override
public XmlElement toXML() {
XmlElement graphElement = XMLUtil.BUILDER.newFragment(GraphSchema.NS, GraphSchema.GRAPH_TAG);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java Mon Oct 31 20:56:37 2011
@@ -135,7 +135,6 @@ public abstract class NodeImpl implement
/**
* @return the ID of the node
*/
- @Override
public String getID() {
return this.id;
}
@@ -162,7 +161,6 @@ public abstract class NodeImpl implement
*
* @return The name
*/
- @Override
public String getName() {
return this.name;
}
@@ -173,7 +171,6 @@ public abstract class NodeImpl implement
* @param name
* The name
*/
- @Override
public void setName(String name) {
this.name = name;
}
@@ -183,7 +180,6 @@ public abstract class NodeImpl implement
*
* @return The component
*/
- @Override
public Component getComponent() {
return this.component;
}
@@ -194,7 +190,6 @@ public abstract class NodeImpl implement
* @param component
* The component to set.
*/
- @Override
public void setComponent(Component component) {
this.component = component;
}
@@ -202,7 +197,6 @@ public abstract class NodeImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Node#getGraph()
*/
- @Override
public Graph getGraph() {
return this.graph;
}
@@ -249,7 +243,6 @@ public abstract class NodeImpl implement
* @param point
* The location
*/
- @Override
public void setPosition(Point point) {
this.position.x = point.x;
this.position.y = point.y;
@@ -258,7 +251,6 @@ public abstract class NodeImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Node#getPosition()
*/
- @Override
public Point getPosition() {
return this.position;
}
@@ -268,7 +260,6 @@ public abstract class NodeImpl implement
*
* @return the List of output ports
*/
- @Override
public List<DataPort> getOutputPorts() {
return this.outputPorts;
}
@@ -278,7 +269,6 @@ public abstract class NodeImpl implement
*
* @return the List of input ports
*/
- @Override
public List<DataPort> getInputPorts() {
return this.inputPorts;
}
@@ -290,7 +280,6 @@ public abstract class NodeImpl implement
* The specified index
* @return the uses port of the specified index
*/
- @Override
public DataPort getOutputPort(int index) {
if (index < 0 || index >= this.outputPorts.size()) {
String message = "index has to be possitive and less than " + this.outputPorts.size();
@@ -306,7 +295,6 @@ public abstract class NodeImpl implement
* The specified index
* @return the input port of the specified index
*/
- @Override
public DataPort getInputPort(int index) {
if (index < 0 || index >= this.inputPorts.size()) {
throw new IllegalArgumentException();
@@ -317,7 +305,6 @@ public abstract class NodeImpl implement
/**
* @return The controlInPort.
*/
- @Override
public ControlPort getControlInPort() {
return this.controlInPort;
}
@@ -325,7 +312,6 @@ public abstract class NodeImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Node#getControlOutPorts()
*/
- @Override
public List<ControlPort> getControlOutPorts() {
return this.controlOutPorts;
}
@@ -333,7 +319,6 @@ public abstract class NodeImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Node#getEPRPort()
*/
- @Override
public PortImpl getEPRPort() {
return this.eprPort;
}
@@ -343,7 +328,6 @@ public abstract class NodeImpl implement
*
* @return All ports that belong to this node.
*/
- @Override
public Collection<PortImpl> getAllPorts() {
ArrayList<PortImpl> ports = new ArrayList<PortImpl>();
ports.addAll(this.inputPorts);
@@ -365,7 +349,6 @@ public abstract class NodeImpl implement
* The specified port
* @return true if this node contains port; false otherwise
*/
- @Override
public boolean containsPort(Port port) {
boolean contain = this.inputPorts.contains(port) || this.outputPorts.contains(port);
return contain;
@@ -620,7 +603,6 @@ public abstract class NodeImpl implement
*
* @return The rate
*/
- @Override
public String getRate() {
if (streamName != null) {
StreamTableModel model = graph.getStreamModel();
@@ -671,12 +653,10 @@ public abstract class NodeImpl implement
this.graph.addPort(port);
}
- @Override
public boolean isBreak() {
return this.breakOnExecution;
}
- @Override
public void setBreak(boolean breakVal) {
this.breakOnExecution = breakVal;
}
@@ -684,7 +664,6 @@ public abstract class NodeImpl implement
/**
*
*/
- @Override
public boolean isAllInPortsConnected() {
for (Iterator<DataPort> iterator = this.inputPorts.iterator(); iterator.hasNext();) {
DataPort port = iterator.next();
@@ -697,7 +676,6 @@ public abstract class NodeImpl implement
}
- @Override
public DataPort getOutputPort(String fromPortID) {
for (DataPort port : this.outputPorts) {
if (port.getID().equals(fromPortID)) {
@@ -707,7 +685,6 @@ public abstract class NodeImpl implement
throw new XBayaRuntimeException("Port with id not found :" + fromPortID);
}
- @Override
public DataPort getInputPort(String id) {
for (DataPort port : this.inputPorts) {
if (port.getID().equals(id)) {
@@ -738,23 +715,18 @@ public abstract class NodeImpl implement
/**
* @return
*/
- @Override
public String getLabel() {
return this.label;
}
- @Override
public void setRequireJoin(boolean join) {
this.requireJoin = join;
}
- @Override
public boolean getRequireJoin() {
return this.requireJoin;
}
-
- @Override
- public boolean isFinished() {
- return this.getGUI().getBodyColor() == MonitorEventHandler.NodeState.FINISHED.color;
- }
+ public boolean isFinished(){
+ return this.getGUI().getBodyColor() == MonitorEventHandler.NodeState.FINISHED.color;
+ }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java Mon Oct 31 20:56:37 2011
@@ -98,7 +98,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getGUI()
*/
- @Override
public PortGUI getGUI() {
if (this.gui == null) {
this.gui = new PortGUI(this);
@@ -109,7 +108,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getID()
*/
- @Override
public String getID() {
if (this.id == null) {
// old format
@@ -121,7 +119,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getName()
*/
- @Override
public String getName() {
return this.name;
}
@@ -129,7 +126,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#setName(java.lang.String)
*/
- @Override
public void setName(String name) {
this.name = name;
}
@@ -137,7 +133,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getNode()
*/
- @Override
public NodeImpl getNode() {
return this.node;
}
@@ -145,7 +140,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getEdges()
*/
- @Override
public List<? extends EdgeImpl> getEdges() {
return this.edges;
}
@@ -153,7 +147,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getEdge(int)
*/
- @Override
public Edge getEdge(int index) {
return this.edges.get(index);
}
@@ -161,7 +154,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getKind()
*/
- @Override
public Kind getKind() {
return this.kind;
}
@@ -169,7 +161,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getFromPorts()
*/
- @Override
public List<Port> getFromPorts() {
List<Port> fromPorts = new ArrayList<Port>();
for (EdgeImpl edge : this.edges) {
@@ -181,7 +172,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getFromPort()
*/
- @Override
public Port getFromPort() {
if (this.edges.size() > 0) {
Edge edge = this.edges.get(0);
@@ -194,7 +184,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getFromNodes()
*/
- @Override
public List<Node> getFromNodes() {
List<Node> fromNodes = new ArrayList<Node>();
for (Port port : getFromPorts()) {
@@ -206,7 +195,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getFromNode()
*/
- @Override
public Node getFromNode() {
Port fromPort = getFromPort();
if (fromPort == null) {
@@ -219,7 +207,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getToPorts()
*/
- @Override
public List<Port> getToPorts() {
List<Port> toPorts = new ArrayList<Port>();
for (Edge edge : this.edges) {
@@ -231,7 +218,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getToNodes()
*/
- @Override
public List<Node> getToNodes() {
List<Node> toNodes = new ArrayList<Node>();
for (Port port : getToPorts()) {
@@ -243,7 +229,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#setComponentPort(org.apache.airavata.xbaya.component.ComponentPort)
*/
- @Override
public void setComponentPort(ComponentPort componentPort) {
this.componentPort = componentPort;
}
@@ -251,7 +236,6 @@ public abstract class PortImpl implement
/**
* @see org.apache.airavata.xbaya.graph.Port#getComponentPort()
*/
- @Override
public ComponentPort getComponentPort() {
if (this.componentPort == null) {
int index;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/interaction/gui/ServiceInteractionWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/interaction/gui/ServiceInteractionWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/interaction/gui/ServiceInteractionWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/interaction/gui/ServiceInteractionWindow.java Mon Oct 31 20:56:37 2011
@@ -83,7 +83,6 @@ public class ServiceInteractionWindow {
/**
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
- @Override
public void actionPerformed(ActionEvent e) {
send();
@@ -93,7 +92,6 @@ public class ServiceInteractionWindow {
JButton cancelButton = new JButton("Done");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java Mon Oct 31 20:56:37 2011
@@ -49,7 +49,6 @@ public class SubWorkflowNode extends Nod
/**
* @see org.apache.airavata.xbaya.graph.ws.WSNode#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new SubWorkflowNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNodeGUI.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNodeGUI.java Mon Oct 31 20:56:37 2011
@@ -66,7 +66,6 @@ public class SubWorkflowNodeGUI extends
}
}
- @Override
protected void setSelectedFlag(boolean flag) {
this.selected = flag;
if (this.selected) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/BlockNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/BlockNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/BlockNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/BlockNode.java Mon Oct 31 20:56:37 2011
@@ -55,7 +55,6 @@ public class BlockNode extends SystemNod
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new BlockNodeGUI(this);