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 [8/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/org...
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ConstantNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ConstantNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ConstantNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ConstantNode.java Mon Oct 31 20:56:37 2011
@@ -78,7 +78,6 @@ public class ConstantNode extends System
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new ConstantNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndBlockNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndBlockNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndBlockNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndBlockNode.java Mon Oct 31 20:56:37 2011
@@ -64,7 +64,6 @@ public class EndBlockNode extends System
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new EndBlockNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndForEachNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndForEachNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndForEachNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndForEachNode.java Mon Oct 31 20:56:37 2011
@@ -68,7 +68,6 @@ public class EndForEachNode extends Syst
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new EndForEachNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndifNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndifNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndifNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndifNode.java Mon Oct 31 20:56:37 2011
@@ -64,7 +64,6 @@ public class EndifNode extends SystemNod
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new EndifNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ExitNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ExitNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ExitNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ExitNode.java Mon Oct 31 20:56:37 2011
@@ -51,7 +51,6 @@ public class ExitNode extends SystemNode
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (gui == null) {
this.gui = new ExitNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ForEachNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ForEachNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ForEachNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ForEachNode.java Mon Oct 31 20:56:37 2011
@@ -68,7 +68,6 @@ public class ForEachNode extends SystemN
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new ForEachNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/IfNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/IfNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/IfNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/IfNode.java Mon Oct 31 20:56:37 2011
@@ -86,7 +86,6 @@ public class IfNode extends SystemNode {
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new IfNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/InputNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/InputNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/InputNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/InputNode.java Mon Oct 31 20:56:37 2011
@@ -76,7 +76,6 @@ public class InputNode extends Parameter
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new InputNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/MemoNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/MemoNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/MemoNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/MemoNode.java Mon Oct 31 20:56:37 2011
@@ -77,7 +77,6 @@ public class MemoNode extends SystemNode
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new MemoNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/OutputNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/OutputNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/OutputNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/OutputNode.java Mon Oct 31 20:56:37 2011
@@ -67,7 +67,6 @@ public class OutputNode extends Paramete
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new OutputNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ReceiveNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ReceiveNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ReceiveNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ReceiveNode.java Mon Oct 31 20:56:37 2011
@@ -60,7 +60,6 @@ public class ReceiveNode extends SystemN
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new ReceiveNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java Mon Oct 31 20:56:37 2011
@@ -76,7 +76,6 @@ public class S3InputNode extends InputNo
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new S3InputNodeGUI(this);
@@ -121,7 +120,6 @@ public class S3InputNode extends InputNo
*
* @return The defaultValue.
*/
- @Override
public Object getDefaultValue() {
return this.defaultValue;
}
@@ -132,7 +130,6 @@ public class S3InputNode extends InputNo
* @param defaultValue
* The default value to set.
*/
- @Override
public void setDefaultValue(Object defaultValue) {
this.defaultValue = defaultValue;
}
@@ -166,7 +163,6 @@ public class S3InputNode extends InputNo
* The user input
* @return true if the user input is valid against the parameter type; false otherwise
*/
- @Override
public boolean isInputValid(String input) {
logger.debug("Input:" + input);
// TODO type checks
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemNode.java Mon Oct 31 20:56:37 2011
@@ -25,7 +25,6 @@ import java.util.List;
import javax.xml.namespace.QName;
-import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.graph.DataEdge;
import org.apache.airavata.xbaya.graph.DataPort;
@@ -36,6 +35,7 @@ import org.apache.airavata.xbaya.graph.G
import org.apache.airavata.xbaya.graph.Port;
import org.apache.airavata.xbaya.graph.impl.NodeImpl;
import org.apache.airavata.xbaya.graph.util.GraphUtil;
+import org.apache.airavata.common.utils.WSConstants;
import org.xmlpull.infoset.XmlElement;
public abstract class SystemNode extends NodeImpl {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -190,7 +190,6 @@ public class ConstantConfigurationDialog
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setInput();
}
@@ -198,7 +197,6 @@ public class ConstantConfigurationDialog
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/graph/system/gui/EndBlockConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -141,7 +141,6 @@ public class EndBlockConfigurationDialog
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setInput();
}
@@ -149,7 +148,6 @@ public class EndBlockConfigurationDialog
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/graph/system/gui/EndForEachConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -139,7 +139,6 @@ public class EndForEachConfigurationDial
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setInput();
}
@@ -147,7 +146,6 @@ public class EndForEachConfigurationDial
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/graph/system/gui/EndifConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -141,7 +141,6 @@ public class EndifConfigurationDialog {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setInput();
}
@@ -149,7 +148,6 @@ public class EndifConfigurationDialog {
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/graph/system/gui/ForEachConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -139,7 +139,6 @@ public class ForEachConfigurationDialog
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setInput();
}
@@ -147,7 +146,6 @@ public class ForEachConfigurationDialog
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/graph/system/gui/IfConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -167,7 +167,6 @@ public class IfConfigurationDialog {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setInput();
}
@@ -175,7 +174,6 @@ public class IfConfigurationDialog {
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/graph/system/gui/InputConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -221,7 +221,6 @@ public class InputConfigurationDialog {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setInput();
}
@@ -229,7 +228,6 @@ public class InputConfigurationDialog {
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/graph/system/gui/InputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputNodeGUI.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputNodeGUI.java Mon Oct 31 20:56:37 2011
@@ -69,7 +69,6 @@ public class InputNodeGUI extends Config
return this.inputNode;
}
- @Override
protected void setSelectedFlag(boolean flag) {
this.selected = flag;
if (this.selected) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -92,7 +92,6 @@ public class MemoConfigurationDialog {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setInput();
}
@@ -100,7 +99,6 @@ public class MemoConfigurationDialog {
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/graph/system/gui/OutputConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -150,7 +150,6 @@ public class OutputConfigurationDialog {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setInput();
}
@@ -158,7 +157,6 @@ public class OutputConfigurationDialog {
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/graph/system/gui/OutputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java Mon Oct 31 20:56:37 2011
@@ -22,10 +22,13 @@
package org.apache.airavata.xbaya.graph.system.gui;
import java.awt.Color;
+import java.net.MalformedURLException;
import java.net.URL;
+import org.apache.airavata.common.exception.UtilsException;
import org.apache.airavata.common.utils.BrowserLauncher;
import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.graph.system.OutputNode;
public class OutputNodeGUI extends ConfigurableNodeGUI {
@@ -79,7 +82,6 @@ public class OutputNodeGUI extends Confi
}
- @Override
protected void setSelectedFlag(boolean flag) {
this.selected = flag;
if (this.selected) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -137,7 +137,6 @@ public class ReceiveConfigurationDialog
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setInput();
}
@@ -145,7 +144,6 @@ public class ReceiveConfigurationDialog
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/graph/system/gui/S3InputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/S3InputNodeGUI.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/S3InputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/S3InputNodeGUI.java Mon Oct 31 20:56:37 2011
@@ -69,7 +69,6 @@ public class S3InputNodeGUI extends Conf
return this.inputNode;
}
- @Override
protected void setSelectedFlag(boolean flag) {
this.selected = flag;
if (this.selected) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java Mon Oct 31 20:56:37 2011
@@ -105,7 +105,6 @@ public class StreamSourceConfigurationDi
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setInput();
}
@@ -113,7 +112,6 @@ public class StreamSourceConfigurationDi
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/graph/system/gui/StreamSourceNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceNode.java Mon Oct 31 20:56:37 2011
@@ -72,7 +72,6 @@ public class StreamSourceNode extends Pa
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new StreamSourceNodeGUI(this);
@@ -167,7 +166,6 @@ public class StreamSourceNode extends Pa
return this.label;
}
- @Override
public XmlElement toXML() {
XmlElement xml = super.toXML();
xml.setAttributeValue(GraphSchema.NS, GraphSchema.NODE_TYPE_ATTRIBUTE, GraphSchema.NODE_TYPE_STREAM_SOURCE);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java Mon Oct 31 20:56:37 2011
@@ -37,7 +37,6 @@ import java.util.Set;
import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.Pair;
-import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.component.dynamic.GenericSubWorkflowComponent;
@@ -61,6 +60,7 @@ import org.apache.airavata.xbaya.graph.w
import org.apache.airavata.xbaya.graph.ws.WSNode;
import org.apache.airavata.xbaya.graph.ws.WSPort;
import org.apache.airavata.xbaya.gui.ErrorMessages;
+import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.xbaya.wf.Workflow;
public class GraphUtil {
@@ -159,7 +159,6 @@ public class GraphUtil {
public static <T extends Node> List<T> sortByName(Collection<T> nodes) {
List<T> nodeList = new LinkedList<T>(nodes);
Comparator<Node> nameComparator = new Comparator<Node>() {
- @Override
public int compare(Node node1, Node node2) {
String name1 = node1.getName();
String name2 = node2.getName();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java Mon Oct 31 20:56:37 2011
@@ -24,7 +24,6 @@ package org.apache.airavata.xbaya.graph.
import java.io.File;
import java.io.IOException;
-import org.apache.airavata.common.utils.IOUtil;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.graph.ControlEdge;
@@ -58,6 +57,7 @@ import org.apache.airavata.xbaya.graph.s
import org.apache.airavata.xbaya.graph.system.SystemDataPort;
import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode;
import org.apache.airavata.xbaya.gui.ErrorMessages;
+import org.apache.airavata.common.utils.IOUtil;
import org.xmlpull.infoset.XmlElement;
/**
@@ -121,7 +121,6 @@ public class WSGraphFactory implements G
/**
* @see org.apache.airavata.xbaya.graph.GraphFactory#createNode(org.xmlpull.infoset.XmlElement)
*/
- @Override
public NodeImpl createNode(XmlElement nodeElement) throws GraphException {
String type = nodeElement.attributeValue(GraphSchema.NS, GraphSchema.NODE_TYPE_ATTRIBUTE);
if (type == null) {
@@ -174,7 +173,6 @@ public class WSGraphFactory implements G
/**
* @see org.apache.airavata.xbaya.graph.GraphFactory#createPort(org.xmlpull.infoset.XmlElement)
*/
- @Override
public PortImpl createPort(XmlElement portElement) {
String type = portElement.attributeValue(GraphSchema.NS, GraphSchema.PORT_TYPE_ATTRIBUTE);
if (type == null) {
@@ -205,7 +203,6 @@ public class WSGraphFactory implements G
* @see org.apache.airavata.xbaya.graph.GraphFactory#createEdge(org.apache.airavata.xbaya.graph.Port,
* org.apache.airavata.xbaya.graph.Port)
*/
- @Override
public EdgeImpl createEdge(Port fromPort, Port toPort) {
Kind fromKind = fromPort.getKind();
Kind toKind = toPort.getKind();
@@ -228,7 +225,6 @@ public class WSGraphFactory implements G
/**
* @see org.apache.airavata.xbaya.graph.GraphFactory#createEdge(org.xmlpull.infoset.XmlElement)
*/
- @Override
public EdgeImpl createEdge(XmlElement edgeElement) {
String type = edgeElement.attributeValue(GraphSchema.NS, GraphSchema.EDGE_TYPE_ATTRIBUTE);
EdgeImpl edge;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java Mon Oct 31 20:56:37 2011
@@ -26,11 +26,7 @@ import javax.xml.namespace.QName;
import org.apache.airavata.xbaya.component.ComponentException;
import org.apache.airavata.xbaya.component.ws.WSComponent;
import org.apache.airavata.xbaya.component.ws.WSComponentFactory;
-import org.apache.airavata.xbaya.graph.Edge;
-import org.apache.airavata.xbaya.graph.ForEachExecutableNode;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.GraphSchema;
+import org.apache.airavata.xbaya.graph.*;
import org.apache.airavata.xbaya.graph.gui.NodeGUI;
import org.apache.airavata.xbaya.graph.impl.NodeImpl;
import org.apache.airavata.xbaya.graph.util.GraphUtil;
@@ -38,7 +34,7 @@ import org.apache.airavata.xbaya.graph.w
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.xmlpull.infoset.XmlElement;
-public class WSNode extends NodeImpl implements ForEachExecutableNode {
+public class WSNode extends NodeImpl implements ForEachExecutableNode{
protected String wsdlID;
@@ -70,7 +66,6 @@ public class WSNode extends NodeImpl imp
/**
* @see org.apache.airavata.xbaya.graph.Node#getGUI()
*/
- @Override
public NodeGUI getGUI() {
if (this.gui == null) {
this.gui = new WSNodeGUI(this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeGUI.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeGUI.java Mon Oct 31 20:56:37 2011
@@ -80,7 +80,6 @@ public class WSNodeGUI extends NodeGUI {
}
- @Override
protected void calculatePositions(Graphics g) {
super.calculatePositions(g);
@@ -102,7 +101,6 @@ public class WSNodeGUI extends NodeGUI {
}
- @Override
public void mouseClicked(MouseEvent event, XBayaEngine engine) {
if (event.getClickCount() >= 2) {
showWindow(engine);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java Mon Oct 31 20:56:37 2011
@@ -126,7 +126,6 @@ public class WSNodeWindow {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java Mon Oct 31 20:56:37 2011
@@ -252,7 +252,6 @@ public class GridChemRunnerWindow {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
execute();
}
@@ -260,7 +259,6 @@ public class GridChemRunnerWindow {
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/gridftp/GridFtpClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridftp/GridFtpClient.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridftp/GridFtpClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridftp/GridFtpClient.java Mon Oct 31 20:56:37 2011
@@ -80,7 +80,6 @@ public class GridFtpClient implements Ma
/**
* @see org.globus.ftp.MarkerListener#markerArrived(org.globus.ftp.Marker)
*/
- @Override
public void markerArrived(Marker arg0) {
// TODO Auto-generated method stub
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java Mon Oct 31 20:56:37 2011
@@ -75,7 +75,6 @@ public class AboutWindow {
JButton okButton = new JButton("OK");
okButton.setDefaultCapable(true);
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
@@ -89,7 +88,6 @@ public class AboutWindow {
editorPane.setEditable(false);
editorPane.setBackground(buttonPanel.getBackground());
editorPane.addHyperlinkListener(new HyperlinkListener() {
- @Override
public void hyperlinkUpdate(HyperlinkEvent event) {
logger.debug("Event:" + event);
if (event.getEventType() == EventType.ACTIVATED) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorWindow.java Mon Oct 31 20:56:37 2011
@@ -229,7 +229,6 @@ public class ErrorWindow {
buttonPanel);
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent event) {
dialog.hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/GridPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/GridPanel.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/GridPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/GridPanel.java Mon Oct 31 20:56:37 2011
@@ -65,7 +65,6 @@ public class GridPanel implements XBayaC
/**
* @see org.apache.airavata.xbaya.gui.XBayaComponent#getSwingComponent()
*/
- @Override
public JComponent getSwingComponent() {
return this.rootComponent;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/PortViewer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/PortViewer.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/PortViewer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/PortViewer.java Mon Oct 31 20:56:37 2011
@@ -109,7 +109,6 @@ public class PortViewer implements Graph
/**
* @see org.apache.airavata.xbaya.graph.gui.GraphCanvasListener#graphCanvasChanged(org.apache.airavata.xbaya.graph.gui.GraphCanvasEvent)
*/
- @Override
public void graphCanvasChanged(GraphCanvasEvent event) {
GraphCanvasEventType type = event.getType();
GraphCanvas graphCanvas = event.getGraphCanvas();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ScrollPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ScrollPanel.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ScrollPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ScrollPanel.java Mon Oct 31 20:56:37 2011
@@ -85,7 +85,6 @@ public class ScrollPanel implements XBay
/**
* @see org.apache.airavata.xbaya.gui.XBayaComponent#getSwingComponent()
*/
- @Override
public JPanel getSwingComponent() {
return getPanel();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/WaitDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/WaitDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/WaitDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/WaitDialog.java Mon Oct 31 20:56:37 2011
@@ -111,7 +111,6 @@ public class WaitDialog {
JLabel label = new JLabel(this.message, SwingConstants.CENTER);
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
WaitDialog.this.dialog.hide();
WaitDialog.this.cancelable.cancel();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaComboBox.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaComboBox.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaComboBox.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaComboBox.java Mon Oct 31 20:56:37 2011
@@ -47,7 +47,6 @@ public class XBayaComboBox implements XB
/**
* @return The swing component.
*/
- @Override
public JComboBox getSwingComponent() {
return getJComboBox();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java Mon Oct 31 20:56:37 2011
@@ -136,7 +136,6 @@ public class XBayaGUI implements EventLi
this.engine.getMonitor().addEventListener(this);
try {
SwingUtilities.invokeAndWait(new Runnable() {
- @Override
public void run() {
init();
}
@@ -232,7 +231,6 @@ public class XBayaGUI implements EventLi
newGraphCanvas.addGraphCanvasListener(this.portViewer);
newGraphCanvas.addGraphCanvasListener(new GraphCanvasListener() {
- @Override
public void graphCanvasChanged(GraphCanvasEvent event) {
GraphCanvasEventType type = event.getType();
final GraphCanvas graphCanvas = event.getGraphCanvas();
@@ -241,7 +239,6 @@ public class XBayaGUI implements EventLi
case GRAPH_LOADED:
case NAME_CHANGED:
SwingUtilities.invokeLater(new Runnable() {
- @Override
public void run() {
String name = workflow.getName();
@@ -341,7 +338,6 @@ public class XBayaGUI implements EventLi
XBayaGUI.this.graphPanelMaximized = true;
SwingUtilities.invokeLater(new Runnable() {
- @Override
public void run() {
XBayaGUI.this.previousMainDividerLocation = XBayaGUI.this.mainSplitPane.getDividerLocation();
XBayaGUI.this.previousRightDividerLocation = XBayaGUI.this.rightSplitPane.getDividerLocation();
@@ -360,7 +356,6 @@ public class XBayaGUI implements EventLi
XBayaGUI.this.graphPanelMaximized = false;
SwingUtilities.invokeLater(new Runnable() {
- @Override
public void run() {
XBayaGUI.this.mainSplitPane.setDividerLocation(XBayaGUI.this.previousMainDividerLocation);
XBayaGUI.this.rightSplitPane.setDividerLocation(XBayaGUI.this.previousRightDividerLocation);
@@ -379,7 +374,6 @@ public class XBayaGUI implements EventLi
/**
* @see org.apache.airavata.xbaya.event.EventListener#eventReceived(org.apache.airavata.xbaya.event.Event)
*/
- @Override
public void eventReceived(Event event) {
Type type = event.getType();
if (type == Type.MONITOR_STARTED || type == Type.KARMA_STARTED) {
@@ -443,7 +437,6 @@ public class XBayaGUI implements EventLi
}
});
this.graphTabbedPane.addChangeListener(new ChangeListener() {
- @Override
public void stateChanged(ChangeEvent event) {
// Called when the active tab changed.
// Note that this is not called when a tab is removed.
@@ -545,7 +538,6 @@ public class XBayaGUI implements EventLi
JMenuItem addMenuItem = new JMenuItem("Add to workspace");
addMenuItem.addActionListener(new ActionListener() {
- @Override
public void actionPerformed(ActionEvent e) {
String stream = model.getStream(row);
@@ -563,7 +555,6 @@ public class XBayaGUI implements EventLi
JMenuItem startMenuItem = new JMenuItem("Refresh All");
startMenuItem.addActionListener(new ActionListener() {
- @Override
public void actionPerformed(ActionEvent e) {
model.init();
model.fireTableDataChanged();
@@ -579,7 +570,6 @@ public class XBayaGUI implements EventLi
/**
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
- @Override
public void actionPerformed(ActionEvent e) {
model.stopStream(row);
@@ -589,12 +579,10 @@ public class XBayaGUI implements EventLi
return popupMenu;
}
- @Override
public void mousePressed(MouseEvent e) {
maybeShowPopup(e);
}
- @Override
public void mouseReleased(MouseEvent e) {
maybeShowPopup(e);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaLabel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaLabel.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaLabel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaLabel.java Mon Oct 31 20:56:37 2011
@@ -55,7 +55,6 @@ public class XBayaLabel implements XBaya
/**
* @see org.apache.airavata.xbaya.gui.XBayaComponent#getSwingComponent()
*/
- @Override
public JLabel getSwingComponent() {
return getJLabel();
}
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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -19,292 +19,288 @@
*
*/
-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);
- }
-
- @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);
- }
- }
-}
+ */
+ 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);
+ }
+ }
+}
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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -55,7 +55,6 @@ 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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -39,6 +39,7 @@ 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;
@@ -93,7 +94,6 @@ public class XBayaMenu implements XBayaC
*
* @return The menu bar.
*/
- @Override
public JMenuBar getSwingComponent() {
return this.menuBar;
}
@@ -131,7 +131,6 @@ 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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -53,7 +53,6 @@ public class XBayaTextArea implements XB
/**
* @return The swing component.
*/
- @Override
public JScrollPane getSwingComponent() {
return getScrollPane();
}
@@ -61,7 +60,6 @@ public class XBayaTextArea implements XB
/**
* @param text
*/
- @Override
public void setText(String text) {
if (text == null) {
text = "";
@@ -75,7 +73,6 @@ 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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -56,7 +56,6 @@ public class XBayaTextField implements X
/**
* @return The swing component.
*/
- @Override
public JTextField getSwingComponent() {
return getTextField();
}
@@ -71,7 +70,6 @@ public class XBayaTextField implements X
/**
* @param text
*/
- @Override
public void setText(String text) {
if (text == null) {
text = "";
@@ -85,7 +83,6 @@ 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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -91,7 +91,6 @@ public class XBayaToolBar implements XBa
*
* @return The toolbar
*/
- @Override
public JComponent getSwingComponent() {
return this.toolbar;
}
@@ -107,7 +106,6 @@ 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();
@@ -123,7 +121,6 @@ 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();
@@ -142,7 +139,6 @@ 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();
@@ -161,7 +157,6 @@ 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();
@@ -190,7 +185,6 @@ 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) {
@@ -213,7 +207,6 @@ 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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -91,7 +91,6 @@ 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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -144,7 +144,6 @@ 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);
@@ -154,14 +153,12 @@ 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 {
@@ -417,7 +414,6 @@ 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 {