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/02/14 16:14:01 UTC
svn commit: r1243985 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
graph/dynamic/gui/DynamicWorkflowRunnerWindow.java gui/GridPanel.java
menues/run/RunMenuItem.java
Author: samindaw
Date: Tue Feb 14 15:14:01 2012
New Revision: 1243985
URL: http://svn.apache.org/viewvc?rev=1243985&view=rev
Log:
adding cross product for for each + repeating parameter issue fixed
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/GridPanel.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java
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=1243985&r1=1243984&r2=1243985&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 Tue Feb 14 15:14:01 2012
@@ -78,6 +78,8 @@ public class DynamicWorkflowRunnerWindow
private JCheckBox interactChkBox;
+ private JCheckBox chkRunWithCrossProduct;
+
protected final static XmlInfosetBuilder builder = XmlConstants.BUILDER;
/**
@@ -178,7 +180,7 @@ public class DynamicWorkflowRunnerWindow
public void hide() {
this.dialog.hide();
- this.parameterPanel.getContentPanel().removeAll();
+ this.parameterPanel.resetPanel();
this.parameterTextFields.clear();
}
@@ -220,6 +222,9 @@ public class DynamicWorkflowRunnerWindow
this.interactChkBox.setSelected(false);
XBayaLabel interactLabel = new XBayaLabel("Enable Service Interactions", this.interactChkBox);
+ chkRunWithCrossProduct=new JCheckBox();
+ XBayaLabel crossProductLabel = new XBayaLabel("Execute in cross product", chkRunWithCrossProduct);
+
GridPanel infoPanel = new GridPanel();
// infoPanel.add(this.resourceSelectionLabel);
// infoPanel.add(this.resourceSelectionComboBox);
@@ -233,8 +238,10 @@ public class DynamicWorkflowRunnerWindow
infoPanel.add(this.gfacUrlListField);
infoPanel.add(interactLabel);
infoPanel.add(this.interactChkBox);
-
- // infoPanel.layout(5, 2, GridPanel.WEIGHT_NONE, 1);
+ infoPanel.add(crossProductLabel);
+ infoPanel.add(chkRunWithCrossProduct);
+
+ infoPanel.layout(4, 2, GridPanel.WEIGHT_NONE, 1);
GridPanel mainPanel = new GridPanel();
mainPanel.add(this.parameterPanel);
@@ -296,6 +303,7 @@ public class DynamicWorkflowRunnerWindow
}
}
+ final boolean isRunCrossProduct=chkRunWithCrossProduct.isSelected();
// TODO error check for user inputs
final List<InputNode> inputNodes = GraphUtil.getInputNodes(this.workflow.getGraph());
@@ -364,6 +372,7 @@ public class DynamicWorkflowRunnerWindow
WorkflowInterpreter workflowInterpreter = new WorkflowInterpreter(
DynamicWorkflowRunnerWindow.this.engine, topicString);
+ workflowInterpreter.setRunWithCrossProduct(isRunCrossProduct);
try {
MonitorConfiguration notifConfig = DynamicWorkflowRunnerWindow.this.engine.getMonitor()
.getConfiguration();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/GridPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/GridPanel.java?rev=1243985&r1=1243984&r2=1243985&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/GridPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/GridPanel.java Tue Feb 14 15:14:01 2012
@@ -44,6 +44,8 @@ public class GridPanel implements XBayaC
private JPanel contentPanel;
private JComponent rootComponent;
+
+ private boolean scroll=false;
/**
* Constructs a GridPanel.
@@ -154,5 +156,10 @@ public class GridPanel implements XBayaC
} else {
this.rootComponent = this.contentPanel;
}
+ this.scroll=scroll;
+ }
+
+ public void resetPanel(){
+ init(scroll);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java?rev=1243985&r1=1243984&r2=1243985&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java Tue Feb 14 15:14:01 2012
@@ -321,8 +321,9 @@ public class RunMenuItem implements Eve
throw new XBayaRuntimeException("Error stopping previous workflow Execution");
}
}
- this.window = new DynamicWorkflowRunnerWindow(engine);
+
}
+ this.window = new DynamicWorkflowRunnerWindow(engine);
this.window.show();
}
};