airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1205471 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: XBayaEngine.java graph/impl/GraphImpl.java gui/XBayaGUI.java
Date Wed, 23 Nov 2011 16:06:20 GMT
Author: lahiru
Date: Wed Nov 23 16:06:19 2011
New Revision: 1205471

URL: http://svn.apache.org/viewvc?rev=1205471&view=rev
Log:
fixing findbug error.

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java?rev=1205471&r1=1205470&r2=1205471&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
Wed Nov 23 16:06:19 2011
@@ -76,16 +76,14 @@ public class XBayaEngine {
 
     private SystemComponentRegistry componentRegistry;
 
-    private static XBayaEngine engine;
 
     /**
      * Constructs a ApplicationClient.
-     * 
+     *
      * @param configuration
      */
     public XBayaEngine(XBayaConfiguration configuration) {
         this.configuration = configuration;
-        this.engine = this;
 
         // Creates some essential objects.
 
@@ -117,17 +115,8 @@ public class XBayaEngine {
     }
 
     /**
-     * Static get instance method
-     * 
-     * @return
-     */
-    public static XBayaEngine getInstance() {
-        return engine;
-    }
-
-    /**
      * Returns the configuration.
-     * 
+     *
      * @return The configuration
      */
     public XBayaConfiguration getConfiguration() {
@@ -137,7 +126,7 @@ public class XBayaEngine {
     /**
      * Returns the XwfGui. The XwfGui is either XwfAppletGui in case of the applet, or XwfApplicationGui
in case of the
      * application.
-     * 
+     *
      * @return the XwfGui
      */
     public XBayaGUI getGUI() {
@@ -146,7 +135,7 @@ public class XBayaEngine {
 
     /**
      * Returns the Workflow Client.
-     * 
+     *
      * @return the Workflow Client
      */
     public WorkflowClient getWorkflowClient() {
@@ -155,7 +144,7 @@ public class XBayaEngine {
 
     /**
      * Returns the subWorkflowUpdater.
-     * 
+     *
      * @return The subWorkflowUpdater
      */
     public SubWorkflowUpdater getSubWorkflowUpdater() {
@@ -164,7 +153,7 @@ public class XBayaEngine {
 
     /**
      * Sets the workflow.
-     * 
+     *
      * @param workflow
      *            The workflow
      */
@@ -174,7 +163,7 @@ public class XBayaEngine {
 
     /**
      * Return the current workflow.
-     * 
+     *
      * @return The current workflow
      */
     public Workflow getWorkflow() {
@@ -183,7 +172,7 @@ public class XBayaEngine {
 
     /**
      * Returns the ErrorWindow. The ErrorWindow is used to show error messages.
-     * 
+     *
      * @return the ErrorWindow
      */
     public ErrorWindow getErrorWindow() {
@@ -192,7 +181,7 @@ public class XBayaEngine {
 
     /**
      * Returns the monitor.
-     * 
+     *
      * @return The monitor
      */
     public Monitor getMonitor() {
@@ -208,7 +197,7 @@ public class XBayaEngine {
 
     /**
      * Disposes on exit.
-     * 
+     *
      * @throws XBayaException
      */
     public void dispose() throws XBayaException {
@@ -384,7 +373,7 @@ public class XBayaEngine {
      */
     public WorkflowPropertyWindow getWorkflowPropertyWindow() {
         if (this.workflowPropertiesWindow == null) {
-            this.workflowPropertiesWindow = new WorkflowPropertyWindow(this.engine);
+            this.workflowPropertiesWindow = new WorkflowPropertyWindow(this);
         }
         return this.workflowPropertiesWindow;
     }

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=1205471&r1=1205470&r2=1205471&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
Wed Nov 23 16:06:19 2011
@@ -109,12 +109,6 @@ public abstract class GraphImpl implemen
     */
         public String getID() {
              if (this.id == null) {
-                // No other choice but to prompt
-                // the user to pick an id
-                final XBayaEngine engine = XBayaEngine.getInstance();
-    //            JOptionPane.showMessageDialog(engine.getGUI().getFrame(), "Provide a relatively
unique workflow name",
-    //                    "Workflow Name", JOptionPane.OK_OPTION);
-                engine.getWorkflowPropertyWindow().show();
                  this.id = this.name;
                  // If its still null
                  if (null == this.id) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java?rev=1205471&r1=1205470&r2=1205471&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java
Wed Nov 23 16:06:19 2011
@@ -343,7 +343,7 @@ public class XBayaGUI implements EventLi
 			}
         });
         if (withID){
-        	newGraphCanvas.getWorkflow().getGraph().getID();
+        	engine.getWorkflowPropertyWindow().show();
         }
         return newGraphCanvas;
     }



Mime
View raw message