You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/07/30 23:10:23 UTC

svn commit: r1367302 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: interpretor/WorkflowInterpreter.java ui/graph/EdgeGUI.java

Author: samindaw
Date: Mon Jul 30 21:10:22 2012
New Revision: 1367302

URL: http://svn.apache.org/viewvc?rev=1367302&view=rev
Log:
equal check for color and draw update for edges in workflow graph

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/EdgeGUI.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1367302&r1=1367301&r2=1367302&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Mon Jul 30 21:10:22 2012
@@ -523,7 +523,7 @@ public class WorkflowInterpreter {
 		List<NodeImpl> nodes = this.getGraph().getNodes();
 		for (Node node : nodes) {
 			if (node instanceof OutputNode) {
-				if (NodeController.getGUI(node.getInputPort(0).getFromNode()).getBodyColor() == NodeState.FINISHED.color) {
+				if (NodeController.getGUI(node.getInputPort(0).getFromNode()).getBodyColor().equals(NodeState.FINISHED.color)) {
 					outoutNodes.add(node);
 				} else {
 					// The workflow is incomplete so return without sending

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/EdgeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/EdgeGUI.java?rev=1367302&r1=1367301&r2=1367302&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/EdgeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/EdgeGUI.java Mon Jul 30 21:10:22 2012
@@ -34,6 +34,7 @@ import org.apache.airavata.workflow.mode
 import org.apache.airavata.workflow.model.graph.Port;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.utils.DrawUtils;
 
 public class EdgeGUI implements GraphPieceGUI {
 
@@ -98,7 +99,7 @@ public class EdgeGUI implements GraphPie
      * @param g
      */
     protected void paint(Graphics2D g) {
-
+    	DrawUtils.initializeGraphics2D(g);
         Point point1 = getFromPosition();
         Point point2 = getToPosition();