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 [10/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/or...
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java Mon Oct 31 20:56:37 2011
@@ -37,6 +37,7 @@ import javax.swing.JButton;
import javax.swing.JPanel;
import org.apache.airavata.xbaya.XBayaConfiguration;
+import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
@@ -109,7 +110,6 @@ public class PegasusInvokerWindow {
this.invokeButton = new JButton("Invoke");
this.invokeButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
execute();
}
@@ -117,7 +117,6 @@ public class PegasusInvokerWindow {
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/pegasus/gui/PegasusMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusMenu.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusMenu.java Mon Oct 31 20:56:37 2011
@@ -21,6 +21,15 @@
package org.apache.airavata.xbaya.pegasus.gui;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+import org.apache.airavata.xbaya.XBayaEngine;
+
public class PegasusMenu {
// private JMenu pegasusMenu;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java Mon Oct 31 20:56:37 2011
@@ -17,80 +17,81 @@
* specific language governing permissions and limitations
* under the License.
*
- */
+*/
package org.apache.airavata.xbaya.provenance;
-import java.io.File;
-import java.io.FileFilter;
-
import org.apache.airavata.common.utils.Pair;
import org.apache.airavata.common.utils.XMLUtil;
import org.xmlpull.infoset.XmlElement;
+import java.io.File;
+import java.io.FileFilter;
+
public class ProvenanceReader {
public String DEFAULT_LIBRARY_FOLDER_NAME = "provenance";
- public ProvenanceReader() {
+ public ProvenanceReader() {
- }
+ }
- public Object read(final String nodeName, Pair<String, String>[] inputs) throws Exception {
+ public Object read(final String nodeName, Pair<String, String>[] inputs)
+ throws Exception {
- File directory = new File(DEFAULT_LIBRARY_FOLDER_NAME);
- if (!directory.isDirectory()) {
- return null;
- }
- File[] componentMatchFiles = directory.listFiles(new FileFilter() {
-
- @Override
- public boolean accept(File pathname) {
- if (pathname.isDirectory()) {
- return false;
- } else {
- String fileName = pathname.getName();
- return -1 != fileName.indexOf(nodeName);
- }
- }
- });
-
- for (File file : componentMatchFiles) {
- if (!file.isDirectory()) {
- XmlElement xml = XMLUtil.loadXML(file);
- XmlElement root = xml;
- XmlElement wsnode;
-
- XmlElement foreach;
- if (null != (wsnode = root.element("wsnode"))) {
- XmlElement inputElems = root.element("inputs");
- Iterable inputValElems = inputElems.children();
- for (Object object : inputValElems) {
- if (object instanceof XmlElement) {
- XmlElement inputElem = (XmlElement) object;
- for (Pair<String, String> pair : inputs) {
- String inputName = pair.getLeft();
- // issue "x".equals("CreateCoordinatePortType_createCoordinate_in_0")
- if (inputName.equals(inputElem.getName())) {
- // found the input now check whether values are the same
- if (XMLUtil.isEqual(inputElem, XMLUtil.stringToXmlElement(pair.getRight()))) {
- // match found return output
- XmlElement output = root.element("output");
- return output.children().iterator().next();
-
- }
- }
-
- }
- }
- }
-
- } else if (null != (foreach = root.element("foreach"))) {
+ File directory = new File(DEFAULT_LIBRARY_FOLDER_NAME);
+ if (!directory.isDirectory()) {
+ return null;
+ }
+ File[] componentMatchFiles = directory.listFiles(new FileFilter() {
+
+ @Override
+ public boolean accept(File pathname) {
+ if (pathname.isDirectory()) {
+ return false;
+ } else {
+ String fileName = pathname.getName();
+ return -1 != fileName.indexOf(nodeName);
+ }
+ }
+ });
+
+ for (File file : componentMatchFiles) {
+ if (!file.isDirectory()) {
+ XmlElement xml = XMLUtil.loadXML(file);
+ XmlElement root = xml;
+ XmlElement wsnode;
+
+ XmlElement foreach;
+ if (null != (wsnode = root.element("wsnode"))) {
+ XmlElement inputElems = root.element("inputs");
+ Iterable inputValElems = inputElems.children();
+ for (Object object : inputValElems) {
+ if (object instanceof XmlElement) {
+ XmlElement inputElem = (XmlElement)object;
+ for (Pair<String, String> pair : inputs) {
+ String inputName = pair.getLeft();
+ //issue "x".equals("CreateCoordinatePortType_createCoordinate_in_0")
+ if(inputName.equals(inputElem.getName())){
+ //found the input now check whether values are the same
+ if(XMLUtil.isEqual(inputElem, XMLUtil.stringToXmlElement(pair.getRight()))){
+ //match found return output
+ XmlElement output = root.element("output");
+ return output.children().iterator().next();
+
+ }
+ }
+
+ }
+ }
+ }
+
+ } else if (null != (foreach = root.element("foreach"))) {
- }
+ }
- }
- }
+ }
+ }
- return null;
- }
+ return null;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.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.provenance;
import java.util.LinkedList;
@@ -47,151 +47,160 @@ import xsul5.XmlConstants;
*/
public final class ProvenanceWrite implements PredicatedExecutable {
- private static final String PROVENANCE_DIR = "provenance";
+ private static final String PROVENANCE_DIR = "provenance";
- private Node node;
+ private Node node;
- private String workflowName;
+ private String workflowName;
- private Map<Node, Invoker> invokerMap;
+ private Map<Node, Invoker> invokerMap;
private String experimentId;
private Registry registry;
- public ProvenanceWrite(Node node, String workflowName, Map<Node, Invoker> invokerMap, String experimentId,
- Registry registry) {
- this.node = node;
- this.workflowName = workflowName;
- this.invokerMap = invokerMap;
+ public ProvenanceWrite(Node node, String workflowName,
+ Map<Node, Invoker> invokerMap, String experimentId,Registry registry) {
+ this.node = node;
+ this.workflowName = workflowName;
+ this.invokerMap = invokerMap;
this.experimentId = experimentId;
this.registry = registry;
- }
+ }
- @Override
- public void run() {
+ public void run() {
- try {
- saveNodeOutputs(node, invokerMap, workflowName);
- } catch (XBayaException e) {
- // do nothing its a failure but go on
- e.printStackTrace();
- }
-
- }
-
- @Override
- public boolean isReady() {
- return this.node.isFinished() && invokerMap.get(node) != null;
- }
-
- private void saveNodeOutputs(Node node, Map<Node, Invoker> invokerMap, String workflowName) throws XBayaException {
-
- if (null != node && !(node instanceof InputNode)) {
- XmlElement elem = XmlConstants.BUILDER.newFragment("previousdat");
- XmlElement inputs = null;
- if (node instanceof WSNode) {
- String nodeID = node.getComponent().getName();
- XmlElement nodeElement = elem.newElement("wsnode");
- elem.addChild(nodeElement);
- nodeElement.addChild(nodeID);
- inputs = elem.newElement("inputs");
- elem.addChild(inputs);
-
- List<DataPort> portsToBeSaved = node.getInputPorts();
- for (DataPort savePort : portsToBeSaved) {
-
- String portID = savePort.getName();
- XmlElement portElem = inputs.newElement(portID);
- inputs.addChild(portElem);
- Object portInput = XBayaUtil.findInputFromPort(savePort, invokerMap);
- if (portInput instanceof org.xmlpull.v1.builder.XmlElement) {
- portInput = XMLUtil.xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) portInput);
- }
- portElem.addChild(portInput);
-
- }
-
- } else if (node instanceof EndForEachNode) {
- // here we save the inputs for the entire foreach block
- Node middleNode = node.getInputPort(0).getFromNode();
- String nodeID = middleNode.getComponent().getName();
- XmlElement nodeElement = elem.newElement("foreach");
- elem.addChild(nodeElement);
- nodeElement.addChild(nodeID);
- inputs = elem.newElement("inputs");
- elem.addChild(inputs);
- XmlConstants.BUILDER.serializeToString(elem);
- if (middleNode instanceof ForEachExecutableNode) {
- List<DataPort> portsToBeSaved = middleNode.getInputPorts();
- for (DataPort savePort : portsToBeSaved) {
- // we will save all the inputs
- // these are static inputs and
- // input to the foreach node
-
- if (savePort.getFromNode() instanceof ForEachNode) {
- // this is the foreach node rest are simple
- // inputs
- Object value = XBayaUtil.getInputsForForEachNode((ForEachNode) savePort.getFromNode(),
- new LinkedList<String>(), invokerMap);
- if (value instanceof org.xmlpull.v1.builder.XmlElement) {
- value = XMLUtil.xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) value);
- }
-
- XmlElement portElement = inputs.newElement(savePort.getName());
- inputs.addChild(portElement);
- portElement.addChild(value);
- } else {
- String portID = savePort.getName();
- XmlElement portElem = inputs.newElement(portID);
- inputs.addChild(portElem);
- Object portInput = XBayaUtil.findInputFromPort(savePort, invokerMap);
- if (portInput instanceof org.xmlpull.v1.builder.XmlElement) {
- portInput = XMLUtil
- .xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) portInput);
- }
-
- portElem.addChild(portInput);
- }
-
- }
-
- } else {
- // error but we will let it pass because it will be
- // caught at higher level
- }
-
- }
- if (inputs != null) {
- this.registry.saveWorkflowInput(new WorkflowIOData(
- xsul5.XmlConstants.BUILDER.serializeToString(inputs), experimentId, node.getID(),
- this.workflowName));
- // deal with the outputs
- }
- XmlElement outputs = elem.newElement("outputs");
- elem.addChild(outputs);
-
- List<DataPort> outputPorts = node.getOutputPorts();
- for (DataPort outputPort : outputPorts) {
- String outputName = outputPort.getName();
-
- XmlElement outputParamElement = outputs.newElement(outputName);
- outputs.addChild(outputParamElement);
- Object ouputParamValue = invokerMap.get(node).getOutput(outputName);
-
- if (ouputParamValue instanceof org.xmlpull.v1.builder.XmlElement) {
- ouputParamValue = XMLUtil
- .xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) ouputParamValue);
- }
-
- if (ouputParamValue != null) {
- outputParamElement.addChild(ouputParamValue);
- } else {
- outputParamElement.addChild("null");
- }
- }
- this.registry.saveWorkflowOutput(new WorkflowIOData(xsul5.XmlConstants.BUILDER.serializeToString(outputs),
- experimentId, node.getID(), this.workflowName));
- }
- }
+ try {
+ saveNodeOutputs(node, invokerMap, workflowName);
+ } catch (XBayaException e) {
+ // do nothing its a failure but go on
+ e.printStackTrace();
+ }
+
+ }
+
+ public boolean isReady() {
+ return this.node.isFinished() && invokerMap.get(node) != null;
+ }
+
+ private void saveNodeOutputs(Node node,
+ Map<Node, Invoker> invokerMap, String workflowName)
+ throws XBayaException {
+
+ if (null != node && !(node instanceof InputNode)) {
+ XmlElement elem = XmlConstants.BUILDER.newFragment("previousdat");
+ XmlElement inputs = null;
+ if (node instanceof WSNode) {
+ String nodeID = node.getComponent().getName();
+ XmlElement nodeElement = elem.newElement("wsnode");
+ elem.addChild(nodeElement);
+ nodeElement.addChild(nodeID);
+ inputs = elem.newElement("inputs");
+ elem.addChild(inputs);
+
+ List<DataPort> portsToBeSaved = node.getInputPorts();
+ for (DataPort savePort : portsToBeSaved) {
+
+ String portID = savePort.getName();
+ XmlElement portElem = inputs.newElement(portID);
+ inputs.addChild(portElem);
+ Object portInput = XBayaUtil.findInputFromPort(
+ savePort, invokerMap);
+ if (portInput instanceof org.xmlpull.v1.builder.XmlElement) {
+ portInput = XMLUtil
+ .xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) portInput);
+ }
+ portElem.addChild(portInput);
+
+ }
+
+ } else if (node instanceof EndForEachNode) {
+ // here we save the inputs for the entire foreach block
+ Node middleNode = node.getInputPort(0).getFromNode();
+ String nodeID = middleNode.getComponent().getName();
+ XmlElement nodeElement = elem.newElement("foreach");
+ elem.addChild(nodeElement);
+ nodeElement.addChild(nodeID);
+ inputs = elem.newElement("inputs");
+ elem.addChild(inputs);
+ XmlConstants.BUILDER.serializeToString(elem);
+ if (middleNode instanceof ForEachExecutableNode) {
+ List<DataPort> portsToBeSaved = middleNode.getInputPorts();
+ for (DataPort savePort : portsToBeSaved) {
+ // we will save all the inputs
+ // these are static inputs and
+ // input to the foreach node
+
+ if (savePort.getFromNode() instanceof ForEachNode) {
+ // this is the foreach node rest are simple
+ // inputs
+ Object value = XBayaUtil
+ .getInputsForForEachNode(
+ (ForEachNode) savePort
+ .getFromNode(),
+ new LinkedList<String>(),
+ invokerMap);
+ if (value instanceof org.xmlpull.v1.builder.XmlElement) {
+ value = XMLUtil
+ .xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) value);
+ }
+
+ XmlElement portElement = inputs.newElement(savePort
+ .getName());
+ inputs.addChild(portElement);
+ portElement.addChild(value);
+ } else {
+ String portID = savePort.getName();
+ XmlElement portElem = inputs.newElement(portID);
+ inputs.addChild(portElem);
+ Object portInput = XBayaUtil
+ .findInputFromPort(savePort, invokerMap);
+ if (portInput instanceof org.xmlpull.v1.builder.XmlElement) {
+ portInput = XMLUtil
+ .xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) portInput);
+ }
+
+ portElem.addChild(portInput);
+ }
+
+ }
+
+ } else {
+ // error but we will let it pass because it will be
+ // caught at higher level
+ }
+
+ }
+ if (inputs!=null) {
+ this.registry.saveWorkflowInput(new WorkflowIOData(
+ xsul5.XmlConstants.BUILDER.serializeToString(inputs),
+ experimentId, node.getID(), this.workflowName));
+ // deal with the outputs
+ }
+ XmlElement outputs = elem.newElement("outputs");
+ elem.addChild(outputs);
+
+ List<DataPort> outputPorts = node.getOutputPorts();
+ for (DataPort outputPort : outputPorts) {
+ String outputName = outputPort.getName();
+
+ XmlElement outputParamElement = outputs.newElement(outputName);
+ outputs.addChild(outputParamElement);
+ Object ouputParamValue = invokerMap.get(node).getOutput(
+ outputName);
+
+ if (ouputParamValue instanceof org.xmlpull.v1.builder.XmlElement) {
+ ouputParamValue = XMLUtil
+ .xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) ouputParamValue);
+ }
+
+ if (ouputParamValue != null) {
+ outputParamElement.addChild(ouputParamValue);
+ } else {
+ outputParamElement.addChild("null");
+ }
+ }
+ this.registry.saveWorkflowOutput(new WorkflowIOData(xsul5.XmlConstants.BUILDER.serializeToString(outputs), experimentId, node.getID(),this.workflowName));
+ }
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java Mon Oct 31 20:56:37 2011
@@ -29,7 +29,6 @@ import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.xml.namespace.QName;
-import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.xbaya.XBayaConfiguration;
@@ -40,6 +39,7 @@ import org.apache.airavata.xbaya.compone
import org.apache.airavata.xbaya.experiment.gui.RegistryWorkflowPublisherWindow;
import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.jython.script.JythonScript;
+import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.xbaya.util.XBayaUtil;
import org.apache.airavata.xbaya.wf.Workflow;
import org.ietf.jgss.GSSCredential;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserDialog.java Mon Oct 31 20:56:37 2011
@@ -29,7 +29,6 @@ import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JPanel;
-import javax.swing.WindowConstants;
import org.apache.airavata.xbaya.XBayaEngine;
@@ -48,7 +47,7 @@ public class JCRBrowserDialog extends JD
public static void main(String[] args) {
try {
JCRBrowserDialog dialog = new JCRBrowserDialog(null);
- dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.setVisible(true);
} catch (Exception e) {
e.printStackTrace();
@@ -87,7 +86,6 @@ public class JCRBrowserDialog extends JD
{
JButton okButton = new JButton("Close");
okButton.addActionListener(new ActionListener() {
- @Override
public void actionPerformed(ActionEvent e) {
close();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java Mon Oct 31 20:56:37 2011
@@ -82,7 +82,7 @@ public class JCRBrowserPanel extends JPa
this.add(scrollPane, BorderLayout.CENTER);
{
tree = new JTree(AiravataTreeNodeFactory.getTreeNode(getJCRRegistry() == null ? "No registry specified"
- : getEngine(), null));
+ : getJCRRegistry(), null));
tree.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
@@ -101,7 +101,6 @@ public class JCRBrowserPanel extends JPa
AbstractBrowserActionItem actionRefresh = new RefreshAction();
actionRefresh.getMenuItem().setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0));
actionRefresh.addActionListener(new ActionListener() {
- @Override
public void actionPerformed(ActionEvent e) {
triggerNodeAction(RefreshAction.ID);
}
@@ -109,14 +108,12 @@ public class JCRBrowserPanel extends JPa
actionDelete = new DeleteAction();
actionDelete.addActionListener(new ActionListener() {
- @Override
public void actionPerformed(ActionEvent arg0) {
triggerNodeAction(DeleteAction.ID);
}
});
AddAction actionAdd = new AddAction();
actionAdd.addActionListener(new ActionListener() {
- @Override
public void actionPerformed(ActionEvent arg0) {
triggerNodeAction(AddAction.ID);
}
@@ -124,7 +121,6 @@ public class JCRBrowserPanel extends JPa
EditAction actionEdit = new EditAction();
actionEdit.addActionListener(new ActionListener() {
- @Override
public void actionPerformed(ActionEvent arg0) {
triggerNodeAction(EditAction.ID);
}
@@ -135,9 +131,9 @@ public class JCRBrowserPanel extends JPa
browserActions.add(actionDelete);
browserActions.add(actionEdit);
- // popupMenu.add(actionAdd.getMenuItem());
- // popupMenu.add(actionDelete.getMenuItem());
- // popupMenu.add(actionRefresh.getMenuItem());
+// popupMenu.add(actionAdd.getMenuItem());
+// popupMenu.add(actionDelete.getMenuItem());
+// popupMenu.add(actionRefresh.getMenuItem());
}
}
}
@@ -191,14 +187,12 @@ public class JCRBrowserPanel extends JPa
private void addPopup(Component component, final JPopupMenu popup) {
component.addMouseListener(new MouseAdapter() {
- @Override
public void mousePressed(MouseEvent e) {
if (e.isPopupTrigger()) {
showMenu(e);
}
}
- @Override
public void mouseReleased(MouseEvent e) {
if (e.isPopupTrigger()) {
showMenu(e);
@@ -224,10 +218,10 @@ public class JCRBrowserPanel extends JPa
}
}
}
-
- if (popup.getSubElements().length > 0) {
- popup.show(e.getComponent(), e.getX(), e.getY());
- }
+
+ if (popup.getSubElements().length>0) {
+ popup.show(e.getComponent(), e.getX(), e.getY());
+ }
}
}
});
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptionWrap.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptionWrap.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptionWrap.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptionWrap.java Mon Oct 31 20:56:37 2011
@@ -53,7 +53,7 @@ public class ApplicationDeploymentDescri
return service;
}
- public ServiceDescription getServiceDescription() throws RegistryException {
+ public ServiceDescription getServiceDescription() throws RegistryException{
return getRegistry().getServiceDescription(getService());
}
@@ -65,7 +65,7 @@ public class ApplicationDeploymentDescri
return host;
}
- public HostDescription getHostDescription() throws RegistryException {
+ public HostDescription getHostDescription() throws RegistryException{
return getRegistry().getHostDescription(getHost());
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/HostDescriptions.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/HostDescriptions.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/HostDescriptions.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/HostDescriptions.java Mon Oct 31 20:56:37 2011
@@ -42,7 +42,7 @@ public class HostDescriptions {
this.registry = registry;
}
- public List<HostDescription> getDescriptions() throws RegistryException {
+ public List<HostDescription> getDescriptions() throws RegistryException{
return getRegistry().searchHostDescription(".*");
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/InputParameters.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/InputParameters.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/InputParameters.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/InputParameters.java Mon Oct 31 20:56:37 2011
@@ -25,12 +25,12 @@ import org.apache.airavata.schemas.gfac.
public class InputParameters extends ServiceParameters {
- public InputParameters(ServiceParameter[] parameters) {
- super(parameters);
- }
-
- public InputParameters(Parameter[] parameters) {
- super(parameters);
- }
+ public InputParameters(ServiceParameter[] parameters) {
+ super(parameters);
+ }
+
+ public InputParameters(Parameter[] parameters) {
+ super(parameters);
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/OutputParameters.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/OutputParameters.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/OutputParameters.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/OutputParameters.java Mon Oct 31 20:56:37 2011
@@ -25,12 +25,12 @@ import org.apache.airavata.schemas.gfac.
public class OutputParameters extends ServiceParameters {
- public OutputParameters(ServiceParameter[] parameters) {
- super(parameters);
- }
-
- public OutputParameters(Parameter[] parameters) {
- super(parameters);
- }
+ public OutputParameters(ServiceParameter[] parameters) {
+ super(parameters);
+ }
+
+ public OutputParameters(Parameter[] parameters) {
+ super(parameters);
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java Mon Oct 31 20:56:37 2011
@@ -23,40 +23,38 @@ package org.apache.airavata.xbaya.regist
import org.apache.airavata.schemas.gfac.Parameter;
-public class ServiceParameter {
- private Parameter parameter;
- private Object value;
-
- public ServiceParameter(Parameter parameter) {
- this(parameter, null);
- }
-
- public ServiceParameter(Parameter parameter, Object value) {
- setParameter(parameter);
- setValue(value);
- }
-
- public Parameter getParameter() {
- return parameter;
- }
-
- public void setParameter(Parameter parameter) {
- this.parameter = parameter;
- }
- public Object getValue() {
- return value;
- }
-
- public void setValue(Object value) {
- this.value = value;
- }
-
- public String getName() {
- return getParameter().getParameterName();
- }
-
- public String getDescription() {
- return getParameter().getParameterDescription();
- }
+public class ServiceParameter {
+ private Parameter parameter;
+ private Object value;
+
+ public ServiceParameter(Parameter parameter) {
+ this(parameter,null);
+ }
+
+ public ServiceParameter(Parameter parameter, Object value) {
+ setParameter(parameter);
+ setValue(value);
+ }
+ public Parameter getParameter() {
+ return parameter;
+ }
+ public void setParameter(Parameter parameter) {
+ this.parameter = parameter;
+ }
+ public Object getValue() {
+ return value;
+ }
+ public void setValue(Object value) {
+ this.value = value;
+ }
+
+ public String getName(){
+ return getParameter().getParameterName();
+ }
+
+ public String getDescription(){
+ return getParameter().getParameterDescription();
+ }
}
+
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java Mon Oct 31 20:56:37 2011
@@ -28,32 +28,30 @@ import java.util.List;
import org.apache.airavata.schemas.gfac.Parameter;
public class ServiceParameters {
- private List<ServiceParameter> parameters;
-
- public ServiceParameters(Parameter[] parameters) {
- if (parameters != null) {
- List<ServiceParameter> serviceParaList = new ArrayList<ServiceParameter>();
- for (Parameter parameter : parameters) {
- serviceParaList.add(new ServiceParameter(parameter));
- }
- setParameters(serviceParaList);
- }
- }
-
- public ServiceParameters(ServiceParameter[] parameters) {
- if (parameters != null) {
- setParameters(Arrays.asList(parameters));
- }
- }
-
- public List<ServiceParameter> getParameters() {
- if (parameters == null) {
- parameters = new ArrayList<ServiceParameter>();
- }
- return parameters;
- }
-
- public void setParameters(List<ServiceParameter> parameters) {
- this.parameters = parameters;
- }
+ private List<ServiceParameter> parameters;
+
+ public ServiceParameters(Parameter[] parameters) {
+ if (parameters!=null) {
+ List<ServiceParameter> serviceParaList = new ArrayList<ServiceParameter>();
+ for (Parameter parameter : parameters) {
+ serviceParaList.add(new ServiceParameter(parameter));
+ }
+ setParameters(serviceParaList);
+ }
+ }
+
+ public ServiceParameters(ServiceParameter[] parameters) {
+ if (parameters!=null) {
+ setParameters(Arrays.asList(parameters));
+ }
+ }
+ public List<ServiceParameter> getParameters() {
+ if (parameters==null){
+ parameters=new ArrayList<ServiceParameter>();
+ }
+ return parameters;
+ }
+ public void setParameters(List<ServiceParameter> parameters) {
+ this.parameters = parameters;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflow.java Mon Oct 31 20:56:37 2011
@@ -25,44 +25,44 @@ import java.util.ArrayList;
import java.util.List;
public class XBayaWorkflow {
- private List<XBayaWorkflowService> workflowServices;
- private String workflowId;
- private String workflowName;
-
- public XBayaWorkflow(String workflowId, String workflowName, List<XBayaWorkflowService> workflowServices) {
- setWorkflowId(workflowId);
- setWorkflowName(workflowName);
- setWorkflowServices(workflowServices);
- }
-
- public List<XBayaWorkflowService> getWorkflowServices() {
- if (workflowServices == null) {
- workflowServices = new ArrayList<XBayaWorkflowService>();
- }
- return workflowServices;
- }
-
- public void setWorkflowServices(List<XBayaWorkflowService> workflowServices) {
- this.workflowServices = workflowServices;
- }
-
- public void add(XBayaWorkflowService workflowService) {
- getWorkflowServices().add(workflowService);
- }
-
- public String getWorkflowName() {
- return workflowName;
- }
-
- public void setWorkflowName(String workflowName) {
- this.workflowName = workflowName;
- }
-
- public String getWorkflowId() {
- return workflowId;
- }
-
- public void setWorkflowId(String workflowId) {
- this.workflowId = workflowId;
- }
+ private List<XBayaWorkflowService> workflowServices;
+ private String workflowId;
+ private String workflowName;
+
+ public XBayaWorkflow(String workflowId, String workflowName, List<XBayaWorkflowService> workflowServices) {
+ setWorkflowId(workflowId);
+ setWorkflowName(workflowName);
+ setWorkflowServices(workflowServices);
+ }
+
+ public List<XBayaWorkflowService> getWorkflowServices() {
+ if (workflowServices==null){
+ workflowServices=new ArrayList<XBayaWorkflowService>();
+ }
+ return workflowServices;
+ }
+
+ public void setWorkflowServices(List<XBayaWorkflowService> workflowServices) {
+ this.workflowServices = workflowServices;
+ }
+
+ public void add(XBayaWorkflowService workflowService){
+ getWorkflowServices().add(workflowService);
+ }
+
+ public String getWorkflowName() {
+ return workflowName;
+ }
+
+ public void setWorkflowName(String workflowName) {
+ this.workflowName = workflowName;
+ }
+
+ public String getWorkflowId() {
+ return workflowId;
+ }
+
+ public void setWorkflowId(String workflowId) {
+ this.workflowId = workflowId;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiment.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiment.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiment.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiment.java Mon Oct 31 20:56:37 2011
@@ -25,34 +25,34 @@ import java.util.ArrayList;
import java.util.List;
public class XBayaWorkflowExperiment {
- private List<XBayaWorkflow> workflows;
- private String experimentId;
-
- public XBayaWorkflowExperiment(String experimentId, List<XBayaWorkflow> workflows) {
- setWorkflows(workflows);
- setExperimentId(experimentId);
- }
-
- public List<XBayaWorkflow> getWorkflows() {
- if (workflows == null) {
- workflows = new ArrayList<XBayaWorkflow>();
- }
- return workflows;
- }
-
- public void setWorkflows(List<XBayaWorkflow> workflows) {
- this.workflows = workflows;
- }
-
- public void add(XBayaWorkflow workflow) {
- getWorkflows().add(workflow);
- }
-
- public String getExperimentId() {
- return experimentId;
- }
-
- public void setExperimentId(String experimentId) {
- this.experimentId = experimentId;
- }
+ private List<XBayaWorkflow> workflows;
+ private String experimentId;
+
+ public XBayaWorkflowExperiment(String experimentId, List<XBayaWorkflow> workflows) {
+ setWorkflows(workflows);
+ setExperimentId(experimentId);
+ }
+
+ public List<XBayaWorkflow> getWorkflows() {
+ if (workflows==null){
+ workflows=new ArrayList<XBayaWorkflow>();
+ }
+ return workflows;
+ }
+
+ public void setWorkflows(List<XBayaWorkflow> workflows) {
+ this.workflows = workflows;
+ }
+
+ public void add(XBayaWorkflow workflow){
+ getWorkflows().add(workflow);
+ }
+
+ public String getExperimentId() {
+ return experimentId;
+ }
+
+ public void setExperimentId(String experimentId) {
+ this.experimentId = experimentId;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java Mon Oct 31 20:56:37 2011
@@ -40,90 +40,88 @@ import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
public class XBayaWorkflowExperiments {
- private Registry registry;
-
- public XBayaWorkflowExperiments(Registry registry) {
- setRegistry(registry);
- }
-
- public List<XBayaWorkflowExperiment> getAllExperiments() {
- Map<String, XBayaWorkflowExperiment> experiments = new HashMap<String, XBayaWorkflowExperiment>();
- List<WorkflowIOData> workflowInput = getRegistry().searchWorkflowInput(null, null, null);
- List<WorkflowIOData> workflowOutput = getRegistry().searchWorkflowOutput(null, null, null);
- createChildren(experiments, workflowInput, true);
- createChildren(experiments, workflowOutput, false);
- return Arrays.asList(experiments.values().toArray(new XBayaWorkflowExperiment[] {}));
- }
-
- private void createChildren(Map<String, XBayaWorkflowExperiment> experiments, List<WorkflowIOData> workflowIO,
- boolean inputData) {
- for (WorkflowIOData workflowIOData : workflowIO) {
- if (!experiments.containsKey(workflowIOData.getExperimentId())) {
- experiments.put(workflowIOData.getExperimentId(),
- new XBayaWorkflowExperiment(workflowIOData.getExperimentId(), null));
- }
- XBayaWorkflowExperiment xBayaWorkflowExperiment = experiments.get(workflowIOData.getExperimentId());
- XBayaWorkflow xbayaWorkflow = null;
- for (XBayaWorkflow workflow : xBayaWorkflowExperiment.getWorkflows()) {
- if (workflow.getWorkflowId().equals(workflowIOData.getWorkflowId())) {
- xbayaWorkflow = workflow;
- break;
- }
- }
- if (xbayaWorkflow == null) {
- xbayaWorkflow = new XBayaWorkflow(workflowIOData.getWorkflowId(), workflowIOData.getWorkflowName(),
- null);
- xBayaWorkflowExperiment.add(xbayaWorkflow);
- }
-
- XBayaWorkflowService workflowService = null;
- for (XBayaWorkflowService service : xbayaWorkflow.getWorkflowServices()) {
- if (service.getServiceNodeId().equals(workflowIOData.getNodeId())) {
- workflowService = service;
- break;
- }
- }
-
- if (workflowService == null) {
- workflowService = new XBayaWorkflowService(workflowIOData.getNodeId(), null, null);
- xbayaWorkflow.add(workflowService);
- }
- try {
- Document parameterDocument = XMLUtils.newDocument(new ByteArrayInputStream(workflowIOData.getData()
- .getBytes()));
- NodeList childNodes = parameterDocument.getDocumentElement().getChildNodes();
- for (int i = 0; i < childNodes.getLength(); i++) {
- Node parameterNode = childNodes.item(i);
- Parameter parameter = Parameter.Factory.newInstance();
- parameter.setParameterName(parameterNode.getLocalName());
- ServiceParameter serviceParameter = new ServiceParameter(parameter, parameterNode.getTextContent());
- if (inputData) {
- workflowService.getInputParameters().getParameters().add(serviceParameter);
- } else {
- workflowService.getOutputParameters().getParameters().add(serviceParameter);
- }
- }
- } catch (ParserConfigurationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (SAXException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- // TODO setup parameters
- }
- }
-
- public Registry getRegistry() {
- return registry;
- }
-
- public void setRegistry(Registry registry) {
- this.registry = registry;
- }
+ private Registry registry;
+
+ public XBayaWorkflowExperiments(Registry registry) {
+ setRegistry(registry);
+ }
+
+ public List<XBayaWorkflowExperiment> getAllExperiments(){
+ Map<String, XBayaWorkflowExperiment> experiments=new HashMap<String,XBayaWorkflowExperiment>();
+ List<WorkflowIOData> workflowInput = getRegistry().searchWorkflowInput(null, null, null);
+ List<WorkflowIOData> workflowOutput = getRegistry().searchWorkflowOutput(null, null, null);
+ createChildren(experiments, workflowInput, true);
+ createChildren(experiments, workflowOutput, false);
+ return Arrays.asList(experiments.values().toArray(new XBayaWorkflowExperiment[]{}));
+ }
+ private void createChildren(
+ Map<String, XBayaWorkflowExperiment> experiments,
+ List<WorkflowIOData> workflowIO, boolean inputData) {
+ for (WorkflowIOData workflowIOData : workflowIO) {
+ if (!experiments.containsKey(workflowIOData.getExperimentId())){
+ experiments.put(workflowIOData.getExperimentId(),new XBayaWorkflowExperiment(workflowIOData.getExperimentId(), null));
+ }
+ XBayaWorkflowExperiment xBayaWorkflowExperiment = experiments.get(workflowIOData.getExperimentId());
+ XBayaWorkflow xbayaWorkflow=null;
+ for(XBayaWorkflow workflow:xBayaWorkflowExperiment.getWorkflows()){
+ if (workflow.getWorkflowId().equals(workflowIOData.getWorkflowId())){
+ xbayaWorkflow=workflow;
+ break;
+ }
+ }
+ if (xbayaWorkflow==null){
+ xbayaWorkflow=new XBayaWorkflow(workflowIOData.getWorkflowId(),workflowIOData.getWorkflowName(),null);
+ xBayaWorkflowExperiment.add(xbayaWorkflow);
+ }
+
+ XBayaWorkflowService workflowService=null;
+ for(XBayaWorkflowService service:xbayaWorkflow.getWorkflowServices()){
+ if (service.getServiceNodeId().equals(workflowIOData.getNodeId())){
+ workflowService=service;
+ break;
+ }
+ }
+
+ if (workflowService==null){
+ workflowService=new XBayaWorkflowService(workflowIOData.getNodeId(),null,null);
+ xbayaWorkflow.add(workflowService);
+ }
+ try {
+ Document parameterDocument = XMLUtils.newDocument(new ByteArrayInputStream(workflowIOData.getData().getBytes()));
+ NodeList childNodes = parameterDocument.getDocumentElement().getChildNodes();
+ for(int i=0;i<childNodes.getLength();i++){
+ Node parameterNode = childNodes.item(i);
+ Parameter parameter = Parameter.Factory.newInstance();
+ parameter.setParameterName(parameterNode.getLocalName());
+ ServiceParameter serviceParameter = new ServiceParameter(parameter, parameterNode.getTextContent());
+ if (inputData) {
+ workflowService.getInputParameters().getParameters()
+ .add(serviceParameter);
+ }else{
+ workflowService.getOutputParameters().getParameters()
+ .add(serviceParameter);
+ }
+ }
+ } catch (ParserConfigurationException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ //TODO setup parameters
+ }
+ }
+ public Registry getRegistry() {
+ return registry;
+ }
+ public void setRegistry(Registry registry) {
+ this.registry = registry;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowService.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowService.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowService.java Mon Oct 31 20:56:37 2011
@@ -22,43 +22,43 @@
package org.apache.airavata.xbaya.registrybrowser.model;
public class XBayaWorkflowService {
- private InputParameters inputParameters;
- private OutputParameters outputParameters;
- private String serviceNodeId;
-
- public XBayaWorkflowService(String serviceNodeId, InputParameters inputParameters, OutputParameters outputParameters) {
- setServiceNodeId(serviceNodeId);
- setInputParameters(inputParameters);
- setOutputParameters(outputParameters);
- }
-
- public OutputParameters getOutputParameters() {
- if (outputParameters == null) {
- outputParameters = new OutputParameters((ServiceParameter[]) null);
- }
- return outputParameters;
- }
-
- public void setOutputParameters(OutputParameters outputParameters) {
- this.outputParameters = outputParameters;
- }
-
- public InputParameters getInputParameters() {
- if (inputParameters == null) {
- inputParameters = new InputParameters((ServiceParameter[]) null);
- }
- return inputParameters;
- }
-
- public void setInputParameters(InputParameters inputParameters) {
- this.inputParameters = inputParameters;
- }
-
- public String getServiceNodeId() {
- return serviceNodeId;
- }
-
- public void setServiceNodeId(String serviceNodeId) {
- this.serviceNodeId = serviceNodeId;
- }
+ private InputParameters inputParameters;
+ private OutputParameters outputParameters;
+ private String serviceNodeId;
+
+ public XBayaWorkflowService(String serviceNodeId, InputParameters inputParameters, OutputParameters outputParameters) {
+ setServiceNodeId(serviceNodeId);
+ setInputParameters(inputParameters);
+ setOutputParameters(outputParameters);
+ }
+
+ public OutputParameters getOutputParameters() {
+ if (outputParameters==null){
+ outputParameters=new OutputParameters((ServiceParameter[])null);
+ }
+ return outputParameters;
+ }
+
+ public void setOutputParameters(OutputParameters outputParameters) {
+ this.outputParameters = outputParameters;
+ }
+
+ public InputParameters getInputParameters() {
+ if (inputParameters==null){
+ inputParameters=new InputParameters((ServiceParameter[])null);
+ }
+ return inputParameters;
+ }
+
+ public void setInputParameters(InputParameters inputParameters) {
+ this.inputParameters = inputParameters;
+ }
+
+ public String getServiceNodeId() {
+ return serviceNodeId;
+ }
+
+ public void setServiceNodeId(String serviceNodeId) {
+ this.serviceNodeId = serviceNodeId;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java Mon Oct 31 20:56:37 2011
@@ -32,13 +32,13 @@ import javax.swing.Icon;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JTree;
+import javax.swing.SwingUtilities;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import org.apache.airavata.registry.api.Registry;
-import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
import org.apache.airavata.xbaya.registrybrowser.menu.RefreshAction;
@@ -179,14 +179,6 @@ public abstract class AbstractAiravataTr
return rootNode;
}
- protected XBayaEngine getXBayaEngine() {
- TreeNode root = getRootNode();
- if (root instanceof RegistryNode) {
- return ((RegistryNode) root).getEngine();
- }
- return null;
- }
-
public Registry getRegistry() {
TreeNode rootNode = getRootNode();
if (rootNode instanceof RegistryNode) {
@@ -211,13 +203,13 @@ public abstract class AbstractAiravataTr
public abstract Icon getActionIcon(AbstractBrowserActionItem action);
public abstract String getActionDescription(AbstractBrowserActionItem action);
-
- protected String wrapAsHtml(String... data) {
- String result = "<html>";
- for (String item : data) {
- result += item;
- }
- result += "</html>";
- return result;
+
+ protected String wrapAsHtml(String...data){
+ String result="<html>";
+ for (String item : data) {
+ result+=item;
+ }
+ result+="</html>";
+ return result;
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AiravataTreeNodeFactory.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AiravataTreeNodeFactory.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AiravataTreeNodeFactory.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AiravataTreeNodeFactory.java Mon Oct 31 20:56:37 2011
@@ -26,7 +26,7 @@ import javax.swing.tree.TreeNode;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.xbaya.registrybrowser.model.ApplicationDeploymentDescriptionWrap;
import org.apache.airavata.xbaya.registrybrowser.model.ApplicationDeploymentDescriptions;
import org.apache.airavata.xbaya.registrybrowser.model.GFacURL;
@@ -45,49 +45,47 @@ import org.apache.airavata.xbaya.registr
import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflowTemplates;
public class AiravataTreeNodeFactory {
- public static TreeNode getTreeNode(Object o, TreeNode parent) {
- if (o instanceof XBayaEngine) {
- return new RegistryNode((XBayaEngine) o, parent);
- }/*
- * else if (o instanceof Registry){ // return new RegistryNode((Registry)o,parent); }
- */else if (o instanceof GFacURLs) {
- return new GFacURLsNode((GFacURLs) o, parent);
- } else if (o instanceof GFacURL) {
- return new GFacURLNode((GFacURL) o, parent);
- } else if (o instanceof HostDescriptions) {
- return new HostDescriptionsNode((HostDescriptions) o, parent);
- } else if (o instanceof HostDescription) {
- return new HostDescriptionNode((HostDescription) o, parent);
- } else if (o instanceof ServiceDescriptions) {
- return new ServiceDescriptionsNode((ServiceDescriptions) o, parent);
- } else if (o instanceof ServiceDescription) {
- return new ServiceDescriptionNode((ServiceDescription) o, parent);
- } else if (o instanceof ApplicationDeploymentDescriptions) {
- return new ApplicationDeploymentDescriptionsNode((ApplicationDeploymentDescriptions) o, parent);
- } else if (o instanceof ApplicationDeploymentDescriptionWrap) {
- return new ApplicationDeploymentDescriptionNode((ApplicationDeploymentDescriptionWrap) o, parent);
- } else if (o instanceof XBayaWorkflowTemplates) {
- return new XBayaWorkflowTemplatesNode((XBayaWorkflowTemplates) o, parent);
- } else if (o instanceof XBayaWorkflowTemplate) {
- return new XBayaWorkflowTemplateNode((XBayaWorkflowTemplate) o, parent);
- } else if (o instanceof ServiceParameter) {
- return new ParameterNode((ServiceParameter) o, parent);
- } else if (o instanceof InputParameters) {
- return new InputParametersNode((InputParameters) o, parent);
- } else if (o instanceof OutputParameters) {
- return new OutputParametersNode((OutputParameters) o, parent);
- } else if (o instanceof ServiceParameters) {
- return new ParametersNode((ServiceParameters) o, parent);
- } else if (o instanceof XBayaWorkflowExperiments) {
- return new XBayaWorkflowExperimentsNode((XBayaWorkflowExperiments) o, parent);
- } else if (o instanceof XBayaWorkflowExperiment) {
- return new XBayaWorkflowExperimentNode((XBayaWorkflowExperiment) o, parent);
- } else if (o instanceof XBayaWorkflow) {
- return new XBayaWorkflowNode((XBayaWorkflow) o, parent);
- } else if (o instanceof XBayaWorkflowService) {
- return new XBayaWorkflowServiceNode((XBayaWorkflowService) o, parent);
- } else {
- return new DefaultMutableTreeNode(o);
- }
- }
+ public static TreeNode getTreeNode(Object o,TreeNode parent){
+ if (o instanceof Registry){
+ return new RegistryNode((Registry)o,parent);
+ }else if (o instanceof GFacURLs){
+ return new GFacURLsNode((GFacURLs)o,parent);
+ }else if (o instanceof GFacURL){
+ return new GFacURLNode((GFacURL)o,parent);
+ }else if (o instanceof HostDescriptions){
+ return new HostDescriptionsNode((HostDescriptions)o,parent);
+ }else if (o instanceof HostDescription){
+ return new HostDescriptionNode((HostDescription)o,parent);
+ }else if (o instanceof ServiceDescriptions){
+ return new ServiceDescriptionsNode((ServiceDescriptions)o,parent);
+ }else if (o instanceof ServiceDescription){
+ return new ServiceDescriptionNode((ServiceDescription)o,parent);
+ }else if (o instanceof ApplicationDeploymentDescriptions){
+ return new ApplicationDeploymentDescriptionsNode((ApplicationDeploymentDescriptions)o,parent);
+ }else if (o instanceof ApplicationDeploymentDescriptionWrap){
+ return new ApplicationDeploymentDescriptionNode((ApplicationDeploymentDescriptionWrap)o,parent);
+ }else if (o instanceof XBayaWorkflowTemplates){
+ return new XBayaWorkflowTemplatesNode((XBayaWorkflowTemplates)o,parent);
+ }else if (o instanceof XBayaWorkflowTemplate){
+ return new XBayaWorkflowTemplateNode((XBayaWorkflowTemplate)o,parent);
+ }else if (o instanceof ServiceParameter){
+ return new ParameterNode((ServiceParameter)o,parent);
+ }else if (o instanceof InputParameters){
+ return new InputParametersNode((InputParameters)o,parent);
+ }else if (o instanceof OutputParameters){
+ return new OutputParametersNode((OutputParameters)o,parent);
+ }else if (o instanceof ServiceParameters){
+ return new ParametersNode((ServiceParameters)o,parent);
+ }else if (o instanceof XBayaWorkflowExperiments){
+ return new XBayaWorkflowExperimentsNode((XBayaWorkflowExperiments)o,parent);
+ }else if (o instanceof XBayaWorkflowExperiment){
+ return new XBayaWorkflowExperimentNode((XBayaWorkflowExperiment)o,parent);
+ }else if (o instanceof XBayaWorkflow){
+ return new XBayaWorkflowNode((XBayaWorkflow)o,parent);
+ }else if (o instanceof XBayaWorkflowService){
+ return new XBayaWorkflowServiceNode((XBayaWorkflowService)o,parent);
+ }else{
+ return new DefaultMutableTreeNode(o);
+ }
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java Mon Oct 31 20:56:37 2011
@@ -52,8 +52,7 @@ public class ApplicationDeploymentDescri
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName()
- .getStringValue();
+ return getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName().getStringValue();
}
@Override
@@ -75,7 +74,6 @@ public class ApplicationDeploymentDescri
return Arrays.asList(EditAction.ID, DeleteAction.ID);
}
- @Override
public boolean triggerAction(JTree tree, String action) throws Exception {
if (action.equals(DeleteAction.ID)) {
deleteApplicationDescription(tree);
@@ -90,13 +88,10 @@ public class ApplicationDeploymentDescri
private void deleteApplicationDescription(JTree tree) throws RegistryException {
if (askQuestion("Application description",
"Are you sure that you want to remove the application description \""
- + getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName()
- .getStringValue() + "\"?")) {
- getRegistry().deleteDeploymentDescription(
- getApplicationDeploymentDescriptionWrap().getService(),
+ + getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName().getStringValue() + "\"?")) {
+ getRegistry().deleteDeploymentDescription(getApplicationDeploymentDescriptionWrap().getService(),
getApplicationDeploymentDescriptionWrap().getHost(),
- getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName()
- .getStringValue());
+ getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName().getStringValue());
((AbstractAiravataTreeNode) getParent()).refresh();
reloadTreeNode(tree, getParent());
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java Mon Oct 31 20:56:37 2011
@@ -81,14 +81,12 @@ public class ApplicationDeploymentDescri
return Arrays.asList(AddAction.ID, RefreshAction.ID, DeleteAction.ID);
}
- @Override
public boolean triggerAction(JTree tree, String action) throws Exception {
if (action.equals(DeleteAction.ID)) {
deleteApplicationDescription(tree);
return true;
} else if (action.equals(AddAction.ID)) {
- ApplicationDescriptionDialog applicationDescriptionDialog = new ApplicationDescriptionDialog(
- getXBayaEngine());
+ ApplicationDescriptionDialog applicationDescriptionDialog = new ApplicationDescriptionDialog(getRegistry());
applicationDescriptionDialog.open();
if (applicationDescriptionDialog.isApplicationDescCreated()) {
refresh();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java Mon Oct 31 20:56:37 2011
@@ -72,7 +72,6 @@ public class HostDescriptionNode extends
return Arrays.asList(EditAction.ID, DeleteAction.ID);
}
- @Override
public boolean triggerAction(JTree tree, String action) throws Exception {
if (action.equals(DeleteAction.ID)) {
deleteHostDescription(tree);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java Mon Oct 31 20:56:37 2011
@@ -80,16 +80,13 @@ public class HostDescriptionsNode extend
return Arrays.asList(AddAction.ID, RefreshAction.ID, DeleteAction.ID);
}
- @Override
public boolean triggerAction(JTree tree, String action) throws Exception {
if (action.equals(DeleteAction.ID)) {
deleteHostDescription(tree);
return true;
} else if (action.equals(AddAction.ID)) {
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine());
- // TODO : remove this
- // hostDescriptionDialog.open();
- hostDescriptionDialog.show();
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getRegistry());
+ hostDescriptionDialog.open();
if (hostDescriptionDialog.isHostCreated()) {
refresh();
reloadTreeNode(tree, this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/InputParametersNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/InputParametersNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/InputParametersNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/InputParametersNode.java Mon Oct 31 20:56:37 2011
@@ -29,17 +29,19 @@ import org.apache.airavata.xbaya.registr
public class InputParametersNode extends ParametersNode {
- public InputParametersNode(InputParameters parameters, TreeNode parent) {
- super(parameters, parent);
- }
+ public InputParametersNode(InputParameters parameters, TreeNode parent) {
+ super(parameters, parent);
+ }
- @Override
- public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return "Input";
- }
-
- @Override
- public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return SwingUtil.createImageIcon("input_para.png");
- }
+ @Override
+ public String getCaption(boolean selected, boolean expanded, boolean leaf,
+ boolean hasFocus) {
+ return "Input";
+ }
+
+ @Override
+ public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
+ boolean hasFocus) {
+ return SwingUtil.createImageIcon("input_para.png");
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/OutputParametersNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/OutputParametersNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/OutputParametersNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/OutputParametersNode.java Mon Oct 31 20:56:37 2011
@@ -29,17 +29,19 @@ import org.apache.airavata.xbaya.registr
public class OutputParametersNode extends ParametersNode {
- public OutputParametersNode(OutputParameters parameters, TreeNode parent) {
- super(parameters, parent);
- }
+ public OutputParametersNode(OutputParameters parameters, TreeNode parent) {
+ super(parameters, parent);
+ }
- @Override
- public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return "Output";
- }
-
- @Override
- public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return SwingUtil.createImageIcon("output_para.png");
- }
+ @Override
+ public String getCaption(boolean selected, boolean expanded, boolean leaf,
+ boolean hasFocus) {
+ return "Output";
+ }
+
+ @Override
+ public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
+ boolean hasFocus) {
+ return SwingUtil.createImageIcon("output_para.png");
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java Mon Oct 31 20:56:37 2011
@@ -33,62 +33,63 @@ import org.apache.airavata.xbaya.registr
import org.apache.airavata.xbaya.registrybrowser.model.ServiceParameter;
public class ParameterNode extends AbstractAiravataTreeNode {
- private ServiceParameter parameter;
-
- public ParameterNode(ServiceParameter parameter, TreeNode parent) {
- super(parent);
- setParameter(parameter);
- }
-
- @Override
- protected List<TreeNode> getChildren() {
- return emptyList();
- }
-
- @Override
- public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- if (getParameter().getValue() != null) {
- return wrapAsHtml(getParameter().getName(), ": ", "<i>" + getParameter().getValue().toString() + "</i>");
- } else {
- return getParameter().getName();
- }
- }
-
- @Override
- public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return SwingUtil.createImageIcon("parameter.png");
- }
-
- @Override
- public List<String> getSupportedActions() {
- return Arrays.asList();
- }
-
- @Override
- public boolean triggerAction(JTree tree, String action) throws Exception {
- return super.triggerAction(tree, action);
- }
-
- @Override
- public String getActionCaption(AbstractBrowserActionItem action) {
- return action.getDefaultCaption();
- }
-
- @Override
- public Icon getActionIcon(AbstractBrowserActionItem action) {
- return null;
- }
-
- @Override
- public String getActionDescription(AbstractBrowserActionItem action) {
- return null;
- }
-
- public ServiceParameter getParameter() {
- return parameter;
- }
-
- public void setParameter(ServiceParameter parameter) {
- this.parameter = parameter;
- }
+ private ServiceParameter parameter;
+
+ public ParameterNode(ServiceParameter parameter, TreeNode parent) {
+ super(parent);
+ setParameter(parameter);
+ }
+
+ @Override
+ protected List<TreeNode> getChildren() {
+ return emptyList();
+ }
+
+ @Override
+ public String getCaption(boolean selected, boolean expanded, boolean leaf,
+ boolean hasFocus) {
+ if (getParameter().getValue()!=null){
+ return wrapAsHtml(getParameter().getName(),": ","<i>"+getParameter().getValue().toString()+"</i>");
+ }else{
+ return getParameter().getName();
+ }
+ }
+
+ @Override
+ public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
+ boolean hasFocus) {
+ return SwingUtil.createImageIcon("parameter.png");
+ }
+
+ @Override
+ public List<String> getSupportedActions() {
+ return Arrays.asList();
+ }
+
+ public boolean triggerAction(JTree tree,String action) throws Exception{
+ return super.triggerAction(tree, action);
+ }
+
+ @Override
+ public String getActionCaption(AbstractBrowserActionItem action) {
+ return action.getDefaultCaption();
+ }
+
+ @Override
+ public Icon getActionIcon(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ @Override
+ public String getActionDescription(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ public ServiceParameter getParameter() {
+ return parameter;
+ }
+
+ public void setParameter(ServiceParameter parameter) {
+ this.parameter = parameter;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java Mon Oct 31 20:56:37 2011
@@ -33,58 +33,59 @@ import org.apache.airavata.schemas.gfac.
import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
public class ParameterValueNode extends AbstractAiravataTreeNode {
- private Parameter parameter;
-
- public ParameterValueNode(Parameter parameter, TreeNode parent) {
- super(parent);
- setParameter(parameter);
- }
-
- @Override
- protected List<TreeNode> getChildren() {
- return emptyList();
- }
-
- @Override
- public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return getParameter().getParameterName();
- }
-
- @Override
- public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return SwingUtil.createImageIcon("parameter.png");
- }
-
- @Override
- public List<String> getSupportedActions() {
- return Arrays.asList();
- }
-
- @Override
- public boolean triggerAction(JTree tree, String action) throws Exception {
- return super.triggerAction(tree, action);
- }
-
- @Override
- public String getActionCaption(AbstractBrowserActionItem action) {
- return action.getDefaultCaption();
- }
-
- @Override
- public Icon getActionIcon(AbstractBrowserActionItem action) {
- return null;
- }
-
- @Override
- public String getActionDescription(AbstractBrowserActionItem action) {
- return null;
- }
-
- public Parameter getParameter() {
- return parameter;
- }
-
- public void setParameter(Parameter parameter) {
- this.parameter = parameter;
- }
+ private Parameter parameter;
+
+ public ParameterValueNode(Parameter parameter, TreeNode parent) {
+ super(parent);
+ setParameter(parameter);
+ }
+
+ @Override
+ protected List<TreeNode> getChildren() {
+ return emptyList();
+ }
+
+ @Override
+ public String getCaption(boolean selected, boolean expanded, boolean leaf,
+ boolean hasFocus) {
+ return getParameter().getParameterName();
+ }
+
+ @Override
+ public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
+ boolean hasFocus) {
+ return SwingUtil.createImageIcon("parameter.png");
+ }
+
+ @Override
+ public List<String> getSupportedActions() {
+ return Arrays.asList();
+ }
+
+ public boolean triggerAction(JTree tree,String action) throws Exception{
+ return super.triggerAction(tree, action);
+ }
+
+ @Override
+ public String getActionCaption(AbstractBrowserActionItem action) {
+ return action.getDefaultCaption();
+ }
+
+ @Override
+ public Icon getActionIcon(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ @Override
+ public String getActionDescription(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ public Parameter getParameter() {
+ return parameter;
+ }
+
+ public void setParameter(Parameter parameter) {
+ this.parameter = parameter;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java Mon Oct 31 20:56:37 2011
@@ -33,59 +33,59 @@ import org.apache.airavata.xbaya.registr
import org.apache.airavata.xbaya.registrybrowser.model.ServiceParameters;
public class ParametersNode extends AbstractAiravataTreeNode {
- private ServiceParameters parametersList;
-
- public ParametersNode(ServiceParameters parameters, TreeNode parent) {
- super(parent);
- setParametersList(parameters);
- }
-
- @Override
- protected List<TreeNode> getChildren() {
- return getTreeNodeList(getParametersList().getParameters().toArray(), this);
- }
-
- @Override
- public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return "Parameters";
- }
-
- @Override
- public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return SwingUtil.createImageIcon("parameter.png");
- }
-
- @Override
- public List<String> getSupportedActions() {
- return Arrays.asList();
- }
-
- @Override
- public boolean triggerAction(JTree tree, String action) throws Exception {
- return super.triggerAction(tree, action);
- }
-
- @Override
- public String getActionCaption(AbstractBrowserActionItem action) {
- return action.getDefaultCaption();
- }
-
- @Override
- public Icon getActionIcon(AbstractBrowserActionItem action) {
- return null;
- }
-
- @Override
- public String getActionDescription(AbstractBrowserActionItem action) {
- return null;
- }
-
- public ServiceParameters getParametersList() {
- return parametersList;
- }
-
- public void setParametersList(ServiceParameters parametersList) {
- this.parametersList = parametersList;
- }
+ private ServiceParameters parametersList;
+ public ParametersNode(ServiceParameters parameters,TreeNode parent) {
+ super(parent);
+ setParametersList(parameters);
+ }
+
+ @Override
+ protected List<TreeNode> getChildren() {
+ return getTreeNodeList(getParametersList().getParameters().toArray(), this);
+ }
+
+ @Override
+ public String getCaption(boolean selected, boolean expanded, boolean leaf,
+ boolean hasFocus) {
+ return "Parameters";
+ }
+
+ @Override
+ public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
+ boolean hasFocus) {
+ return SwingUtil.createImageIcon("parameter.png");
+ }
+
+ @Override
+ public List<String> getSupportedActions() {
+ return Arrays.asList();
+ }
+
+ public boolean triggerAction(JTree tree,String action) throws Exception{
+ return super.triggerAction(tree, action);
+ }
+
+ @Override
+ public String getActionCaption(AbstractBrowserActionItem action) {
+ return action.getDefaultCaption();
+ }
+
+ @Override
+ public Icon getActionIcon(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ @Override
+ public String getActionDescription(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ public ServiceParameters getParametersList() {
+ return parametersList;
+ }
+
+ public void setParametersList(ServiceParameters parametersList) {
+ this.parametersList = parametersList;
+ }
}