airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1342741 [3/3] - in /incubator/airavata/trunk/modules/xbaya-gui/src: main/java/org/apache/airavata/xbaya/component/registry/ main/java/org/apache/airavata/xbaya/interpretor/ main/java/org/apache/airavata/xbaya/invoker/ main/java/org/apache/...
Date Fri, 25 May 2012 17:23:13 GMT
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java
Fri May 25 17:23:11 2012
@@ -42,9 +42,10 @@ import javax.swing.table.TableColumnMode
 
 import org.apache.airavata.common.utils.BrowserLauncher;
 import org.apache.airavata.common.utils.SwingUtil;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.monitor.Monitor;
 import org.apache.airavata.xbaya.monitor.MonitorEventData;
 import org.apache.airavata.xbaya.monitor.MonitorUtil;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
 import org.apache.airavata.xbaya.ui.dialogs.monitor.MonitorWindow;
 import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler;
 import org.apache.airavata.xbaya.ui.widgets.XBayaComponent;
@@ -57,7 +58,7 @@ public class MonitorPanel implements XBa
      */
     public static final String TITLE = "Monitoring";
 
-    private XBayaEngine engine;
+    private XBayaGUI xbayaGUI;
 
     private MonitorEventData tableSliderModel;
 
@@ -75,8 +76,8 @@ public class MonitorPanel implements XBa
      * 
      * @param engine
      */
-    public MonitorPanel(XBayaEngine engine) {
-        this(engine, null);
+    public MonitorPanel(XBayaGUI xbayaGUI, Monitor monitor) {
+        this(xbayaGUI, null, monitor);
     }
 
     /**
@@ -85,18 +86,18 @@ public class MonitorPanel implements XBa
      * @param engine
      *            The XBayaEngine.
      */
-    public MonitorPanel(XBayaEngine engine, String nodeID) {
-        this.engine = engine;
+    public MonitorPanel(XBayaGUI xbayaGUI, String nodeID, Monitor monitor) {
+        this.xbayaGUI=xbayaGUI;
         if (null == nodeID) {
-            this.tableSliderModel = this.engine.getMonitor().getEventData();
+            this.tableSliderModel = monitor.getEventData();
         } else {
-            this.tableSliderModel = this.engine.getMonitor().getEventData(nodeID);
+            this.tableSliderModel = monitor.getEventData(nodeID);
         }
         init();
         this.tableSliderModel.addTableModelListener(this);
 
         // Also create a handler to change colors of graphs here.
-        MonitorEventHandler eventHandler = new MonitorEventHandler(this.engine);
+        MonitorEventHandler eventHandler = new MonitorEventHandler(this.xbayaGUI);
         this.tableSliderModel.addChangeListener(eventHandler);
     }
 
@@ -198,7 +199,7 @@ public class MonitorPanel implements XBa
                                 try {
                                     BrowserLauncher.openURL(url);
                                 } catch (Exception e) {
-                                    MonitorPanel.this.engine.getGUI().getErrorWindow().error(e.getMessage(),
e);
+                                    MonitorPanel.this.xbayaGUI.getErrorWindow().error(e.getMessage(),
e);
                                 }
                             }
                         } else if (MonitorUtil.getType(message) == MonitorUtil.EventType.SENDING_RESULT)
{
@@ -233,7 +234,7 @@ public class MonitorPanel implements XBa
                     } else if (clickCount >= 2) {
                         // Handle double clicks to pop up a window.
                         if (this.window == null) {
-                            this.window = new MonitorWindow(MonitorPanel.this.engine);
+                            this.window = new MonitorWindow(MonitorPanel.this.xbayaGUI);
                         }
                         this.window.show(message);
                     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
Fri May 25 17:23:11 2012
@@ -23,8 +23,12 @@ package org.apache.airavata.xbaya.interp
 
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.wf.Workflow;
+import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
 import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
+import org.apache.airavata.xbaya.interpretor.WorkflowInterpreterConfiguration;
+import org.apache.airavata.xbaya.ui.dialogs.graph.dynamic.DynamicWorkflowRunnerWindow;
+import org.apache.airavata.xbaya.ui.utils.MyProxyChecker;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.MethodRule;
@@ -53,7 +57,10 @@ public class ComplexMathWorkflowTest {
         logger.info("Running ComplexMathWorkflowTest...");
         URL systemResource = this.getClass().getClassLoader().getSystemResource("ComplexMath.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
-        WorkflowInterpreter interpretor = new WorkflowInterpreter(WorkflowTestUtils.getConfiguration(),
UUID.randomUUID().toString(),
+        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
+        WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(conf.getMessageBoxURL(),
conf.getBrokerURL(), conf.getJcrComponentRegistry().getRegistry(), conf, null,null,null);
+
+        WorkflowInterpreter interpretor = new WorkflowInterpreter(workflowInterpreterConfiguration,
UUID.randomUUID().toString(),
                 workflow, "NA", "NA",true);
         interpretor.scheduleDynamically();
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
Fri May 25 17:23:11 2012
@@ -23,8 +23,10 @@ package org.apache.airavata.xbaya.interp
 
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.wf.Workflow;
+import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
 import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
+import org.apache.airavata.xbaya.interpretor.WorkflowInterpreterConfiguration;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.MethodRule;
@@ -53,7 +55,10 @@ public class CrossProductWorkflowTest {
         logger.info("Running CrossProductWorkflowTest...");
         URL systemResource = this.getClass().getClassLoader().getSystemResource("ForeachCrossProductLevenshteinDistance.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
-        WorkflowInterpreter interpretor = new WorkflowInterpreter(WorkflowTestUtils.getConfiguration(),
UUID.randomUUID().toString(),
+        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
+        WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(conf.getMessageBoxURL(),
conf.getBrokerURL(), conf.getJcrComponentRegistry().getRegistry(), conf, null,null,null);
+
+        WorkflowInterpreter interpretor = new WorkflowInterpreter(workflowInterpreterConfiguration,
UUID.randomUUID().toString(),
                 workflow, "NA", "NA",true);
         interpretor.scheduleDynamically();
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
Fri May 25 17:23:11 2012
@@ -23,8 +23,10 @@ package org.apache.airavata.xbaya.interp
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.graph.system.InputNode;
 import org.apache.airavata.workflow.model.wf.Workflow;
+import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
 import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
+import org.apache.airavata.xbaya.interpretor.WorkflowInterpreterConfiguration;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.MethodRule;
@@ -54,7 +56,10 @@ public class ForEachWorkflowTest {
         URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleEcho.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
-        WorkflowInterpreter interpretor = new WorkflowInterpreter(WorkflowTestUtils.getConfiguration(),
UUID.randomUUID().toString(),
+        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
+        WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(conf.getMessageBoxURL(),
conf.getBrokerURL(), conf.getJcrComponentRegistry().getRegistry(), conf, null,null,null);
+        
+        WorkflowInterpreter interpretor = new WorkflowInterpreter(workflowInterpreterConfiguration,
UUID.randomUUID().toString(),
                 workflow, "NA", "NA",true);
         interpretor.scheduleDynamically();
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
Fri May 25 17:23:11 2012
@@ -23,8 +23,10 @@ package org.apache.airavata.xbaya.interp
 
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.wf.Workflow;
+import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
 import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
+import org.apache.airavata.xbaya.interpretor.WorkflowInterpreterConfiguration;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.MethodRule;
@@ -53,7 +55,9 @@ public class SimpleMathWorkflowTest {
         logger.info("Running SimpleMathWorkflowTest...");
         URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleMath.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
-        WorkflowInterpreter interpretor = new WorkflowInterpreter(WorkflowTestUtils.getConfiguration(),
UUID.randomUUID().toString(),
+        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
+        WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(conf.getMessageBoxURL(),
conf.getBrokerURL(), conf.getJcrComponentRegistry().getRegistry(), conf, null,null,null);
+        WorkflowInterpreter interpretor = new WorkflowInterpreter(workflowInterpreterConfiguration,
UUID.randomUUID().toString(),
                 workflow, "NA", "NA",true);
         interpretor.scheduleDynamically();
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java?rev=1342741&r1=1342740&r2=1342741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
Fri May 25 17:23:11 2012
@@ -24,8 +24,10 @@ package org.apache.airavata.xbaya.interp
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.graph.system.InputNode;
 import org.apache.airavata.workflow.model.wf.Workflow;
+import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
 import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
+import org.apache.airavata.xbaya.interpretor.WorkflowInterpreterConfiguration;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.MethodRule;
@@ -55,7 +57,9 @@ public class WorkflowTest{
         URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleEcho.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
-        WorkflowInterpreter interpretor = new WorkflowInterpreter(WorkflowTestUtils.getConfiguration(),
UUID.randomUUID().toString(),
+        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
+        WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(conf.getMessageBoxURL(),
conf.getBrokerURL(), conf.getJcrComponentRegistry().getRegistry(), conf, null,null,null);
+        WorkflowInterpreter interpretor = new WorkflowInterpreter(workflowInterpreterConfiguration,
UUID.randomUUID().toString(),
                 workflow, "NA", "NA",true);
         interpretor.scheduleDynamically();
     }



Mime
View raw message