You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2011/10/31 07:48:31 UTC
svn commit: r1195355 [10/14] - 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/gui/XBayaLinkButton.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaLinkButton.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaLinkButton.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaLinkButton.java Mon Oct 31 06:48:11 2011
@@ -19,288 +19,292 @@
*
*/
-package org.apache.airavata.xbaya.gui;
-
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.GridLayout;
-import java.awt.Rectangle;
-import java.net.URL;
-
-import javax.swing.Action;
-import javax.swing.ButtonModel;
-import javax.swing.Icon;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.metal.MetalButtonUI;
-
-public class XBayaLinkButton extends JButton {
+package org.apache.airavata.xbaya.gui;
+
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.GridLayout;
+import java.awt.Rectangle;
+import java.net.URL;
+
+import javax.swing.Action;
+import javax.swing.ButtonModel;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.metal.MetalButtonUI;
+
+public class XBayaLinkButton extends JButton {
/**
*
- */
- private static final long serialVersionUID = -4827125226349868996L;
-
- public static final int ALWAYS_UNDERLINE = 0;
-
- public static final int HOVER_UNDERLINE = 1;
-
- public static final int NEVER_UNDERLINE = 2;
-
- public static final int SYSTEM_DEFAULT = 3;
-
- private int linkBehavior;
-
- private Color linkColor;
-
- private Color colorPressed;
-
- private Color visitedLinkColor;
-
- private Color disabledLinkColor;
-
- private URL buttonURL;
-
- private Action defaultAction;
-
- private boolean isLinkVisited;
-
- public static void main(String[] a) {
- JFrame f = new JFrame();
- f.getContentPane().setLayout(new GridLayout(0, 2));
- f.getContentPane().add(new XBayaLinkButton("www.java2s.com"));
- f.getContentPane().add(new XBayaLinkButton("www.java2s.com/ExampleCode/CatalogExampleCode.htm"));
- f.setSize(600, 200);
- f.setVisible(true);
- }
-
- public XBayaLinkButton() {
- this(null, null, null);
- }
-
- public XBayaLinkButton(Action action) {
- this();
- setAction(action);
- }
-
- public XBayaLinkButton(Icon icon) {
- this(null, icon, null);
- }
-
- public XBayaLinkButton(String s) {
- this(s, null, null);
- }
-
- public XBayaLinkButton(URL url) {
- this(null, null, url);
- }
-
- public XBayaLinkButton(String s, URL url) {
- this(s, null, url);
- }
-
- public XBayaLinkButton(Icon icon, URL url) {
- this(null, icon, url);
- }
-
- public XBayaLinkButton(String text, Icon icon, URL url) {
- super(text, icon);
- linkBehavior = SYSTEM_DEFAULT;
- linkColor = Color.blue;
- colorPressed = Color.red;
- visitedLinkColor = new Color(128, 0, 128);
- if (text == null && url != null)
- setText(url.toExternalForm());
- setLinkURL(url);
- setCursor(Cursor.getPredefinedCursor(12));
- setBorderPainted(false);
- setContentAreaFilled(false);
- setRolloverEnabled(true);
- addActionListener(defaultAction);
- }
-
- public void updateUI() {
- setUI(BasicLinkButtonUI.createUI(this));
- }
-
- public String getUIClassID() {
- return "LinkButtonUI";
- }
-
- protected void setupToolTipText() {
- String tip = null;
- if (buttonURL != null)
- tip = buttonURL.toExternalForm();
- setToolTipText(tip);
- }
-
- public void setLinkBehavior(int bnew) {
- checkLinkBehaviour(bnew);
- int old = linkBehavior;
- linkBehavior = bnew;
- firePropertyChange("linkBehavior", old, bnew);
- repaint();
- }
-
- private void checkLinkBehaviour(int beha) {
- if (beha != ALWAYS_UNDERLINE && beha != HOVER_UNDERLINE && beha != NEVER_UNDERLINE && beha != SYSTEM_DEFAULT)
- throw new IllegalArgumentException("Not a legal LinkBehavior");
- else
- return;
- }
-
- public int getLinkBehavior() {
- return linkBehavior;
- }
-
- public void setLinkColor(Color color) {
- Color colorOld = linkColor;
- linkColor = color;
- firePropertyChange("linkColor", colorOld, color);
- repaint();
- }
-
- public Color getLinkColor() {
- return linkColor;
- }
-
- public void setActiveLinkColor(Color colorNew) {
- Color colorOld = colorPressed;
- colorPressed = colorNew;
- firePropertyChange("activeLinkColor", colorOld, colorNew);
- repaint();
- }
-
- public Color getActiveLinkColor() {
- return colorPressed;
- }
-
- public void setDisabledLinkColor(Color color) {
- Color colorOld = disabledLinkColor;
- disabledLinkColor = color;
- firePropertyChange("disabledLinkColor", colorOld, color);
- if (!isEnabled())
- repaint();
- }
-
- public Color getDisabledLinkColor() {
- return disabledLinkColor;
- }
-
- public void setVisitedLinkColor(Color colorNew) {
- Color colorOld = visitedLinkColor;
- visitedLinkColor = colorNew;
- firePropertyChange("visitedLinkColor", colorOld, colorNew);
- repaint();
- }
-
- public Color getVisitedLinkColor() {
- return visitedLinkColor;
- }
-
- public URL getLinkURL() {
- return buttonURL;
- }
-
- public void setLinkURL(URL url) {
- URL urlOld = buttonURL;
- buttonURL = url;
- setupToolTipText();
- firePropertyChange("linkURL", urlOld, url);
- revalidate();
- repaint();
- }
-
- public void setLinkVisited(boolean flagNew) {
- boolean flagOld = isLinkVisited;
- isLinkVisited = flagNew;
- firePropertyChange("linkVisited", flagOld, flagNew);
- repaint();
- }
-
- public boolean isLinkVisited() {
- return isLinkVisited;
- }
-
- public void setDefaultAction(Action actionNew) {
- Action actionOld = defaultAction;
- defaultAction = actionNew;
- firePropertyChange("defaultAction", actionOld, actionNew);
- }
-
- public Action getDefaultAction() {
- return defaultAction;
- }
-
- protected String paramString() {
- String str;
- if (linkBehavior == ALWAYS_UNDERLINE)
- str = "ALWAYS_UNDERLINE";
- else if (linkBehavior == HOVER_UNDERLINE)
- str = "HOVER_UNDERLINE";
- else if (linkBehavior == NEVER_UNDERLINE)
- str = "NEVER_UNDERLINE";
- else
- str = "SYSTEM_DEFAULT";
- String colorStr = linkColor == null ? "" : linkColor.toString();
- String colorPressStr = colorPressed == null ? "" : colorPressed.toString();
- String disabledLinkColorStr = disabledLinkColor == null ? "" : disabledLinkColor.toString();
- String visitedLinkColorStr = visitedLinkColor == null ? "" : visitedLinkColor.toString();
- String buttonURLStr = buttonURL == null ? "" : buttonURL.toString();
- String isLinkVisitedStr = isLinkVisited ? "true" : "false";
- return super.paramString() + ",linkBehavior=" + str + ",linkURL=" + buttonURLStr + ",linkColor=" + colorStr
- + ",activeLinkColor=" + colorPressStr + ",disabledLinkColor=" + disabledLinkColorStr
- + ",visitedLinkColor=" + visitedLinkColorStr + ",linkvisitedString=" + isLinkVisitedStr;
- }
-}
-
-class BasicLinkButtonUI extends MetalButtonUI {
- private static final BasicLinkButtonUI ui = new BasicLinkButtonUI();
-
- public BasicLinkButtonUI() {
- }
-
- public static ComponentUI createUI(JComponent jcomponent) {
- return ui;
- }
-
- protected void paintText(Graphics g, JComponent com, Rectangle rect, String s) {
- XBayaLinkButton bn = (XBayaLinkButton) com;
- ButtonModel bnModel = bn.getModel();
- if (bnModel.isEnabled()) {
- if (bnModel.isPressed())
- bn.setForeground(bn.getActiveLinkColor());
- else if (bn.isLinkVisited())
- bn.setForeground(bn.getVisitedLinkColor());
-
- else
- bn.setForeground(bn.getLinkColor());
- } else {
- if (bn.getDisabledLinkColor() != null)
- bn.setForeground(bn.getDisabledLinkColor());
- }
- super.paintText(g, com, rect, s);
- int behaviour = bn.getLinkBehavior();
- boolean drawLine = false;
- if (behaviour == XBayaLinkButton.HOVER_UNDERLINE) {
- if (bnModel.isRollover())
- drawLine = true;
- } else if (behaviour == XBayaLinkButton.ALWAYS_UNDERLINE || behaviour == XBayaLinkButton.SYSTEM_DEFAULT)
- drawLine = true;
- if (!drawLine)
- return;
- FontMetrics fm = g.getFontMetrics();
- int x = rect.x + getTextShiftOffset();
- int y = (rect.y + fm.getAscent() + fm.getDescent() + getTextShiftOffset()) - 1;
- if (bnModel.isEnabled()) {
- g.setColor(bn.getForeground());
- g.drawLine(x, y, (x + rect.width) - 1, y);
- } else {
- g.setColor(bn.getBackground().brighter());
- g.drawLine(x, y, (x + rect.width) - 1, y);
- }
- }
-}
+ */
+ private static final long serialVersionUID = -4827125226349868996L;
+
+ public static final int ALWAYS_UNDERLINE = 0;
+
+ public static final int HOVER_UNDERLINE = 1;
+
+ public static final int NEVER_UNDERLINE = 2;
+
+ public static final int SYSTEM_DEFAULT = 3;
+
+ private int linkBehavior;
+
+ private Color linkColor;
+
+ private Color colorPressed;
+
+ private Color visitedLinkColor;
+
+ private Color disabledLinkColor;
+
+ private URL buttonURL;
+
+ private Action defaultAction;
+
+ private boolean isLinkVisited;
+
+ public static void main(String[] a) {
+ JFrame f = new JFrame();
+ f.getContentPane().setLayout(new GridLayout(0, 2));
+ f.getContentPane().add(new XBayaLinkButton("www.java2s.com"));
+ f.getContentPane().add(new XBayaLinkButton("www.java2s.com/ExampleCode/CatalogExampleCode.htm"));
+ f.setSize(600, 200);
+ f.setVisible(true);
+ }
+
+ public XBayaLinkButton() {
+ this(null, null, null);
+ }
+
+ public XBayaLinkButton(Action action) {
+ this();
+ setAction(action);
+ }
+
+ public XBayaLinkButton(Icon icon) {
+ this(null, icon, null);
+ }
+
+ public XBayaLinkButton(String s) {
+ this(s, null, null);
+ }
+
+ public XBayaLinkButton(URL url) {
+ this(null, null, url);
+ }
+
+ public XBayaLinkButton(String s, URL url) {
+ this(s, null, url);
+ }
+
+ public XBayaLinkButton(Icon icon, URL url) {
+ this(null, icon, url);
+ }
+
+ public XBayaLinkButton(String text, Icon icon, URL url) {
+ super(text, icon);
+ linkBehavior = SYSTEM_DEFAULT;
+ linkColor = Color.blue;
+ colorPressed = Color.red;
+ visitedLinkColor = new Color(128, 0, 128);
+ if (text == null && url != null)
+ setText(url.toExternalForm());
+ setLinkURL(url);
+ setCursor(Cursor.getPredefinedCursor(12));
+ setBorderPainted(false);
+ setContentAreaFilled(false);
+ setRolloverEnabled(true);
+ addActionListener(defaultAction);
+ }
+
+ @Override
+ public void updateUI() {
+ setUI(BasicLinkButtonUI.createUI(this));
+ }
+
+ @Override
+ public String getUIClassID() {
+ return "LinkButtonUI";
+ }
+
+ protected void setupToolTipText() {
+ String tip = null;
+ if (buttonURL != null)
+ tip = buttonURL.toExternalForm();
+ setToolTipText(tip);
+ }
+
+ public void setLinkBehavior(int bnew) {
+ checkLinkBehaviour(bnew);
+ int old = linkBehavior;
+ linkBehavior = bnew;
+ firePropertyChange("linkBehavior", old, bnew);
+ repaint();
+ }
+
+ private void checkLinkBehaviour(int beha) {
+ if (beha != ALWAYS_UNDERLINE && beha != HOVER_UNDERLINE && beha != NEVER_UNDERLINE && beha != SYSTEM_DEFAULT)
+ throw new IllegalArgumentException("Not a legal LinkBehavior");
+ else
+ return;
+ }
+
+ public int getLinkBehavior() {
+ return linkBehavior;
+ }
+
+ public void setLinkColor(Color color) {
+ Color colorOld = linkColor;
+ linkColor = color;
+ firePropertyChange("linkColor", colorOld, color);
+ repaint();
+ }
+
+ public Color getLinkColor() {
+ return linkColor;
+ }
+
+ public void setActiveLinkColor(Color colorNew) {
+ Color colorOld = colorPressed;
+ colorPressed = colorNew;
+ firePropertyChange("activeLinkColor", colorOld, colorNew);
+ repaint();
+ }
+
+ public Color getActiveLinkColor() {
+ return colorPressed;
+ }
+
+ public void setDisabledLinkColor(Color color) {
+ Color colorOld = disabledLinkColor;
+ disabledLinkColor = color;
+ firePropertyChange("disabledLinkColor", colorOld, color);
+ if (!isEnabled())
+ repaint();
+ }
+
+ public Color getDisabledLinkColor() {
+ return disabledLinkColor;
+ }
+
+ public void setVisitedLinkColor(Color colorNew) {
+ Color colorOld = visitedLinkColor;
+ visitedLinkColor = colorNew;
+ firePropertyChange("visitedLinkColor", colorOld, colorNew);
+ repaint();
+ }
+
+ public Color getVisitedLinkColor() {
+ return visitedLinkColor;
+ }
+
+ public URL getLinkURL() {
+ return buttonURL;
+ }
+
+ public void setLinkURL(URL url) {
+ URL urlOld = buttonURL;
+ buttonURL = url;
+ setupToolTipText();
+ firePropertyChange("linkURL", urlOld, url);
+ revalidate();
+ repaint();
+ }
+
+ public void setLinkVisited(boolean flagNew) {
+ boolean flagOld = isLinkVisited;
+ isLinkVisited = flagNew;
+ firePropertyChange("linkVisited", flagOld, flagNew);
+ repaint();
+ }
+
+ public boolean isLinkVisited() {
+ return isLinkVisited;
+ }
+
+ public void setDefaultAction(Action actionNew) {
+ Action actionOld = defaultAction;
+ defaultAction = actionNew;
+ firePropertyChange("defaultAction", actionOld, actionNew);
+ }
+
+ public Action getDefaultAction() {
+ return defaultAction;
+ }
+
+ @Override
+ protected String paramString() {
+ String str;
+ if (linkBehavior == ALWAYS_UNDERLINE)
+ str = "ALWAYS_UNDERLINE";
+ else if (linkBehavior == HOVER_UNDERLINE)
+ str = "HOVER_UNDERLINE";
+ else if (linkBehavior == NEVER_UNDERLINE)
+ str = "NEVER_UNDERLINE";
+ else
+ str = "SYSTEM_DEFAULT";
+ String colorStr = linkColor == null ? "" : linkColor.toString();
+ String colorPressStr = colorPressed == null ? "" : colorPressed.toString();
+ String disabledLinkColorStr = disabledLinkColor == null ? "" : disabledLinkColor.toString();
+ String visitedLinkColorStr = visitedLinkColor == null ? "" : visitedLinkColor.toString();
+ String buttonURLStr = buttonURL == null ? "" : buttonURL.toString();
+ String isLinkVisitedStr = isLinkVisited ? "true" : "false";
+ return super.paramString() + ",linkBehavior=" + str + ",linkURL=" + buttonURLStr + ",linkColor=" + colorStr
+ + ",activeLinkColor=" + colorPressStr + ",disabledLinkColor=" + disabledLinkColorStr
+ + ",visitedLinkColor=" + visitedLinkColorStr + ",linkvisitedString=" + isLinkVisitedStr;
+ }
+}
+
+class BasicLinkButtonUI extends MetalButtonUI {
+ private static final BasicLinkButtonUI ui = new BasicLinkButtonUI();
+
+ public BasicLinkButtonUI() {
+ }
+
+ public static ComponentUI createUI(JComponent jcomponent) {
+ return ui;
+ }
+
+ @Override
+ protected void paintText(Graphics g, JComponent com, Rectangle rect, String s) {
+ XBayaLinkButton bn = (XBayaLinkButton) com;
+ ButtonModel bnModel = bn.getModel();
+ if (bnModel.isEnabled()) {
+ if (bnModel.isPressed())
+ bn.setForeground(bn.getActiveLinkColor());
+ else if (bn.isLinkVisited())
+ bn.setForeground(bn.getVisitedLinkColor());
+
+ else
+ bn.setForeground(bn.getLinkColor());
+ } else {
+ if (bn.getDisabledLinkColor() != null)
+ bn.setForeground(bn.getDisabledLinkColor());
+ }
+ super.paintText(g, com, rect, s);
+ int behaviour = bn.getLinkBehavior();
+ boolean drawLine = false;
+ if (behaviour == XBayaLinkButton.HOVER_UNDERLINE) {
+ if (bnModel.isRollover())
+ drawLine = true;
+ } else if (behaviour == XBayaLinkButton.ALWAYS_UNDERLINE || behaviour == XBayaLinkButton.SYSTEM_DEFAULT)
+ drawLine = true;
+ if (!drawLine)
+ return;
+ FontMetrics fm = g.getFontMetrics();
+ int x = rect.x + getTextShiftOffset();
+ int y = (rect.y + fm.getAscent() + fm.getDescent() + getTextShiftOffset()) - 1;
+ if (bnModel.isEnabled()) {
+ g.setColor(bn.getForeground());
+ g.drawLine(x, y, (x + rect.width) - 1, y);
+ } else {
+ g.setColor(bn.getBackground().brighter());
+ g.drawLine(x, y, (x + rect.width) - 1, y);
+ }
+ }
+}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaList.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaList.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaList.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaList.java Mon Oct 31 06:48:11 2011
@@ -55,6 +55,7 @@ public class XBayaList<E> implements XBa
/**
* @return The swing component.
*/
+ @Override
public JScrollPane getSwingComponent() {
return getScrollPane();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java Mon Oct 31 06:48:11 2011
@@ -39,7 +39,6 @@ import org.apache.airavata.xbaya.experim
import org.apache.airavata.xbaya.file.gui.FileMenu;
import org.apache.airavata.xbaya.gpel.gui.GPELMenu;
import org.apache.airavata.xbaya.monitor.gui.MonitorMenu;
-import org.apache.airavata.xbaya.myproxy.gui.MyProxyMenu;
import org.apache.airavata.xbaya.pegasus.gui.PegasusMenu;
import org.apache.airavata.xbaya.wf.gui.WorkflowMenu;
@@ -94,6 +93,7 @@ public class XBayaMenu implements XBayaC
*
* @return The menu bar.
*/
+ @Override
public JMenuBar getSwingComponent() {
return this.menuBar;
}
@@ -131,6 +131,7 @@ public class XBayaMenu implements XBayaC
aboutItem.addActionListener(new AbstractAction() {
private AboutWindow window;
+ @Override
public void actionPerformed(ActionEvent event) {
if (this.window == null) {
this.window = new AboutWindow(XBayaMenu.this.engine);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaTextArea.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaTextArea.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaTextArea.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaTextArea.java Mon Oct 31 06:48:11 2011
@@ -53,6 +53,7 @@ public class XBayaTextArea implements XB
/**
* @return The swing component.
*/
+ @Override
public JScrollPane getSwingComponent() {
return getScrollPane();
}
@@ -60,6 +61,7 @@ public class XBayaTextArea implements XB
/**
* @param text
*/
+ @Override
public void setText(String text) {
if (text == null) {
text = "";
@@ -73,6 +75,7 @@ public class XBayaTextArea implements XB
/**
* @return The text
*/
+ @Override
public String getText() {
return this.textArea.getText().trim();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaTextField.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaTextField.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaTextField.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaTextField.java Mon Oct 31 06:48:11 2011
@@ -56,6 +56,7 @@ public class XBayaTextField implements X
/**
* @return The swing component.
*/
+ @Override
public JTextField getSwingComponent() {
return getTextField();
}
@@ -70,6 +71,7 @@ public class XBayaTextField implements X
/**
* @param text
*/
+ @Override
public void setText(String text) {
if (text == null) {
text = "";
@@ -83,6 +85,7 @@ public class XBayaTextField implements X
/**
* @return The text. It never returns null.
*/
+ @Override
public String getText() {
return this.textArea.getText().trim();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java Mon Oct 31 06:48:11 2011
@@ -91,6 +91,7 @@ public class XBayaToolBar implements XBa
*
* @return The toolbar
*/
+ @Override
public JComponent getSwingComponent() {
return this.toolbar;
}
@@ -106,6 +107,7 @@ public class XBayaToolBar implements XBa
addNodeButton.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
+ @Override
public void actionPerformed(ActionEvent event) {
try {
XBayaToolBar.this.engine.getGUI().addNode();
@@ -121,6 +123,7 @@ public class XBayaToolBar implements XBa
removeNodeButton.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
+ @Override
public void actionPerformed(ActionEvent event) {
try {
XBayaToolBar.this.engine.getGUI().getGraphCanvas().removeSelectedNode();
@@ -139,6 +142,7 @@ public class XBayaToolBar implements XBa
connectEdgeButton.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
+ @Override
public void actionPerformed(ActionEvent event) {
try {
XBayaToolBar.this.engine.getGUI().getGraphCanvas().addOrRemoveEdge();
@@ -157,6 +161,7 @@ public class XBayaToolBar implements XBa
/**
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e1) {
try {
Workflow workflow = engine.getWorkflow();
@@ -185,6 +190,7 @@ public class XBayaToolBar implements XBa
/**
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e2) {
try {
if (engine.getWorkflow().getExecutionState() == XBayaExecutionState.PAUSED) {
@@ -207,6 +213,7 @@ public class XBayaToolBar implements XBa
/**
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e1) {
try {
if (engine.getWorkflow().getExecutionState() != XBayaExecutionState.NONE
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XbayaEnhancedList.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XbayaEnhancedList.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XbayaEnhancedList.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XbayaEnhancedList.java Mon Oct 31 06:48:11 2011
@@ -91,6 +91,7 @@ public class XbayaEnhancedList<T extends
/**
* @return The swing component.
*/
+ @Override
public JScrollPane getSwingComponent() {
return getScrollPane();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/NameValue.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/NameValue.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/NameValue.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/NameValue.java Mon Oct 31 06:48:11 2011
@@ -144,6 +144,7 @@ public class NameValue implements org.ap
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, parentQName) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException {
NameValue.this.serialize(parentQName, factory, xmlWriter);
@@ -153,12 +154,14 @@ public class NameValue implements org.ap
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
@@ -414,6 +417,7 @@ public class NameValue implements org.ap
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
throws org.apache.axis2.databinding.ADBException {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java Mon Oct 31 06:48:11 2011
@@ -19,107 +19,107 @@
*
*/
-package org.apache.airavata.xbaya.interpretor;
-
-import java.net.URI;
-import java.util.List;
-
-import org.apache.airavata.common.utils.StringUtil;
-import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
-import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable;
-import org.apache.airavata.xbaya.jython.lib.StandaloneServiceNotificationSender;
-import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable;
-import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
-import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.addressing.EndpointReference;
-import org.python.core.PyObject;
-
-public class StandaloneNotificationSender implements WorkflowNotifiable {
-
- private Workflow workflow;
- private URI workflowID;
-
- public StandaloneNotificationSender(String topic, Workflow workflow) {
- this.workflow = workflow;
- this.workflowID = URI.create(StringUtil.convertToJavaIdentifier(topic));
- }
-
- @Override
- public EndpointReference getEventSink() {
- return new EndpointReference(XBayaConstants.DEFAULT_BROKER_URL.toString());
- }
-
- @Override
- public void workflowStarted(PyObject[] args, String[] keywords) {
- List<InputNode> inputs = GraphUtil.getInputNodes(this.workflow.getGraph());
- for (InputNode inputNode : inputs) {
- inputNode.getGUI().setBodyColor(NodeState.FINISHED.color);
- }
-
- }
-
- @Override
- public void workflowStarted(Object[] args, String[] keywords) {
- List<InputNode> inputs = GraphUtil.getInputNodes(this.workflow.getGraph());
- for (InputNode inputNode : inputs) {
- inputNode.getGUI().setBodyColor(NodeState.FINISHED.color);
- }
- }
-
- @Override
- public void workflowFinished(Object[] args, String[] keywords) {
- List<OutputNode> outputs = GraphUtil.getOutputNodes(this.workflow.getGraph());
- for (OutputNode outputNode : outputs) {
- outputNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
- }
-
- }
-
- @Override
- public void sendingPartialResults(Object[] args, String[] keywords) {
- // noop
-
- }
-
- @Override
- public void workflowFinished(PyObject[] args, String[] keywords) {
- List<OutputNode> outputs = GraphUtil.getOutputNodes(this.workflow.getGraph());
- for (OutputNode outputNode : outputs) {
- outputNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
- }
-
- }
-
- @Override
- public void workflowTerminated() {
- // noop
-
- }
-
- @Override
- public void workflowFailed(String message) {
- // noop
-
- }
-
- @Override
- public void workflowFailed(Throwable e) {
- // noop
-
- }
-
- @Override
- public void workflowFailed(String message, Throwable e) {
- // noop
-
- }
-
- @Override
- public ServiceNotifiable createServiceNotificationSender(String nodeID) {
- return new StandaloneServiceNotificationSender(this.workflow, this.workflowID);
- }
-
-}
+package org.apache.airavata.xbaya.interpretor;
+
+import java.net.URI;
+import java.util.List;
+
+import org.apache.airavata.common.utils.StringUtil;
+import org.apache.airavata.xbaya.XBayaConstants;
+import org.apache.airavata.xbaya.graph.system.InputNode;
+import org.apache.airavata.xbaya.graph.system.OutputNode;
+import org.apache.airavata.xbaya.graph.util.GraphUtil;
+import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable;
+import org.apache.airavata.xbaya.jython.lib.StandaloneServiceNotificationSender;
+import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable;
+import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
+import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.axis2.addressing.EndpointReference;
+import org.python.core.PyObject;
+
+public class StandaloneNotificationSender implements WorkflowNotifiable {
+
+ private Workflow workflow;
+ private URI workflowID;
+
+ public StandaloneNotificationSender(String topic, Workflow workflow) {
+ this.workflow = workflow;
+ this.workflowID = URI.create(StringUtil.convertToJavaIdentifier(topic));
+ }
+
+ @Override
+ public EndpointReference getEventSink() {
+ return new EndpointReference(XBayaConstants.DEFAULT_BROKER_URL.toString());
+ }
+
+ @Override
+ public void workflowStarted(PyObject[] args, String[] keywords) {
+ List<InputNode> inputs = GraphUtil.getInputNodes(this.workflow.getGraph());
+ for (InputNode inputNode : inputs) {
+ inputNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+ }
+
+ }
+
+ @Override
+ public void workflowStarted(Object[] args, String[] keywords) {
+ List<InputNode> inputs = GraphUtil.getInputNodes(this.workflow.getGraph());
+ for (InputNode inputNode : inputs) {
+ inputNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+ }
+ }
+
+ @Override
+ public void workflowFinished(Object[] args, String[] keywords) {
+ List<OutputNode> outputs = GraphUtil.getOutputNodes(this.workflow.getGraph());
+ for (OutputNode outputNode : outputs) {
+ outputNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
+ }
+
+ }
+
+ @Override
+ public void sendingPartialResults(Object[] args, String[] keywords) {
+ // noop
+
+ }
+
+ @Override
+ public void workflowFinished(PyObject[] args, String[] keywords) {
+ List<OutputNode> outputs = GraphUtil.getOutputNodes(this.workflow.getGraph());
+ for (OutputNode outputNode : outputs) {
+ outputNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
+ }
+
+ }
+
+ @Override
+ public void workflowTerminated() {
+ // noop
+
+ }
+
+ @Override
+ public void workflowFailed(String message) {
+ // noop
+
+ }
+
+ @Override
+ public void workflowFailed(Throwable e) {
+ // noop
+
+ }
+
+ @Override
+ public void workflowFailed(String message, Throwable e) {
+ // noop
+
+ }
+
+ @Override
+ public ServiceNotifiable createServiceNotificationSender(String nodeID) {
+ return new StandaloneServiceNotificationSender(this.workflow, this.workflowID);
+ }
+
+}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java Mon Oct 31 06:48:11 2011
@@ -30,13 +30,13 @@ import java.net.URISyntaxException;
import java.util.List;
import java.util.UUID;
+import org.apache.airavata.common.utils.Pair;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.component.ws.WSComponentPort;
import org.apache.airavata.xbaya.ode.ODEClient;
import org.apache.airavata.xbaya.security.SecurityUtil;
-import org.apache.airavata.common.utils.Pair;
import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.airavata.xbaya.workflow.proxy.WorkflowClient;
import org.apache.airavata.xbaya.workflow.proxy.WorkflowContext;
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=1195355&r1=1195354&r2=1195355&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 Oct 31 06:48:11 2011
@@ -155,7 +155,7 @@ public class WorkflowInterpreter {
private boolean isoffline = false;
- private PredicatedTaskRunner provenanceWriter;
+ private PredicatedTaskRunner provenanceWriter;
public WorkflowInterpreter(XBayaConfiguration configuration, String topic, Workflow workflow, String username,
String password) {
@@ -217,7 +217,7 @@ public class WorkflowInterpreter {
/**
*
* Constructs a WorkflowInterpreter.
- *
+ *
* @param engine
* @param topic
* @param workflow
@@ -239,10 +239,9 @@ public class WorkflowInterpreter {
this.topic = topic;
// testing
-
- if (this.configuration.isCollectProvenance()) {
- provenanceWriter = new PredicatedTaskRunner(1);
- }
+ if (this.configuration.isCollectProvenance()) {
+ provenanceWriter = new PredicatedTaskRunner(1);
+ }
}
@@ -393,7 +392,7 @@ public class WorkflowInterpreter {
* @throws MonitorException
*/
public void cleanup() throws MonitorException {
- if(this.configuration.isCollectProvenance()){
+ if (this.configuration.isCollectProvenance()) {
this.provenanceWriter.shutDown();
}
if (this.mode == GUI_MODE) {
@@ -1320,43 +1319,44 @@ public class WorkflowInterpreter {
return null;
}
- /**
- * @param node
- * @throws XBayaException
- * @throws java.io.IOException
- */
- private void readProvenance(Node node) {
+ /**
+ * @param node
+ * @throws XBayaException
+ * @throws java.io.IOException
+ */
+ private void readProvenance(Node node) {
- try {
- List<DataPort> inputPorts = node.getInputPorts();
- Pair<String, String>[] inputs = new Pair[inputPorts.size()];
- for (int i =0; i<inputPorts.size(); ++i) {
- inputs[i] = new Pair<String, String>(inputPorts.get(i).getName(), XBayaUtil.findInputFromPort(inputPorts.get(i), this.invokerMap).toString());
- }
-
- Object result = new ProvenanceReader().read(node.getID(), inputs);
- if(result != null){
- SystemComponentInvoker invoker = new SystemComponentInvoker();
- invoker.addOutput(node.getID(), result);
- this.invokerMap.put(node, invoker);
- node.getGUI().setBodyColor(NodeState.FINISHED.color);
- }
- } catch (Exception e) {
- throw new XBayaRuntimeException(e);
- }
-
- }
-
- /**
- * @param node
- * @throws XBayaException
- */
- private void writeProvenanceLater(Node node) throws XBayaException {
+ try {
+ List<DataPort> inputPorts = node.getInputPorts();
+ Pair<String, String>[] inputs = new Pair[inputPorts.size()];
+ for (int i = 0; i < inputPorts.size(); ++i) {
+ inputs[i] = new Pair<String, String>(inputPorts.get(i).getName(), XBayaUtil.findInputFromPort(
+ inputPorts.get(i), this.invokerMap).toString());
+ }
- if(node instanceof ForEachNode){
- node = XBayaUtil.findEndForEachFor((ForEachNode)node);
- }
- this.provenanceWriter.scedule(new ProvenanceWrite(node,
- this.workflow.getName(), invokerMap, this.topic,this.configuration.getJcrComponentRegistry().getRegistry()));
- }
+ Object result = new ProvenanceReader().read(node.getID(), inputs);
+ if (result != null) {
+ SystemComponentInvoker invoker = new SystemComponentInvoker();
+ invoker.addOutput(node.getID(), result);
+ this.invokerMap.put(node, invoker);
+ node.getGUI().setBodyColor(NodeState.FINISHED.color);
+ }
+ } catch (Exception e) {
+ throw new XBayaRuntimeException(e);
+ }
+
+ }
+
+ /**
+ * @param node
+ * @throws XBayaException
+ */
+ private void writeProvenanceLater(Node node) throws XBayaException {
+
+ if (node instanceof ForEachNode) {
+ node = XBayaUtil.findEndForEachFor((ForEachNode) node);
+ }
+ this.provenanceWriter.scedule(new ProvenanceWrite(node, this.workflow.getName(), invokerMap, this.topic,
+ this.configuration.getJcrComponentRegistry().getRegistry()));
+ }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java Mon Oct 31 06:48:11 2011
@@ -26,10 +26,7 @@ import java.net.URI;
import java.util.LinkedList;
import java.util.List;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.commons.WorkFlowUtils;
import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
import org.apache.airavata.wsmg.client.MsgBrokerClientException;
import org.apache.airavata.wsmg.client.NotificationHandler;
@@ -138,6 +135,7 @@ public class WorkflowInterpretorEventLis
/**
* @see org.apache.airavata.wsmg.client.NotificationHandler#handleNotification(java.lang.String)
*/
+ @Override
public void handleNotification(String message) {
try {
// String soapBody = WorkFlowUtils.getSoapBodyContent(message);
@@ -314,6 +312,7 @@ public class WorkflowInterpretorEventLis
/**
* @see org.apache.airavata.wsmg.client.NotificationHandler#handleNotification(java.lang.String)
*/
+ @Override
public void handleNotification(SOAPEnvelope message) {
String soapBody = message.getBody().toString();
this.handleNotification(soapBody);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java Mon Oct 31 06:48:11 2011
@@ -278,6 +278,7 @@ public class WorkflowInterpretorStub ext
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -291,6 +292,7 @@ public class WorkflowInterpretorStub ext
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault) error;
@@ -353,12 +355,14 @@ public class WorkflowInterpretorStub ext
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils
.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -504,6 +508,7 @@ public class WorkflowInterpretorStub ext
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException {
LaunchWorkflowResponse.this.serialize(MY_QNAME, factory, xmlWriter);
@@ -513,12 +518,14 @@ public class WorkflowInterpretorStub ext
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
@@ -748,6 +755,7 @@ public class WorkflowInterpretorStub ext
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
throws org.apache.axis2.databinding.ADBException {
@@ -1202,6 +1210,7 @@ public class WorkflowInterpretorStub ext
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException {
LaunchWorkflow.this.serialize(MY_QNAME, factory, xmlWriter);
@@ -1211,12 +1220,14 @@ public class WorkflowInterpretorStub ext
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
@@ -1670,6 +1681,7 @@ public class WorkflowInterpretorStub ext
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
throws org.apache.axis2.databinding.ADBException {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java Mon Oct 31 06:48:11 2011
@@ -22,7 +22,6 @@
package org.apache.airavata.xbaya.invoker;
import java.net.URI;
-import java.util.UUID;
import javax.xml.namespace.QName;
@@ -37,7 +36,6 @@ import xsul.lead.LeadContextHeader;
import xsul.wsdl.WsdlDefinitions;
import xsul.wsdl.WsdlResolver;
import xsul.wsif.WSIFMessage;
-import xsul.xhandler_soap_sticky_header.StickySoapHeaderHandler;
import xsul.xwsif_runtime.WSIFClient;
public class GFacInvoker implements Invoker {
@@ -81,6 +79,7 @@ public class GFacInvoker implements Invo
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setup()
*/
+ @Override
public void setup() throws XBayaException {
if (this.gfacURL == null) {
@@ -125,6 +124,7 @@ public class GFacInvoker implements Invo
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getClient()
*/
+ @Override
public WSIFClient getClient() {
return this.invoker.getClient();
}
@@ -133,6 +133,7 @@ public class GFacInvoker implements Invo
* @throws XBayaException
* @see org.apache.airavata.xbaya.invoker.Invoker#setOperation(java.lang.String)
*/
+ @Override
public void setOperation(String operationName) throws XBayaException {
this.invoker.setOperation(operationName);
}
@@ -141,6 +142,7 @@ public class GFacInvoker implements Invo
* @throws XBayaException
* @see org.apache.airavata.xbaya.invoker.Invoker#setInput(java.lang.String, java.lang.Object)
*/
+ @Override
public void setInput(String name, Object value) throws XBayaException {
this.invoker.setInput(name, value);
}
@@ -148,6 +150,7 @@ public class GFacInvoker implements Invo
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getInputs()
*/
+ @Override
public WSIFMessage getInputs() throws XBayaException {
return this.invoker.getInputs();
}
@@ -156,6 +159,7 @@ public class GFacInvoker implements Invo
* @throws XBayaException
* @see org.apache.airavata.xbaya.invoker.Invoker#invoke()
*/
+ @Override
public boolean invoke() throws XBayaException {
WSIFClient client = invoker.getClient();
@@ -176,6 +180,7 @@ public class GFacInvoker implements Invo
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getOutputs()
*/
+ @Override
public WSIFMessage getOutputs() throws XBayaException {
return this.invoker.getOutputs();
}
@@ -184,6 +189,7 @@ public class GFacInvoker implements Invo
* @throws XBayaException
* @see org.apache.airavata.xbaya.invoker.Invoker#getOutput(java.lang.String)
*/
+ @Override
public Object getOutput(String name) throws XBayaException {
return this.invoker.getOutput(name);
}
@@ -192,6 +198,7 @@ public class GFacInvoker implements Invo
* @throws XBayaException
* @see org.apache.airavata.xbaya.invoker.Invoker#getFault()
*/
+ @Override
public WSIFMessage getFault() throws XBayaException {
return this.invoker.getFault();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java Mon Oct 31 06:48:11 2011
@@ -36,8 +36,8 @@ import java.util.concurrent.TimeoutExcep
import javax.xml.namespace.QName;
-import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.invoker.factory.InvokerFactory;
@@ -156,7 +156,7 @@ public class GenericInvoker implements I
}
/**
- *
+ *
* @param portTypeQName
* @param wsdl
* @param nodeID
@@ -181,6 +181,7 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#setup()
*/
+ @Override
public void setup() throws XBayaException {
try {
WsdlDefinitions definitions = null;
@@ -257,6 +258,7 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#setOperation(java.lang.String)
*/
+ @Override
public void setOperation(String operationName) throws XBayaException {
try {
this.invoker.setOperation(operationName);
@@ -281,6 +283,7 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#setInput(java.lang.String, java.lang.Object)
*/
+ @Override
public void setInput(String name, Object value) throws XBayaException {
try {
if (value instanceof XmlElement) {
@@ -310,6 +313,7 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#invoke()
*/
+ @Override
public synchronized boolean invoke() throws XBayaException {
try {
WSIFMessage inputMessage = this.invoker.getInputs();
@@ -318,6 +322,7 @@ public class GenericInvoker implements I
ExecutorService executor = Executors.newSingleThreadExecutor();
this.result = executor.submit(new Callable<Boolean>() {
+ @Override
@SuppressWarnings("boxing")
public Boolean call() {
try {
@@ -441,6 +446,7 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#getOutput(java.lang.String)
*/
+ @Override
public Object getOutput(String name) throws XBayaException {
try {
waitToFinish();
@@ -472,6 +478,7 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#getOutputs()
*/
+ @Override
public WSIFMessage getOutputs() throws XBayaException {
return this.invoker.getOutputs();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java Mon Oct 31 06:48:11 2011
@@ -66,6 +66,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setup()
*/
+ @Override
public void setup() throws XBayaException {
try {
WSIFService service = WSIFServiceFactory.newInstance().getService(this.definitions);
@@ -80,6 +81,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getClient()
*/
+ @Override
public WSIFClient getClient() {
return this.client;
}
@@ -87,6 +89,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setOperation(java.lang.String)
*/
+ @Override
public void setOperation(String operationName) throws XBayaException {
try {
WSIFPort port = this.client.getPort();
@@ -103,6 +106,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setInput(java.lang.String, java.lang.Object)
*/
+ @Override
public void setInput(String name, Object value) throws XBayaException {
try {
if (value instanceof XmlElement) {
@@ -126,6 +130,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getInputs()
*/
+ @Override
public WSIFMessage getInputs() {
return this.inputMessage;
}
@@ -133,6 +138,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#invoke()
*/
+ @Override
public boolean invoke() throws XBayaException {
try {
boolean success = this.operation.executeRequestResponseOperation(this.inputMessage, this.outputMessage,
@@ -147,6 +153,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getOutputs()
*/
+ @Override
public WSIFMessage getOutputs() {
return this.outputMessage;
}
@@ -154,6 +161,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getOutput(java.lang.String)
*/
+ @Override
public Object getOutput(String name) throws XBayaException {
try {
// This code doesn't work when the output is a complex type.
@@ -188,6 +196,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getFault()
*/
+ @Override
public WSIFMessage getFault() {
return this.faultMessage;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java Mon Oct 31 06:48:11 2011
@@ -64,6 +64,7 @@ public class WorkflowInvokerWrapperForGF
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#invoke()
*/
+ @Override
public synchronized boolean invoke() throws XBayaException {
try {
@@ -73,6 +74,7 @@ public class WorkflowInvokerWrapperForGF
ExecutorService executor = Executors.newSingleThreadExecutor();
this.result = executor.submit(new Callable<Boolean>() {
+ @Override
@SuppressWarnings("boxing")
public Boolean call() {
try {
@@ -202,6 +204,7 @@ public class WorkflowInvokerWrapperForGF
}
}
+ @Override
public Object getOutput(String name) throws XBayaException {
try {
waitToFinish();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/factory/InvokerFactory.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/factory/InvokerFactory.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/factory/InvokerFactory.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/factory/InvokerFactory.java Mon Oct 31 06:48:11 2011
@@ -23,8 +23,8 @@ package org.apache.airavata.xbaya.invoke
import javax.xml.namespace.QName;
-import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.common.utils.WSDLUtil;
+import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.invoker.AsynchronousInvoker;
import org.apache.airavata.xbaya.invoker.GFacInvoker;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java Mon Oct 31 06:48:11 2011
@@ -263,6 +263,7 @@ public class JythonRunnerWindow {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
execute();
}
@@ -270,6 +271,7 @@ public class JythonRunnerWindow {
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/jython/lib/ServiceNotifiable.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotifiable.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotifiable.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotifiable.java Mon Oct 31 06:48:11 2011
@@ -19,64 +19,64 @@
*
*/
-package org.apache.airavata.xbaya.jython.lib;
-
-import java.net.URI;
-
-import org.apache.axis2.addressing.EndpointReference;
-
-import xsul.wsif.WSIFMessage;
-
-public interface ServiceNotifiable {
-
- /**
- * @param serviceID
- */
- public abstract void setServiceID(String serviceID);
-
- /**
- * @return The event sink.
- */
- public abstract EndpointReference getEventSink();
-
- /**
- * @return The workflow ID.
- */
- public abstract URI getWorkflowID();
-
- /**
- * @param inputs
- */
- public abstract void invokingService(WSIFMessage inputs);
-
- /**
- * @param outputs
- */
- public abstract void serviceFinished(WSIFMessage outputs);
-
- /**
- * Sends an InvokeServiceFinishedFailed notification message.
- *
- * @param message
- * The message to send
- * @param e
- */
- public abstract void invocationFailed(String message, Throwable e);
-
- /**
- * Sends a receivedFault notification message.
- *
- * @param message
- * The message to send
- */
- @Deprecated
- public abstract void receivedFault(String message);
-
- /**
- * Sends a receivedFault notification message.
- *
- * @param fault
- */
- public abstract void receivedFault(WSIFMessage fault);
-
+package org.apache.airavata.xbaya.jython.lib;
+
+import java.net.URI;
+
+import org.apache.axis2.addressing.EndpointReference;
+
+import xsul.wsif.WSIFMessage;
+
+public interface ServiceNotifiable {
+
+ /**
+ * @param serviceID
+ */
+ public abstract void setServiceID(String serviceID);
+
+ /**
+ * @return The event sink.
+ */
+ public abstract EndpointReference getEventSink();
+
+ /**
+ * @return The workflow ID.
+ */
+ public abstract URI getWorkflowID();
+
+ /**
+ * @param inputs
+ */
+ public abstract void invokingService(WSIFMessage inputs);
+
+ /**
+ * @param outputs
+ */
+ public abstract void serviceFinished(WSIFMessage outputs);
+
+ /**
+ * Sends an InvokeServiceFinishedFailed notification message.
+ *
+ * @param message
+ * The message to send
+ * @param e
+ */
+ public abstract void invocationFailed(String message, Throwable e);
+
+ /**
+ * Sends a receivedFault notification message.
+ *
+ * @param message
+ * The message to send
+ */
+ @Deprecated
+ public abstract void receivedFault(String message);
+
+ /**
+ * Sends a receivedFault notification message.
+ *
+ * @param fault
+ */
+ public abstract void receivedFault(WSIFMessage fault);
+
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java Mon Oct 31 06:48:11 2011
@@ -19,75 +19,72 @@
*
*/
-package org.apache.airavata.xbaya.jython.lib;
-
-import java.awt.Color;
-import java.net.URI;
-
-import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
-import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.addressing.EndpointReference;
-
-import xsul.wsif.WSIFMessage;
-
-public class StandaloneServiceNotificationSender implements ServiceNotifiable {
-
- private Workflow workflow;
- private String serviceID;
- private URI workflowID;
-
- public StandaloneServiceNotificationSender(Workflow workflow, URI workflowID) {
- this.workflow = workflow;
- this.workflowID = workflowID;
- }
-
- @Override
- public void setServiceID(String serviceID) {
- this.serviceID = serviceID;
- System.out.println(serviceID);
-
- }
-
- @Override
- public EndpointReference getEventSink() {
- return new EndpointReference(XBayaConstants.DEFAULT_BROKER_URL.toString());
- }
-
- @Override
- public URI getWorkflowID() {
- return this.workflowID;
- }
-
- @Override
- public void invokingService(WSIFMessage inputs) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.EXECUTING.color);
- }
-
- @Override
- public void serviceFinished(WSIFMessage outputs) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FINISHED.color);
-
- }
-
- @Override
- public void invocationFailed(String message, Throwable e) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
-
- }
-
- @Override
- public void receivedFault(String message) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
-
- }
-
- @Override
- public void receivedFault(WSIFMessage fault) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
-
- }
-
-}
+package org.apache.airavata.xbaya.jython.lib;
+
+import java.net.URI;
+
+import org.apache.airavata.xbaya.XBayaConstants;
+import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
+import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.axis2.addressing.EndpointReference;
+
+import xsul.wsif.WSIFMessage;
+
+public class StandaloneServiceNotificationSender implements ServiceNotifiable {
+
+ private Workflow workflow;
+ private String serviceID;
+ private URI workflowID;
+
+ public StandaloneServiceNotificationSender(Workflow workflow, URI workflowID) {
+ this.workflow = workflow;
+ this.workflowID = workflowID;
+ }
+
+ @Override
+ public void setServiceID(String serviceID) {
+ this.serviceID = serviceID;
+ System.out.println(serviceID);
+
+ }
+
+ @Override
+ public EndpointReference getEventSink() {
+ return new EndpointReference(XBayaConstants.DEFAULT_BROKER_URL.toString());
+ }
+
+ @Override
+ public URI getWorkflowID() {
+ return this.workflowID;
+ }
+
+ @Override
+ public void invokingService(WSIFMessage inputs) {
+ this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.EXECUTING.color);
+ }
+
+ @Override
+ public void serviceFinished(WSIFMessage outputs) {
+ this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FINISHED.color);
+
+ }
+
+ @Override
+ public void invocationFailed(String message, Throwable e) {
+ this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
+
+ }
+
+ @Override
+ public void receivedFault(String message) {
+ this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
+
+ }
+
+ @Override
+ public void receivedFault(WSIFMessage fault) {
+ this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
+
+ }
+
+}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/WorkflowNotifiable.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/WorkflowNotifiable.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/WorkflowNotifiable.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/WorkflowNotifiable.java Mon Oct 31 06:48:11 2011
@@ -19,70 +19,70 @@
*
*/
-package org.apache.airavata.xbaya.jython.lib;
-
-import org.apache.axis2.addressing.EndpointReference;
-import org.python.core.PyObject;
-
-public interface WorkflowNotifiable {
-
- /**
- * @return The event sink EPR.
- */
- public abstract EndpointReference getEventSink();
-
- /**
- * @param args
- * @param keywords
- */
- public abstract void workflowStarted(PyObject[] args, String[] keywords);
-
- public abstract void workflowStarted(Object[] args, String[] keywords);
-
- /**
- * @param args
- * @param keywords
- */
- public abstract void workflowFinished(Object[] args, String[] keywords);
-
- public abstract void sendingPartialResults(Object[] args, String[] keywords);
-
- /**
- * @param args
- * @param keywords
- */
- public abstract void workflowFinished(PyObject[] args, String[] keywords);
-
- public abstract void workflowTerminated();
-
- /**
- * Sends a START_INCOMPLETED notification message.
- *
- * @param message
- * The message to send
- */
- public abstract void workflowFailed(String message);
-
- /**
- * Sends a START_INCOMPLETED notification message.
- *
- * @param e
- */
- public abstract void workflowFailed(Throwable e);
-
- /**
- * Sends a START_INCOMPLETED notification message.
- *
- * @param message
- * The message to send
- * @param e
- */
- public abstract void workflowFailed(String message, Throwable e);
-
- /**
- * @param nodeID
- * @return The ServiceNoficationSender created.
- */
- public abstract ServiceNotifiable createServiceNotificationSender(String nodeID);
-
+package org.apache.airavata.xbaya.jython.lib;
+
+import org.apache.axis2.addressing.EndpointReference;
+import org.python.core.PyObject;
+
+public interface WorkflowNotifiable {
+
+ /**
+ * @return The event sink EPR.
+ */
+ public abstract EndpointReference getEventSink();
+
+ /**
+ * @param args
+ * @param keywords
+ */
+ public abstract void workflowStarted(PyObject[] args, String[] keywords);
+
+ public abstract void workflowStarted(Object[] args, String[] keywords);
+
+ /**
+ * @param args
+ * @param keywords
+ */
+ public abstract void workflowFinished(Object[] args, String[] keywords);
+
+ public abstract void sendingPartialResults(Object[] args, String[] keywords);
+
+ /**
+ * @param args
+ * @param keywords
+ */
+ public abstract void workflowFinished(PyObject[] args, String[] keywords);
+
+ public abstract void workflowTerminated();
+
+ /**
+ * Sends a START_INCOMPLETED notification message.
+ *
+ * @param message
+ * The message to send
+ */
+ public abstract void workflowFailed(String message);
+
+ /**
+ * Sends a START_INCOMPLETED notification message.
+ *
+ * @param e
+ */
+ public abstract void workflowFailed(Throwable e);
+
+ /**
+ * Sends a START_INCOMPLETED notification message.
+ *
+ * @param message
+ * The message to send
+ * @param e
+ */
+ public abstract void workflowFailed(String message, Throwable e);
+
+ /**
+ * @param nodeID
+ * @return The ServiceNoficationSender created.
+ */
+ public abstract ServiceNotifiable createServiceNotificationSender(String nodeID);
+
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java Mon Oct 31 06:48:11 2011
@@ -41,10 +41,12 @@ public class JythonOneTimeRunnerImpl imp
* @throws XBayaException
* @see org.apache.airavata.xbaya.jython.runner.JythonOneTimeRunner#run(java.lang.String, java.lang.String[])
*/
+ @Override
public void run(final String script, final String[] arguments) throws XBayaException {
try {
AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
+ @Override
public Void run() {
ClassLoader loader = this.getClass().getClassLoader();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonRunner.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonRunner.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonRunner.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonRunner.java Mon Oct 31 06:48:11 2011
@@ -19,55 +19,55 @@
*
*/
-package org.apache.airavata.xbaya.jython.runner;
-
-import java.util.List;
-
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
-
-public class JythonRunner {
-
- private JythonClassLoader loader;
-
- /**
- *
- * Constructs a JythonRunner.
- *
- */
- public JythonRunner() {
- this.loader = new JythonClassLoader(this.getClass().getClassLoader());
- }
-
- /**
- * @param script
- * @param arguments
- * @throws XBayaException
- */
- public void run(String script, List<String> arguments) throws XBayaException {
- run(script, arguments.toArray(new String[arguments.size()]));
- }
-
- /**
- * @param script
- * @param arguments
- * @throws XBayaException
- */
- public void run(final String script, final String[] arguments) throws XBayaException {
- try {
- Class<?> runnerClass = this.loader.loadClass(JythonOneTimeRunnerImpl.class.getName(), true);
- JythonOneTimeRunner runner = (JythonOneTimeRunner) runnerClass.newInstance();
- runner.run(script, arguments);
-
- } catch (ClassNotFoundException e) {
- throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
- } catch (InstantiationException e) {
- throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
- } catch (IllegalAccessException e) {
- throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
- } finally {
- loader.cleanUp();
- }
- }
+package org.apache.airavata.xbaya.jython.runner;
+
+import java.util.List;
+
+import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.xbaya.XBayaRuntimeException;
+import org.apache.airavata.xbaya.gui.ErrorMessages;
+
+public class JythonRunner {
+
+ private JythonClassLoader loader;
+
+ /**
+ *
+ * Constructs a JythonRunner.
+ *
+ */
+ public JythonRunner() {
+ this.loader = new JythonClassLoader(this.getClass().getClassLoader());
+ }
+
+ /**
+ * @param script
+ * @param arguments
+ * @throws XBayaException
+ */
+ public void run(String script, List<String> arguments) throws XBayaException {
+ run(script, arguments.toArray(new String[arguments.size()]));
+ }
+
+ /**
+ * @param script
+ * @param arguments
+ * @throws XBayaException
+ */
+ public void run(final String script, final String[] arguments) throws XBayaException {
+ try {
+ Class<?> runnerClass = this.loader.loadClass(JythonOneTimeRunnerImpl.class.getName(), true);
+ JythonOneTimeRunner runner = (JythonOneTimeRunner) runnerClass.newInstance();
+ runner.run(script, arguments);
+
+ } catch (ClassNotFoundException e) {
+ throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
+ } catch (InstantiationException e) {
+ throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
+ } catch (IllegalAccessException e) {
+ throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
+ } finally {
+ loader.cleanUp();
+ }
+ }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java Mon Oct 31 06:48:11 2011
@@ -29,8 +29,8 @@ import org.apache.airavata.xbaya.XBayaCo
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.wf.Workflow;
-
import org.apache.axis2.addressing.EndpointReference;
+
import xsul.lead.LeadContextHeader;
import xsul.ws_addressing.WsaEndpointReference;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java Mon Oct 31 06:48:11 2011
@@ -104,6 +104,7 @@ public class Monitor extends EventProduc
/**
* @see org.apache.airavata.xbaya.monitor.EventFilter#isAcceptable(org.apache.airavata.xbaya.monitor.MonitorEvent)
*/
+ @Override
public boolean isAcceptable(MonitorEvent event) {
return event != null && event.getNodeID() != null && event.getNodeID().equals(nodeID);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java Mon Oct 31 06:48:11 2011
@@ -24,10 +24,10 @@ package org.apache.airavata.xbaya.monito
import java.net.URI;
import java.util.List;
+import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.xbaya.event.Event;
import org.apache.airavata.xbaya.event.Event.Type;
import org.apache.airavata.xbaya.event.EventProducer;
-import org.apache.airavata.common.utils.StringUtil;
public class MonitorConfiguration extends EventProducer {