You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/05/18 17:44:32 UTC

svn commit: r1340137 [4/5] - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: ./ appwrapper/ component/registry/ core/ core/amazon/ core/generators/ core/ide/ core/workflow/ graph/controller/ interpretor/ invoker/...

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConstantNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConstantNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConstantNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ConstantNodeGUI.java Fri May 18 15:44:22 2012
@@ -23,7 +23,8 @@ package org.apache.airavata.xbaya.ui.gra
 
 import org.apache.airavata.workflow.model.graph.system.ConstantNode;
 import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.ui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.ConstantConfigurationDialog;
+import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
 
 public class ConstantNodeGUI extends ConfigurableNodeGUI {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/DifferedInputNodeGUI.java Fri May 18 15:44:22 2012
@@ -11,7 +11,8 @@ import java.awt.Color;
 
 import org.apache.airavata.workflow.model.graph.system.DifferedInputNode;
 import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.ui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.DifferedInputConfigurationDialog;
+import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
 
 /**
  * @author Chathura Herath
@@ -70,7 +71,7 @@ public class DifferedInputNodeGUI extend
 		return false;
 	}
 
-	protected synchronized void closingDisplay() {
+	public synchronized void closingDisplay() {
 		this.configCanBeDisplayed = true;
 	}
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndBlockNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndBlockNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndBlockNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndBlockNodeGUI.java Fri May 18 15:44:22 2012
@@ -32,6 +32,7 @@ import org.apache.airavata.workflow.mode
 import org.apache.airavata.workflow.model.graph.system.EndBlockNode;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.EndBlockConfigurationDialog;
 import org.apache.airavata.xbaya.ui.graph.PortGUI;
 
 public class EndBlockNodeGUI extends ConfigurableNodeGUI {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndForEachNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndForEachNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndForEachNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndForEachNodeGUI.java Fri May 18 15:44:22 2012
@@ -31,6 +31,7 @@ import org.apache.airavata.workflow.mode
 import org.apache.airavata.workflow.model.graph.system.EndForEachNode;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.EndForEachConfigurationDialog;
 
 public class EndForEachNodeGUI extends ConfigurableNodeGUI {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndifNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndifNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndifNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/EndifNodeGUI.java Fri May 18 15:44:22 2012
@@ -32,6 +32,7 @@ import org.apache.airavata.workflow.mode
 import org.apache.airavata.workflow.model.graph.system.EndifNode;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.EndifConfigurationDialog;
 import org.apache.airavata.xbaya.ui.graph.PortGUI;
 
 public class EndifNodeGUI extends ConfigurableNodeGUI {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ForEachNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ForEachNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ForEachNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ForEachNodeGUI.java Fri May 18 15:44:22 2012
@@ -32,6 +32,7 @@ import org.apache.airavata.workflow.mode
 import org.apache.airavata.workflow.model.graph.system.ForEachNode;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.ForEachConfigurationDialog;
 
 public class ForEachNodeGUI extends ConfigurableNodeGUI {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/IfNodeGUI.java Fri May 18 15:44:22 2012
@@ -33,6 +33,7 @@ import org.apache.airavata.workflow.mode
 import org.apache.airavata.workflow.model.graph.system.IfNode;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.IfConfigurationDialog;
 import org.apache.airavata.xbaya.ui.graph.PortGUI;
 
 public class IfNodeGUI extends ConfigurableNodeGUI {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/InputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/InputNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/InputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/InputNodeGUI.java Fri May 18 15:44:22 2012
@@ -25,7 +25,8 @@ import java.awt.Color;
 
 import org.apache.airavata.workflow.model.graph.system.InputNode;
 import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.ui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.InputConfigurationDialog;
+import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
 
 public class InputNodeGUI extends ConfigurableNodeGUI {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/MemoNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/MemoNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/MemoNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/MemoNodeGUI.java Fri May 18 15:44:22 2012
@@ -33,6 +33,7 @@ import javax.swing.border.EmptyBorder;
 
 import org.apache.airavata.workflow.model.graph.system.MemoNode;
 import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.MemoConfigurationDialog;
 import org.apache.airavata.xbaya.ui.graph.NodeGUI;
 
 public class MemoNodeGUI extends NodeGUI {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/OutputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/OutputNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/OutputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/OutputNodeGUI.java Fri May 18 15:44:22 2012
@@ -30,6 +30,7 @@ import org.apache.airavata.common.utils.
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.graph.system.OutputNode;
 import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.OutputConfigurationDialog;
 
 public class OutputNodeGUI extends ConfigurableNodeGUI {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ReceiveNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ReceiveNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ReceiveNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/ReceiveNodeGUI.java Fri May 18 15:44:22 2012
@@ -31,6 +31,7 @@ import org.apache.airavata.workflow.mode
 import org.apache.airavata.workflow.model.graph.system.ReceiveNode;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.ReceiveConfigurationDialog;
 
 public class ReceiveNodeGUI extends ConfigurableNodeGUI {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/S3InputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/S3InputNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/S3InputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/S3InputNodeGUI.java Fri May 18 15:44:22 2012
@@ -25,7 +25,8 @@ import java.awt.Color;
 
 import org.apache.airavata.workflow.model.graph.system.S3InputNode;
 import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.ui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.S3FileChooser;
+import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
 
 public class S3InputNodeGUI extends ConfigurableNodeGUI {
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/StreamSourceNodeGUI.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/component/StreamSourceNodeGUI.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/StreamSourceNodeGUI.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/StreamSourceNodeGUI.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/component/StreamSourceNodeGUI.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/component/StreamSourceNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/system/StreamSourceNodeGUI.java Fri May 18 15:44:22 2012
@@ -19,14 +19,13 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.component;
+package org.apache.airavata.xbaya.ui.graph.system;
 
 import java.awt.Color;
 
 import org.apache.airavata.workflow.model.graph.system.StreamSourceNode;
 import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.ui.graph.system.ConfigurableNodeGUI;
-import org.apache.airavata.xbaya.ui.graph.system.StreamSourceConfigurationDialog;
+import org.apache.airavata.xbaya.ui.dialogs.graph.system.StreamSourceConfigurationDialog;
 
 public class StreamSourceNodeGUI extends ConfigurableNodeGUI {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java Fri May 18 15:44:22 2012
@@ -31,8 +31,9 @@ import java.awt.event.MouseEvent;
 
 import org.apache.airavata.workflow.model.graph.ws.WSNode;
 import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.dialogs.graph.ws.ServiceInteractionWindow;
+import org.apache.airavata.xbaya.ui.dialogs.graph.ws.WSNodeWindow;
 import org.apache.airavata.xbaya.ui.graph.NodeGUI;
-import org.apache.airavata.xbaya.ui.graph.interaction.ServiceInteractionWindow;
 import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler.NodeState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java Fri May 18 15:44:22 2012
@@ -28,8 +28,8 @@ import org.apache.airavata.workflow.mode
 import org.apache.airavata.workflow.model.graph.ws.WorkflowNode;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.ui.ErrorMessages;
 import org.apache.airavata.xbaya.ui.graph.NodeGUI;
+import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java (from r1339748, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/edit/EditMenuItem.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/edit/EditMenuItem.java&r1=1339748&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/edit/EditMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.menues.edit;
+package org.apache.airavata.xbaya.ui.menues;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -31,8 +31,8 @@ import javax.swing.JMenuItem;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.appwrapper.DescriptorEditorDialog;
 import org.apache.airavata.xbaya.appwrapper.DescriptorEditorDialog.DescriptorType;
-import org.apache.airavata.xbaya.ui.wf.ParameterPropertyWindow;
-import org.apache.airavata.xbaya.ui.wf.WorkflowPropertyWindow;
+import org.apache.airavata.xbaya.ui.dialogs.workflow.ParameterPropertyWindow;
+import org.apache.airavata.xbaya.ui.dialogs.workflow.WorkflowPropertyWindow;
 import org.apache.airavata.xbaya.util.XBayaUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java (from r1339748, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/registry/RegistryMenuItem.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/registry/RegistryMenuItem.java&r1=1339748&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/registry/RegistryMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.menues.registry;
+package org.apache.airavata.xbaya.ui.menues;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -30,12 +30,11 @@ import javax.swing.JMenuItem;
 
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
+import org.apache.airavata.xbaya.core.ide.XBayaExecutionModeListener;
 import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.ui.ToolbarButton;
-import org.apache.airavata.xbaya.ui.XBayaExecutionModeListener;
-import org.apache.airavata.xbaya.ui.XBayaToolBar;
-import org.apache.airavata.xbaya.ui.component.JCRRegistryWindow;
-import org.apache.airavata.xbaya.ui.menues.MenuIcons;
+import org.apache.airavata.xbaya.ui.dialogs.registry.JCRRegistryWindow;
+import org.apache.airavata.xbaya.ui.widgets.ToolbarButton;
+import org.apache.airavata.xbaya.ui.widgets.XBayaToolBar;
 import org.apache.airavata.xbaya.util.XBayaUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java (from r1339748, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/run/RunMenuItem.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/run/RunMenuItem.java&r1=1339748&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/run/RunMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.menues.run;
+package org.apache.airavata.xbaya.ui.menues;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -39,23 +39,22 @@ import org.apache.airavata.workflow.mode
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
 import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.core.ide.XBayaExecutionModeListener;
 import org.apache.airavata.xbaya.event.Event;
 import org.apache.airavata.xbaya.event.Event.Type;
 import org.apache.airavata.xbaya.event.EventListener;
 import org.apache.airavata.xbaya.monitor.Monitor;
 import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
 import org.apache.airavata.xbaya.monitor.MonitorException;
-import org.apache.airavata.xbaya.ui.ErrorMessages;
-import org.apache.airavata.xbaya.ui.ToolbarButton;
-import org.apache.airavata.xbaya.ui.XBayaExecutionModeListener;
-import org.apache.airavata.xbaya.ui.XBayaToolBar;
+import org.apache.airavata.xbaya.ui.dialogs.GridChemRunnerWindow;
+import org.apache.airavata.xbaya.ui.dialogs.JythonRunnerWindow;
+import org.apache.airavata.xbaya.ui.dialogs.graph.dynamic.DynamicWorkflowRunnerWindow;
+import org.apache.airavata.xbaya.ui.dialogs.monitor.MonitorConfigurationWindow;
 import org.apache.airavata.xbaya.ui.experiment.WorkflowInterpreterLaunchWindow;
-import org.apache.airavata.xbaya.ui.graph.dynamic.DynamicWorkflowRunnerWindow;
-import org.apache.airavata.xbaya.ui.gridchem.GridChemRunnerWindow;
-import org.apache.airavata.xbaya.ui.jython.JythonRunnerWindow;
-import org.apache.airavata.xbaya.ui.menues.MenuIcons;
-import org.apache.airavata.xbaya.ui.monitor.MonitorConfigurationWindow;
 import org.apache.airavata.xbaya.ui.monitor.MonitorStarter;
+import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
+import org.apache.airavata.xbaya.ui.widgets.ToolbarButton;
+import org.apache.airavata.xbaya.ui.widgets.XBayaToolBar;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java (from r1339748, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/view/ViewMenuItem.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/view/ViewMenuItem.java&r1=1339748&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/view/ViewMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.menues.view;
+package org.apache.airavata.xbaya.ui.menues;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaMenu.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaMenu.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui;
+package org.apache.airavata.xbaya.ui.menues;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -34,20 +34,12 @@ import org.apache.airavata.xbaya.XBayaCo
 import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
 import org.apache.airavata.xbaya.XBayaConstants;
 import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.appwrapper.RegisterApplicationsMenu;
+import org.apache.airavata.xbaya.core.ide.XBayaExecutionModeListener;
 import org.apache.airavata.xbaya.menues.tools.ToolsMenuItem;
-import org.apache.airavata.xbaya.ui.amazonEC2.AmazonEC2Menu;
-import org.apache.airavata.xbaya.ui.component.ComponentMenu;
-import org.apache.airavata.xbaya.ui.experiment.ExperimentMenu;
-import org.apache.airavata.xbaya.ui.file.FileMenu;
-import org.apache.airavata.xbaya.ui.menues.edit.EditMenuItem;
-import org.apache.airavata.xbaya.ui.menues.registry.RegistryMenuItem;
-import org.apache.airavata.xbaya.ui.menues.run.RunMenuItem;
-import org.apache.airavata.xbaya.ui.menues.view.ViewMenuItem;
-import org.apache.airavata.xbaya.ui.menues.xbaya.XBayaMenuItem;
-import org.apache.airavata.xbaya.ui.monitor.MonitorMenu;
-import org.apache.airavata.xbaya.ui.pegasus.PegasusMenu;
-import org.apache.airavata.xbaya.ui.wf.WorkflowMenu;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
+import org.apache.airavata.xbaya.ui.dialogs.AboutWindow;
+import org.apache.airavata.xbaya.ui.widgets.XBayaComponent;
+import org.apache.airavata.xbaya.ui.widgets.XBayaToolBar;
 
 public class XBayaMenu implements XBayaComponent,XBayaExecutionModeListener{
 
@@ -55,23 +47,23 @@ public class XBayaMenu implements XBayaC
 
     private JMenuBar menuBar;
 
-    private WorkflowMenu workflowMenu;
-
-    private FileMenu fileMenu;
-
-    private ExperimentMenu experimentMenu;
-
-    private PegasusMenu pegasusMenu;
-
-    private AmazonEC2Menu amazonEC2Menu;
-
-    private ComponentMenu componentMenu;
-
-    private MonitorMenu monitorMenu;
+//    private WorkflowMenu workflowMenu;
+//
+//    private FileMenu fileMenu;
+//
+//    private ExperimentMenu experimentMenu;
+//
+//    private PegasusMenu pegasusMenu;
+//
+//    private AmazonEC2Menu amazonEC2Menu;
+//
+//    private ComponentMenu componentMenu;
+//
+//    private MonitorMenu monitorMenu;
 
     // private MyProxyMenu myProxyMenu;
 
-    private RegisterApplicationsMenu registerApplications;
+//    private RegisterApplicationsMenu registerApplications;
 
 	private XBayaMenuItem xBayaMenuItem;
 
@@ -111,7 +103,7 @@ public class XBayaMenu implements XBayaC
     }
     
 	private void initMenu() {
-		fileMenu = new FileMenu(getEngine());
+//		fileMenu = new FileMenu(getEngine());
 		
 		xBayaMenuItem = new XBayaMenuItem(getEngine(),getToolBar());
 		editMenuItem = new EditMenuItem(getEngine());
@@ -120,13 +112,13 @@ public class XBayaMenu implements XBayaC
 		registryMenuItem = new RegistryMenuItem(getEngine(),getToolBar());
 		toolsMenuItem = new ToolsMenuItem(getEngine());
 		
-		workflowMenu = new WorkflowMenu(getEngine());
-		experimentMenu = new ExperimentMenu(getEngine());
-		amazonEC2Menu = new AmazonEC2Menu(getEngine());
-		componentMenu = new ComponentMenu(getEngine());
-		monitorMenu = new MonitorMenu(getEngine());
+//		workflowMenu = new WorkflowMenu(getEngine());
+//		experimentMenu = new ExperimentMenu(getEngine());
+//		amazonEC2Menu = new AmazonEC2Menu(getEngine());
+//		componentMenu = new ComponentMenu(getEngine());
+//		monitorMenu = new MonitorMenu(getEngine());
 		// this.myProxyMenu = new MyProxyMenu(this.engine);
-		registerApplications = new RegisterApplicationsMenu(getEngine());
+//		registerApplications = new RegisterApplicationsMenu(getEngine());
 
 		createMenuBar();
 		executionModeChanged(getEngine().getConfiguration());

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java (from r1339748, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/XBayaMenuItem.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/XBayaMenuItem.java&r1=1339748&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/XBayaMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.menues.xbaya;
+package org.apache.airavata.xbaya.ui.menues;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -41,14 +41,18 @@ import org.apache.airavata.xbaya.XBayaEn
 import org.apache.airavata.xbaya.appwrapper.ApplicationDescriptionDialog;
 import org.apache.airavata.xbaya.appwrapper.HostDescriptionDialog;
 import org.apache.airavata.xbaya.appwrapper.ServiceDescriptionDialog;
+import org.apache.airavata.xbaya.core.generators.BPELFiler;
+import org.apache.airavata.xbaya.core.generators.ImageFiler;
+import org.apache.airavata.xbaya.core.generators.JythonFiler;
+import org.apache.airavata.xbaya.core.generators.ODEScriptFiler;
+import org.apache.airavata.xbaya.core.generators.WorkflowFiler;
+import org.apache.airavata.xbaya.core.ide.XBayaExecutionModeListener;
 import org.apache.airavata.xbaya.registry.RegistryAccesser;
-import org.apache.airavata.xbaya.ui.ToolbarButton;
-import org.apache.airavata.xbaya.ui.XBayaExecutionModeListener;
-import org.apache.airavata.xbaya.ui.XBayaToolBar;
-import org.apache.airavata.xbaya.ui.component.URLRegistryWindow;
+import org.apache.airavata.xbaya.ui.dialogs.component.URLRegistryWindow;
 import org.apache.airavata.xbaya.ui.experiment.RegistryLoaderWindow;
 import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
-import org.apache.airavata.xbaya.ui.menues.MenuIcons;
+import org.apache.airavata.xbaya.ui.widgets.ToolbarButton;
+import org.apache.airavata.xbaya.ui.widgets.XBayaToolBar;
 import org.apache.airavata.xbaya.util.XBayaUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java?rev=1340137&r1=1340136&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java Fri May 18 15:44:22 2012
@@ -23,9 +23,9 @@ package org.apache.airavata.xbaya.ui.mon
 
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.monitor.MonitorException;
-import org.apache.airavata.xbaya.ui.Cancelable;
-import org.apache.airavata.xbaya.ui.ErrorMessages;
-import org.apache.airavata.xbaya.ui.WaitDialog;
+import org.apache.airavata.xbaya.ui.dialogs.WaitDialog;
+import org.apache.airavata.xbaya.ui.utils.Cancelable;
+import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,7 +54,7 @@ public class MonitorStarter implements C
     }
 
     /**
-     * @see org.apache.airavata.xbaya.ui.Cancelable#cancel()
+     * @see org.apache.airavata.xbaya.ui.utils.Cancelable#cancel()
      */
     public void cancel() {
         this.canceled = true;

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/Cancelable.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/Cancelable.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/Cancelable.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/Cancelable.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/Cancelable.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/Cancelable.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/Cancelable.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui;
+package org.apache.airavata.xbaya.ui.utils;
 
 public interface Cancelable {
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/ErrorMessages.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/ErrorMessages.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/ErrorMessages.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/ErrorMessages.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/ErrorMessages.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/ErrorMessages.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/ErrorMessages.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui;
+package org.apache.airavata.xbaya.ui.utils;
 
 public interface ErrorMessages {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/MyProxyChecker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/MyProxyChecker.java?rev=1340137&r1=1339949&r2=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/MyProxyChecker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/MyProxyChecker.java Fri May 18 15:44:22 2012
@@ -19,10 +19,11 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.myproxy;
+package org.apache.airavata.xbaya.ui.utils;
 
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.myproxy.MyProxyClient;
+import org.apache.airavata.xbaya.ui.dialogs.myproxy.MyProxyDialog;
 
 public class MyProxyChecker {
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/ComponentViewer.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/component/ComponentViewer.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/ComponentViewer.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/ComponentViewer.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/component/ComponentViewer.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/component/ComponentViewer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/ComponentViewer.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.component;
+package org.apache.airavata.xbaya.ui.views;
 
 import java.awt.Color;
 
@@ -28,12 +28,15 @@ import javax.swing.SwingUtilities;
 
 import org.apache.airavata.workflow.model.component.Component;
 import org.apache.airavata.workflow.model.graph.Node;
-import org.apache.airavata.xbaya.ui.XBayaComponent;
-import org.apache.airavata.xbaya.ui.component.ComponentSelectorEvent.ComponentSelectorEventType;
 import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
 import org.apache.airavata.xbaya.ui.graph.GraphCanvasEvent;
 import org.apache.airavata.xbaya.ui.graph.GraphCanvasListener;
 import org.apache.airavata.xbaya.ui.graph.GraphCanvasEvent.GraphCanvasEventType;
+import org.apache.airavata.xbaya.ui.widgets.XBayaComponent;
+import org.apache.airavata.xbaya.ui.widgets.component.ComponentSelector;
+import org.apache.airavata.xbaya.ui.widgets.component.ComponentSelectorEvent;
+import org.apache.airavata.xbaya.ui.widgets.component.ComponentSelectorListener;
+import org.apache.airavata.xbaya.ui.widgets.component.ComponentSelectorEvent.ComponentSelectorEventType;
 
 import xsul5.XmlConstants;
 
@@ -121,7 +124,7 @@ public class ComponentViewer implements 
     }
 
     /**
-     * @see org.apache.airavata.xbaya.ui.component.ComponentSelectorListener#componentSelectorChanged(org.apache.airavata.xbaya.ui.component.ComponentSelectorEvent)
+     * @see org.apache.airavata.xbaya.ui.widgets.component.ComponentSelectorListener#componentSelectorChanged(org.apache.airavata.xbaya.ui.widgets.component.ComponentSelectorEvent)
      */
     public void componentSelectorChanged(ComponentSelectorEvent event) {
         ComponentSelectorEventType type = event.getType();

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/JCRBrowserPanel.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/JCRBrowserPanel.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/JCRBrowserPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.registrybrowser;
+package org.apache.airavata.xbaya.ui.views;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -48,12 +48,12 @@ import org.apache.airavata.xbaya.compone
 import org.apache.airavata.xbaya.registrybrowser.nodes.AbstractAiravataTreeNode;
 import org.apache.airavata.xbaya.registrybrowser.nodes.AiravataTreeNodeFactory;
 import org.apache.airavata.xbaya.registrybrowser.nodes.RegistryTreeCellRenderer;
-import org.apache.airavata.xbaya.ui.registrybrowser.menu.AbstractBrowserActionItem;
-import org.apache.airavata.xbaya.ui.registrybrowser.menu.AddAction;
-import org.apache.airavata.xbaya.ui.registrybrowser.menu.DeleteAction;
-import org.apache.airavata.xbaya.ui.registrybrowser.menu.EditAction;
-import org.apache.airavata.xbaya.ui.registrybrowser.menu.ImportAction;
-import org.apache.airavata.xbaya.ui.registrybrowser.menu.RefreshAction;
+import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
+import org.apache.airavata.xbaya.ui.actions.registry.browser.AddAction;
+import org.apache.airavata.xbaya.ui.actions.registry.browser.DeleteAction;
+import org.apache.airavata.xbaya.ui.actions.registry.browser.EditAction;
+import org.apache.airavata.xbaya.ui.actions.registry.browser.ImportAction;
+import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
 
 public class JCRBrowserPanel extends JPanel implements Observer {
     private List<AbstractBrowserActionItem> browserActions = new ArrayList<AbstractBrowserActionItem>();

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorPanel.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorPanel.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/MonitorPanel.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.monitor;
+package org.apache.airavata.xbaya.ui.views;
 
 import java.awt.BorderLayout;
 import java.awt.Point;
@@ -45,7 +45,9 @@ import org.apache.airavata.common.utils.
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.monitor.MonitorEventData;
 import org.apache.airavata.xbaya.monitor.MonitorUtil;
-import org.apache.airavata.xbaya.ui.XBayaComponent;
+import org.apache.airavata.xbaya.ui.dialogs.monitor.MonitorWindow;
+import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler;
+import org.apache.airavata.xbaya.ui.widgets.XBayaComponent;
 import org.xmlpull.infoset.XmlElement;
 
 public class MonitorPanel implements XBayaComponent, TableModelListener {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/ParameterPropertyPanel.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterPropertyPanel.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/ParameterPropertyPanel.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/ParameterPropertyPanel.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterPropertyPanel.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterPropertyPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/ParameterPropertyPanel.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.wf;
+package org.apache.airavata.xbaya.ui.views;
 
 import java.awt.event.ActionEvent;
 import java.util.List;
@@ -36,10 +36,11 @@ import javax.swing.event.ListSelectionLi
 import org.apache.airavata.common.utils.WSConstants;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.workflow.model.graph.system.ParameterNode;
-import org.apache.airavata.xbaya.ui.GridPanel;
-import org.apache.airavata.xbaya.ui.XBayaComponent;
-import org.apache.airavata.xbaya.ui.XBayaList;
-import org.apache.airavata.xbaya.ui.XBayaTextArea;
+import org.apache.airavata.xbaya.core.workflow.ParameterListModel;
+import org.apache.airavata.xbaya.ui.widgets.GridPanel;
+import org.apache.airavata.xbaya.ui.widgets.XBayaComponent;
+import org.apache.airavata.xbaya.ui.widgets.XBayaList;
+import org.apache.airavata.xbaya.ui.widgets.XBayaTextArea;
 import org.xmlpull.infoset.XmlElement;
 
 public class ParameterPropertyPanel implements XBayaComponent {
@@ -69,7 +70,7 @@ public class ParameterPropertyPanel impl
     }
 
     /**
-     * @see org.apache.airavata.xbaya.ui.XBayaComponent#getSwingComponent()
+     * @see org.apache.airavata.xbaya.ui.widgets.XBayaComponent#getSwingComponent()
      */
     public JComponent getSwingComponent() {
         return getPanel().getSwingComponent();

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/PortViewer.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/PortViewer.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/PortViewer.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/PortViewer.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/PortViewer.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/PortViewer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/PortViewer.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui;
+package org.apache.airavata.xbaya.ui.views;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/GridPanel.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/GridPanel.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/GridPanel.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/GridPanel.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/GridPanel.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/GridPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/GridPanel.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui;
+package org.apache.airavata.xbaya.ui.widgets;
 
 import java.util.List;
 
@@ -65,7 +65,7 @@ public class GridPanel implements XBayaC
     }
 
     /**
-     * @see org.apache.airavata.xbaya.ui.XBayaComponent#getSwingComponent()
+     * @see org.apache.airavata.xbaya.ui.widgets.XBayaComponent#getSwingComponent()
      */
     public JComponent getSwingComponent() {
         return this.rootComponent;

Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/ScrollPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/ScrollPanel.java?rev=1340137&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/ScrollPanel.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/ScrollPanel.java Fri May 18 15:44:22 2012
@@ -0,0 +1,124 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.xbaya.ui.widgets;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.border.Border;
+
+import org.apache.airavata.common.utils.SwingUtil;
+
+public class ScrollPanel implements XBayaComponent {
+
+    private JPanel panel;
+
+    private JComponent component;
+
+    /**
+     * Creates a ScrollPanel.
+     * 
+     * @param component
+     * @param title
+     */
+    public ScrollPanel(XBayaComponent component, String title) {
+        this(component.getSwingComponent(), title);
+    }
+
+    /**
+     * Creates a ScrollPanel.
+     * 
+     * @param component
+     * @param title
+     */
+    public ScrollPanel(JComponent component, String title) {
+        this(component, title, true);
+    }
+
+    /**
+     * Creates a ScrollPanel.
+     * 
+     * @param component
+     * @param title
+     * @param scroll
+     */
+    public ScrollPanel(XBayaComponent component, String title, boolean scroll) {
+        this(component.getSwingComponent(), title, scroll);
+    }
+
+    /**
+     * Creates a ScrollPanel.
+     * 
+     * @param component
+     * @param title
+     * @param scroll
+     */
+    public ScrollPanel(JComponent component, String title, boolean scroll) {
+        this.component = component;
+        init(component, title, scroll);
+    }
+
+    /**
+     * @see org.apache.airavata.xbaya.ui.widgets.XBayaComponent#getSwingComponent()
+     */
+    public JPanel getSwingComponent() {
+        return getPanel();
+    }
+
+    /**
+     * @return The panel.
+     */
+    public JPanel getPanel() {
+        return this.panel;
+    }
+
+    /**
+     * @param preferredSize
+     */
+    public void setPrefferedSize(Dimension preferredSize) {
+        this.component.setPreferredSize(preferredSize);
+    }
+
+    private void init(JComponent comp, String title, boolean scroll) {
+        this.panel = new JPanel();
+        this.panel.setLayout(new BorderLayout());
+
+        JLabel titleLabel = new JLabel(title);
+        Border border = BorderFactory.createEtchedBorder();
+        titleLabel.setBorder(border);
+        this.panel.add(titleLabel, BorderLayout.NORTH);
+
+        if (scroll) {
+            JScrollPane scrollPane = new JScrollPane(comp);
+            scrollPane.setMinimumSize(SwingUtil.MINIMUM_SIZE);
+            this.panel.add(scrollPane, BorderLayout.CENTER);
+        } else {
+            comp.setMinimumSize(SwingUtil.MINIMUM_SIZE);
+            this.panel.add(comp, BorderLayout.CENTER);
+        }
+    }
+}
\ No newline at end of file

Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/TabLabelButton.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/TabLabelButton.java?rev=1340137&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/TabLabelButton.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/TabLabelButton.java Fri May 18 15:44:22 2012
@@ -0,0 +1,138 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.xbaya.ui.widgets;
+ 
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.plaf.basic.BasicButtonUI;
+ 
+public class TabLabelButton extends JPanel implements ActionListener{
+ 
+	private static final long serialVersionUID = 1L;
+	
+	private JTabbedPane tabPanel;
+	
+	private ActionListener closeButtonListener;
+	
+	
+	public TabLabelButton(final JTabbedPane pane, String closeButtonTip) {
+        super();
+        setTabPanel(pane);
+        FlowLayout layout = new FlowLayout(FlowLayout.LEFT);
+        layout.setAlignment(FlowLayout.LEFT);
+        layout.setVgap(0);
+        layout.setHgap(0);
+        setLayout(layout);
+        setOpaque(false);
+        JLabel label = new JLabel() {
+			private static final long serialVersionUID = 1L;
+
+			public String getText() {
+                int i = pane.indexOfTabComponent(TabLabelButton.this);
+                if (i != -1) {
+                	TabLabelButton.this.updateUI();
+                    return pane.getTitleAt(i);
+                }
+                return null;
+            }
+        };
+         
+        add(label);
+        label.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
+        final JButton button = new JButton(){
+			private static final long serialVersionUID = 1L;
+            protected void paintComponent(Graphics g) {
+                super.paintComponent(g);
+                //Only if the selected tab is this tab we draw the close
+                if (pane.indexOfTabComponent(TabLabelButton.this)==pane.getSelectedIndex()){
+                	Graphics2D drawer = (Graphics2D) g.create();
+                    if (getModel().isPressed()) {
+                        drawer.translate(1, 1);
+                    }
+                    drawer.setStroke(new BasicStroke(2));
+                	drawer.setColor(Color.GRAY);
+                	if (getModel().isRollover()) {
+                        drawer.setColor(new Color(200,0,0));
+                    }
+                	setBorderPainted(getModel().isRollover());
+                    int delta = 7;
+					int right = (getWidth()-1) - delta;
+					int bottom = (getHeight()-1) - delta;
+					drawer.drawLine(delta, delta, right, bottom);
+                    drawer.drawLine(right, delta, delta, bottom);
+                    drawer.dispose();
+                }
+            }
+        };
+        button.setPreferredSize(new Dimension(20, 20));
+        button.setToolTipText(closeButtonTip);
+        button.setUI(new BasicButtonUI());
+        button.setContentAreaFilled(false);
+        button.setFocusable(false);
+        button.setBorder(BorderFactory.createLineBorder(Color.GRAY));
+        button.setBorderPainted(false);
+        button.setRolloverEnabled(true);
+        button.addActionListener(this);
+        
+        add(button);
+        setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0));
+    }
+
+	public JTabbedPane getTabPanel() {
+		return tabPanel;
+	}
+
+	public void setTabPanel(JTabbedPane tabPanel) {
+		this.tabPanel = tabPanel;
+	}
+
+	public ActionListener getCloseButtonListener() {
+		return closeButtonListener;
+	}
+
+	public void setCloseButtonListener(ActionListener closeButtonListener) {
+		this.closeButtonListener = closeButtonListener;
+	}
+
+	@Override
+	public void actionPerformed(ActionEvent event) {
+        if (getTabPanel().indexOfTabComponent(TabLabelButton.this)==getTabPanel().getSelectedIndex()){
+        	if (getCloseButtonListener()!=null){
+        		getCloseButtonListener().actionPerformed(event);
+        	}
+        }else{
+        	getTabPanel().setSelectedIndex(getTabPanel().indexOfTabComponent(TabLabelButton.this));
+        }
+	}
+}

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/TableRenderable.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/TableRenderable.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/TableRenderable.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/TableRenderable.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/TableRenderable.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/TableRenderable.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/TableRenderable.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui;
+package org.apache.airavata.xbaya.ui.widgets;
 
 public interface TableRenderable {
     public int getColumnCount();

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/ToolbarButton.java (from r1339949, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/ToolbarButton.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/ToolbarButton.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/ToolbarButton.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/ToolbarButton.java&r1=1339949&r2=1340137&rev=1340137&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/ToolbarButton.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/ToolbarButton.java Fri May 18 15:44:22 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui;
+package org.apache.airavata.xbaya.ui.widgets;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaComboBox.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaComboBox.java?rev=1340137&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaComboBox.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaComboBox.java Fri May 18 15:44:22 2012
@@ -0,0 +1,100 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.xbaya.ui.widgets;
+
+import java.awt.event.ItemListener;
+
+import javax.swing.ComboBoxModel;
+import javax.swing.JComboBox;
+
+public class XBayaComboBox implements XBayaComponent {
+
+    /**
+     * DEFAULT_COLUMNS
+     */
+    public static final int DEFAULT_COLUMNS = 30;
+
+    private JComboBox comboBox;
+
+    /**
+     * Constructs a XBayaTextArea.
+     * 
+     * @param model
+     */
+    public XBayaComboBox(ComboBoxModel model) {
+        init(model);
+    }
+
+    /**
+     * @return The swing component.
+     */
+    public JComboBox getSwingComponent() {
+        return getJComboBox();
+    }
+
+    /**
+     * @return The text. It never returns null.
+     */
+    public String getText() {
+        return (String) this.comboBox.getSelectedItem();
+    }
+
+    /**
+     * @param str
+     */
+    public void setSelectedItem(String str) {
+        this.comboBox.setSelectedItem(str);
+    }
+
+    /**
+     * @param model
+     */
+    public void setModel(ComboBoxModel model) {
+        this.comboBox.setModel(model);
+    }
+
+    /**
+     * @return The text field
+     */
+    public JComboBox getJComboBox() {
+        return this.comboBox;
+    }
+
+    /**
+     * @param editable
+     */
+    public void setEditable(boolean editable) {
+        this.comboBox.setEditable(editable);
+    }
+
+    private void init(ComboBoxModel model) {
+        this.comboBox = new JComboBox(model);
+        this.comboBox.setEditable(false);
+    }
+
+    /**
+     * @param listener
+     */
+    public void addItemListener(ItemListener listener) {
+        this.comboBox.addItemListener(listener);
+    }
+}
\ No newline at end of file

Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaComponent.java?rev=1340137&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaComponent.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaComponent.java Fri May 18 15:44:22 2012
@@ -0,0 +1,35 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.xbaya.ui.widgets;
+
+import javax.swing.JComponent;
+
+public interface XBayaComponent {
+
+    /**
+     * Returns the swing component.
+     * 
+     * @return The swing component.
+     */
+    public JComponent getSwingComponent();
+
+}
\ No newline at end of file

Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaLabel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaLabel.java?rev=1340137&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaLabel.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaLabel.java Fri May 18 15:44:22 2012
@@ -0,0 +1,95 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.airavata.xbaya.ui.widgets;
+
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.SwingConstants;
+
+
+public class XBayaLabel implements XBayaComponent {
+
+    private JLabel label;
+
+    /**
+     * Constructs a XBayaLabel.
+     * 
+     * @param text
+     * @param component
+     *            The component to be labeled for.
+     */
+    public XBayaLabel(String text, XBayaComponent component) {
+        this(text, component.getSwingComponent());
+    }
+
+    /**
+     * Constructs a XBayaLabel.
+     * 
+     * @param text
+     * @param component
+     *            The component to be labeled for.
+     */
+    public XBayaLabel(String text, JComponent component) {
+        init();
+        setText(text);
+        setLabelFor(component);
+    }
+
+    /**
+     * @see org.apache.airavata.xbaya.ui.widgets.XBayaComponent#getSwingComponent()
+     */
+    public JLabel getSwingComponent() {
+        return getJLabel();
+    }
+
+    /**
+     * @param text
+     */
+    public void setText(String text) {
+        this.label.setText(text + ": ");
+    }
+
+    /**
+     * @return The text field
+     */
+    public JLabel getJLabel() {
+        return this.label;
+    }
+
+    /**
+     * @param component
+     */
+    public void setLabelFor(XBayaComponent component) {
+        setLabelFor(component.getSwingComponent());
+    }
+
+    /**
+     * @param component
+     */
+    public void setLabelFor(JComponent component) {
+        this.label.setLabelFor(component);
+    }
+
+    private void init() {
+        this.label = new JLabel();
+        this.label.setHorizontalAlignment(SwingConstants.TRAILING);
+    }
+}
\ No newline at end of file

Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaLinkButton.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaLinkButton.java?rev=1340137&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaLinkButton.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaLinkButton.java Fri May 18 15:44:22 2012
@@ -0,0 +1,306 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.xbaya.ui.widgets;
+
+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);
+        }
+    }
+}

Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaList.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaList.java?rev=1340137&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaList.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaList.java Fri May 18 15:44:22 2012
@@ -0,0 +1,169 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.xbaya.ui.widgets;
+
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.util.Collection;
+import java.util.Vector;
+
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.event.ListSelectionListener;
+
+
+/**
+ * @param <E>
+ */
+public class XBayaList<E> implements XBayaComponent {
+
+    private static final int DEFAULT_WIDTH = 300;
+
+    private static final int DEFAULT_HEIGHT = 200;
+
+    private JList list;
+
+    private JScrollPane scrollPane;
+
+    /**
+     * Constructs a XBayaTextArea.
+     */
+    public XBayaList() {
+        init();
+    }
+
+    /**
+     * @return The swing component.
+     */
+    public JScrollPane getSwingComponent() {
+        return getScrollPane();
+    }
+
+    /**
+     * @return The scroll pane.
+     */
+    public JScrollPane getScrollPane() {
+        return this.scrollPane;
+    }
+
+    /**
+     * @param enabled
+     */
+    public void setEnabled(boolean enabled) {
+        this.list.setEnabled(enabled);
+    }
+
+    /**
+     * @return The text area
+     */
+    public JList getList() {
+        return this.list;
+    }
+
+    /**
+     * @param width
+     * @param height
+     */
+    public void setSize(int width, int height) {
+        Dimension size = new Dimension(width, height);
+        this.scrollPane.setMinimumSize(size);
+        this.scrollPane.setPreferredSize(size);
+    }
+
+    /**
+     * Returns the first selected index; returns -1 if there is no selected item.
+     * 
+     * @return The first selected index; -1 if there is no selected item.
+     */
+    public int getSelectedIndex() {
+        return this.list.getSelectedIndex();
+    }
+
+    /**
+     * Selects a single cell.
+     * 
+     * @param index
+     *            the index of the one cell to select
+     */
+    public void setSelectedIndex(int index) {
+        this.list.setSelectedIndex(index);
+    }
+
+    /**
+     * Returns the first selected value, or <code>null</code> if the selection is empty.
+     * 
+     * @return the first selected value
+     */
+    @SuppressWarnings("unchecked")
+    public E getSelectedValue() {
+        return (E) this.list.getSelectedValue();
+    }
+
+    /**
+     * @param listData
+     */
+    public void setListData(Iterable<E> listData) {
+        if (listData instanceof Vector) {
+            this.list.setListData((Vector) listData);
+        } else if (listData instanceof Collection) {
+            this.list.setListData(new Vector<E>((Collection<E>) listData));
+        } else {
+            Vector<E> data = new Vector<E>();
+            for (E datum : data) {
+                data.add(datum);
+            }
+            this.list.setListData(data);
+        }
+    }
+
+    /**
+     * @param listData
+     */
+    public void setListData(E[] listData) {
+        this.list.setListData(listData);
+    }
+
+    /**
+     * @param listener
+     */
+    public void addListSelectionListener(ListSelectionListener listener) {
+        this.list.addListSelectionListener(listener);
+    }
+
+    /**
+     * @param adapter
+     */
+    public void addMouseListener(MouseAdapter adapter) {
+        this.list.addMouseListener(adapter);
+    }
+
+    private void init() {
+        this.list = new JList();
+        this.list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        this.scrollPane = new JScrollPane(this.list);
+        this.scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        setSize(DEFAULT_WIDTH, DEFAULT_HEIGHT);
+    }
+
+}
\ No newline at end of file

Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaTextArea.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaTextArea.java?rev=1340137&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaTextArea.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaTextArea.java Fri May 18 15:44:22 2012
@@ -0,0 +1,120 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.xbaya.ui.widgets;
+
+import java.awt.Dimension;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.ScrollPaneConstants;
+
+public class XBayaTextArea implements XBayaTextComponent {
+
+    /**
+     * DEFAULT_WIDTH
+     */
+    public static final int DEFAULT_WIDTH = 300;
+
+    /**
+     * DEFAULT_HEIGHT
+     */
+    public static final int DEFAULT_HEIGHT = 200;
+
+    private JTextArea textArea;
+
+    private JScrollPane scrollPane;
+
+    /**
+     * Constructs a XBayaTextArea.
+     */
+    public XBayaTextArea() {
+        init();
+    }
+
+    /**
+     * @return The swing component.
+     */
+    public JScrollPane getSwingComponent() {
+        return getScrollPane();
+    }
+
+    /**
+     * @param text
+     */
+    public void setText(String text) {
+        if (text == null) {
+            text = "";
+        } else {
+            text = text.trim();
+        }
+        this.textArea.setText(text);
+        this.textArea.setCaretPosition(0);
+    }
+
+    /**
+     * @return The text
+     */
+    public String getText() {
+        return this.textArea.getText().trim();
+    }
+
+    /**
+     * @return The scroll pane.
+     */
+    public JScrollPane getScrollPane() {
+        return this.scrollPane;
+    }
+
+    /**
+     * @return The text area
+     */
+    public JTextArea getTextArea() {
+        return this.textArea;
+    }
+
+    /**
+     * @param editable
+     */
+    public void setEditable(boolean editable) {
+        this.textArea.setEditable(editable);
+    }
+
+    /**
+     * @param width
+     * @param height
+     */
+    public void setSize(int width, int height) {
+        Dimension size = new Dimension(width, height);
+        this.scrollPane.setMinimumSize(size);
+        this.scrollPane.setPreferredSize(size);
+    }
+
+    private void init() {
+        this.textArea = new JTextArea();
+        this.textArea.setEditable(true);
+        this.textArea.setLineWrap(true);
+        this.textArea.setWrapStyleWord(true);
+        this.scrollPane = new JScrollPane(this.textArea);
+        this.scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        setSize(DEFAULT_WIDTH, DEFAULT_HEIGHT);
+    }
+}
\ No newline at end of file