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/17 19:54:23 UTC
svn commit: r1339748 [5/5] - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata:
workflow/ xbaya/ xbaya/amazonEC2/ xbaya/appwrapper/ xbaya/component/gui/
xbaya/component/registry/ xbaya/experiment/ xbaya/file/gui/ xbaya/gp...
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/MenuIcons.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/MenuIcons.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/MenuIcons.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/MenuIcons.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/MenuIcons.java&r1=1339684&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/MenuIcons.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/MenuIcons.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues;
+package org.apache.airavata.xbaya.ui.menues;
import javax.swing.ImageIcon;
Modified: 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/edit/EditMenuItem.java?rev=1339748&r1=1339684&r2=1339748&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/edit/EditMenuItem.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues.edit;
+package org.apache.airavata.xbaya.ui.menues.edit;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -31,9 +31,9 @@ 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.util.XBayaUtil;
-import org.apache.airavata.xbaya.wf.gui.ParameterPropertyWindow;
-import org.apache.airavata.xbaya.wf.gui.WorkflowPropertyWindow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: 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/registry/RegistryMenuItem.java?rev=1339748&r1=1339684&r2=1339748&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/registry/RegistryMenuItem.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues.registry;
+package org.apache.airavata.xbaya.ui.menues.registry;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -31,11 +31,11 @@ import javax.swing.JMenuItem;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.component.gui.JCRRegistryWindow;
-import org.apache.airavata.xbaya.gui.ToolbarButton;
-import org.apache.airavata.xbaya.gui.XBayaExecutionModeListener;
-import org.apache.airavata.xbaya.gui.XBayaToolBar;
-import org.apache.airavata.xbaya.menues.MenuIcons;
+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.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/run/RunMenuItem.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/run/RunMenuItem.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/run/RunMenuItem.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/run/RunMenuItem.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues.run;
+package org.apache.airavata.xbaya.ui.menues.run;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -42,20 +42,20 @@ import org.apache.airavata.xbaya.XBayaEn
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.experiment.gui.WorkflowInterpreterLaunchWindow;
-import org.apache.airavata.xbaya.graph.dynamic.gui.DynamicWorkflowRunnerWindow;
-import org.apache.airavata.xbaya.gridchem.gui.GridChemRunnerWindow;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
-import org.apache.airavata.xbaya.gui.ToolbarButton;
-import org.apache.airavata.xbaya.gui.XBayaExecutionModeListener;
-import org.apache.airavata.xbaya.gui.XBayaToolBar;
-import org.apache.airavata.xbaya.jython.gui.JythonRunnerWindow;
-import org.apache.airavata.xbaya.menues.MenuIcons;
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.monitor.gui.MonitorConfigurationWindow;
-import org.apache.airavata.xbaya.monitor.gui.MonitorStarter;
+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.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.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: 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/view/ViewMenuItem.java?rev=1339748&r1=1339684&r2=1339748&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/view/ViewMenuItem.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues.view;
+package org.apache.airavata.xbaya.ui.menues.view;
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/xbaya/BPELFiler.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/BPELFiler.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/BPELFiler.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/BPELFiler.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/BPELFiler.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/BPELFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/BPELFiler.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues.xbaya;
+package org.apache.airavata.xbaya.ui.menues.xbaya;
import java.io.File;
import java.io.IOException;
@@ -37,7 +37,7 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.ErrorMessages;
import org.gpel.model.GpelProcess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/ImageFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/ImageFiler.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/ImageFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/ImageFiler.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues.xbaya;
+package org.apache.airavata.xbaya.ui.menues.xbaya;
import java.awt.image.BufferedImage;
import java.io.File;
@@ -31,7 +31,7 @@ import javax.swing.filechooser.FileFilte
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.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/xbaya/JythonFiler.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/JythonFiler.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/JythonFiler.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/JythonFiler.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/JythonFiler.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/JythonFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/JythonFiler.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues.xbaya;
+package org.apache.airavata.xbaya.ui.menues.xbaya;
import java.io.File;
import java.io.IOException;
@@ -34,8 +34,8 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.jython.script.JythonScript;
+import org.apache.airavata.xbaya.ui.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/xbaya/ODEScriptFiler.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ODEScriptFiler.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/ODEScriptFiler.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/ODEScriptFiler.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ODEScriptFiler.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ODEScriptFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/ODEScriptFiler.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues.xbaya;
+package org.apache.airavata.xbaya.ui.menues.xbaya;
import java.io.File;
import java.io.FileWriter;
@@ -40,7 +40,7 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.ErrorMessages;
import org.gpel.model.GpelProcess;
import org.xmlpull.infoset.XmlElement;
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/ScuflFiler.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ScuflFiler.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/ScuflFiler.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/ScuflFiler.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ScuflFiler.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ScuflFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/ScuflFiler.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues.xbaya;
+package org.apache.airavata.xbaya.ui.menues.xbaya;
import java.io.File;
import java.io.IOException;
@@ -34,8 +34,8 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.scufl.script.ScuflScript;
+import org.apache.airavata.xbaya.ui.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/xbaya/WorkflowFiler.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/WorkflowFiler.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/WorkflowFiler.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/WorkflowFiler.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues.xbaya;
+package org.apache.airavata.xbaya.ui.menues.xbaya;
import java.io.File;
import java.io.IOException;
@@ -37,8 +37,8 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
-import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/XBayaMenuItem.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/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/xbaya/XBayaMenuItem.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/XBayaMenuItem.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/XBayaMenuItem.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/XBayaMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/xbaya/XBayaMenuItem.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.menues.xbaya;
+package org.apache.airavata.xbaya.ui.menues.xbaya;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -41,14 +41,14 @@ 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.component.gui.URLRegistryWindow;
-import org.apache.airavata.xbaya.experiment.gui.RegistryLoaderWindow;
-import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
-import org.apache.airavata.xbaya.gui.ToolbarButton;
-import org.apache.airavata.xbaya.gui.XBayaExecutionModeListener;
-import org.apache.airavata.xbaya.gui.XBayaToolBar;
-import org.apache.airavata.xbaya.menues.MenuIcons;
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.experiment.RegistryLoaderWindow;
+import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
+import org.apache.airavata.xbaya.ui.menues.MenuIcons;
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/MonitorConfigurationWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorConfigurationWindow.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorConfigurationWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorConfigurationWindow.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.monitor.gui;
+package org.apache.airavata.xbaya.ui.monitor;
import java.awt.event.ActionEvent;
import java.awt.event.ItemEvent;
@@ -35,11 +35,11 @@ import javax.swing.JPanel;
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.gui.GridPanel;
-import org.apache.airavata.xbaya.gui.XBayaDialog;
-import org.apache.airavata.xbaya.gui.XBayaLabel;
-import org.apache.airavata.xbaya.gui.XBayaTextField;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
+import org.apache.airavata.xbaya.ui.GridPanel;
+import org.apache.airavata.xbaya.ui.XBayaDialog;
+import org.apache.airavata.xbaya.ui.XBayaLabel;
+import org.apache.airavata.xbaya.ui.XBayaTextField;
public class MonitorConfigurationWindow {
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.monitor.gui;
+package org.apache.airavata.xbaya.ui.monitor;
import java.awt.Color;
import java.net.URI;
@@ -52,12 +52,12 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.controller.NodeController;
-import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
import org.apache.airavata.xbaya.monitor.MonitorEvent;
import org.apache.airavata.xbaya.monitor.MonitorEventData;
import org.apache.airavata.xbaya.monitor.MonitorUtil;
import org.apache.airavata.xbaya.monitor.MonitorUtil.EventType;
+import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
+import org.apache.airavata.xbaya.ui.graph.NodeGUI;
import org.apache.airavata.xbaya.workflow.WorkflowClient;
import org.apache.airavata.xbaya.workflow.WorkflowClient.WorkflowType;
import org.apache.airavata.xbaya.workflow.WorkflowEngineException;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorMenu.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorMenu.java Thu May 17 17:54:09 2012
@@ -19,14 +19,14 @@
*
*/
-package org.apache.airavata.xbaya.monitor.gui;
+package org.apache.airavata.xbaya.ui.monitor;
import java.awt.event.KeyEvent;
import javax.swing.JMenu;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.gui.XBayaGUI;
+import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: 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/monitor/MonitorPanel.java?rev=1339748&r1=1339684&r2=1339748&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/monitor/MonitorPanel.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.monitor.gui;
+package org.apache.airavata.xbaya.ui.monitor;
import java.awt.BorderLayout;
import java.awt.Point;
@@ -43,9 +43,9 @@ import javax.swing.table.TableColumnMode
import org.apache.airavata.common.utils.BrowserLauncher;
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.gui.XBayaComponent;
import org.apache.airavata.xbaya.monitor.MonitorEventData;
import org.apache.airavata.xbaya.monitor.MonitorUtil;
+import org.apache.airavata.xbaya.ui.XBayaComponent;
import org.xmlpull.infoset.XmlElement;
public class MonitorPanel implements XBayaComponent, TableModelListener {
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=1339748&r1=1339684&r2=1339748&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 Thu May 17 17:54:09 2012
@@ -19,13 +19,13 @@
*
*/
-package org.apache.airavata.xbaya.monitor.gui;
+package org.apache.airavata.xbaya.ui.monitor;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.gui.Cancelable;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
-import org.apache.airavata.xbaya.gui.WaitDialog;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,7 +54,7 @@ public class MonitorStarter implements C
}
/**
- * @see org.apache.airavata.xbaya.gui.Cancelable#cancel()
+ * @see org.apache.airavata.xbaya.ui.Cancelable#cancel()
*/
public void cancel() {
this.canceled = true;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorWindow.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorWindow.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.monitor.gui;
+package org.apache.airavata.xbaya.ui.monitor;
import java.awt.event.ActionEvent;
import java.util.Date;
@@ -30,13 +30,13 @@ import javax.swing.JPanel;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.gui.GridPanel;
-import org.apache.airavata.xbaya.gui.XBayaDialog;
-import org.apache.airavata.xbaya.gui.XBayaLabel;
-import org.apache.airavata.xbaya.gui.XBayaTextArea;
-import org.apache.airavata.xbaya.gui.XBayaTextField;
import org.apache.airavata.xbaya.monitor.MonitorEventData;
import org.apache.airavata.xbaya.monitor.MonitorUtil;
+import org.apache.airavata.xbaya.ui.GridPanel;
+import org.apache.airavata.xbaya.ui.XBayaDialog;
+import org.apache.airavata.xbaya.ui.XBayaLabel;
+import org.apache.airavata.xbaya.ui.XBayaTextArea;
+import org.apache.airavata.xbaya.ui.XBayaTextField;
import org.xmlpull.infoset.XmlElement;
public class MonitorWindow {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/ResourcePaintable.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/ResourcePaintable.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/ResourcePaintable.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/ResourcePaintable.java Thu May 17 17:54:09 2012
@@ -19,13 +19,13 @@
*
*/
-package org.apache.airavata.xbaya.monitor.gui;
+package org.apache.airavata.xbaya.ui.monitor;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Point;
-import org.apache.airavata.xbaya.graph.gui.Paintable;
+import org.apache.airavata.xbaya.ui.graph.Paintable;
public class ResourcePaintable implements Paintable {
@@ -55,7 +55,7 @@ public class ResourcePaintable implement
}
/**
- * @see org.apache.airavata.xbaya.graph.gui.Paintable#paint(java.awt.Graphics2D, java.awt.Point)
+ * @see org.apache.airavata.xbaya.ui.graph.Paintable#paint(java.awt.Graphics2D, java.awt.Point)
*/
public void paint(Graphics2D graphics, Point point) {
graphics.setColor(Color.BLACK);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyChecker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyChecker.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyChecker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyChecker.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.myproxy.gui;
+package org.apache.airavata.xbaya.ui.myproxy;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.myproxy.MyProxyClient;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyDialog.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyDialog.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.myproxy.gui;
+package org.apache.airavata.xbaya.ui.myproxy;
import java.awt.event.ActionEvent;
@@ -29,12 +29,12 @@ import javax.swing.JPanel;
import javax.swing.JPasswordField;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
-import org.apache.airavata.xbaya.gui.GridPanel;
-import org.apache.airavata.xbaya.gui.XBayaDialog;
-import org.apache.airavata.xbaya.gui.XBayaLabel;
-import org.apache.airavata.xbaya.gui.XBayaTextField;
import org.apache.airavata.xbaya.myproxy.MyProxyClient;
+import org.apache.airavata.xbaya.ui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.GridPanel;
+import org.apache.airavata.xbaya.ui.XBayaDialog;
+import org.apache.airavata.xbaya.ui.XBayaLabel;
+import org.apache.airavata.xbaya.ui.XBayaTextField;
public class MyProxyDialog {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyLoader.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyLoader.java Thu May 17 17:54:09 2012
@@ -19,13 +19,13 @@
*
*/
-package org.apache.airavata.xbaya.myproxy.gui;
+package org.apache.airavata.xbaya.ui.myproxy;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.gui.Cancelable;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
-import org.apache.airavata.xbaya.gui.WaitDialog;
import org.apache.airavata.xbaya.myproxy.MyProxyClient;
+import org.apache.airavata.xbaya.ui.Cancelable;
+import org.apache.airavata.xbaya.ui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.WaitDialog;
import org.globus.myproxy.MyProxyException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +55,7 @@ public class MyProxyLoader implements Ca
}
/**
- * @see org.apache.airavata.xbaya.gui.Cancelable#cancel()
+ * @see org.apache.airavata.xbaya.ui.Cancelable#cancel()
*/
public void cancel() {
this.canceled = true;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyMenu.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/myproxy/MyProxyMenu.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.myproxy.gui;
+package org.apache.airavata.xbaya.ui.myproxy;
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/ode/ODEInvokerWindow.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/ode/ODEInvokerWindow.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/ode/ODEInvokerWindow.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/ode/ODEInvokerWindow.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.ode.gui;
+package org.apache.airavata.xbaya.ui.ode;
import java.awt.event.ActionEvent;
import java.net.URI;
@@ -47,20 +47,20 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
-import org.apache.airavata.xbaya.gui.GridPanel;
-import org.apache.airavata.xbaya.gui.XBayaDialog;
-import org.apache.airavata.xbaya.gui.XBayaLabel;
-import org.apache.airavata.xbaya.gui.XBayaTextArea;
-import org.apache.airavata.xbaya.gui.XBayaTextComponent;
-import org.apache.airavata.xbaya.gui.XBayaTextField;
import org.apache.airavata.xbaya.invoker.ODEInvoker;
import org.apache.airavata.xbaya.lead.LEADTypes;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.myproxy.MyProxyClient;
-import org.apache.airavata.xbaya.myproxy.gui.MyProxyChecker;
import org.apache.airavata.xbaya.security.UserX509Credential;
import org.apache.airavata.xbaya.security.XBayaSecurity;
+import org.apache.airavata.xbaya.ui.ErrorMessages;
+import org.apache.airavata.xbaya.ui.GridPanel;
+import org.apache.airavata.xbaya.ui.XBayaDialog;
+import org.apache.airavata.xbaya.ui.XBayaLabel;
+import org.apache.airavata.xbaya.ui.XBayaTextArea;
+import org.apache.airavata.xbaya.ui.XBayaTextComponent;
+import org.apache.airavata.xbaya.ui.XBayaTextField;
+import org.apache.airavata.xbaya.ui.myproxy.MyProxyChecker;
import org.apache.airavata.xbaya.workflow.WorkflowClient;
import org.apache.airavata.xbaya.workflow.WorkflowEngineException;
import org.ietf.jgss.GSSCredential;
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/pegasus/PegasusInvokerWindow.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/pegasus/PegasusInvokerWindow.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/pegasus/PegasusInvokerWindow.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/pegasus/PegasusInvokerWindow.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.pegasus.gui;
+package org.apache.airavata.xbaya.ui.pegasus;
import java.awt.event.ActionEvent;
import java.io.BufferedReader;
@@ -40,12 +40,12 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.gui.GridPanel;
-import org.apache.airavata.xbaya.gui.XBayaDialog;
-import org.apache.airavata.xbaya.gui.XBayaLabel;
-import org.apache.airavata.xbaya.gui.XBayaTextField;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
-import org.apache.airavata.xbaya.myproxy.gui.MyProxyChecker;
+import org.apache.airavata.xbaya.ui.GridPanel;
+import org.apache.airavata.xbaya.ui.XBayaDialog;
+import org.apache.airavata.xbaya.ui.XBayaLabel;
+import org.apache.airavata.xbaya.ui.XBayaTextField;
+import org.apache.airavata.xbaya.ui.myproxy.MyProxyChecker;
import org.apache.axis2.AxisFault;
import edu.indiana.extreme.pegasuswebservice.PegasusWebserviceStub;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/pegasus/PegasusMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/pegasus/PegasusMenu.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/pegasus/PegasusMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/pegasus/PegasusMenu.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.pegasus.gui;
+package org.apache.airavata.xbaya.ui.pegasus;
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/registrybrowser/JCRBrowserDialog.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserDialog.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/JCRBrowserDialog.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/JCRBrowserDialog.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserDialog.java&r1=1339684&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/JCRBrowserDialog.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.registrybrowser;
+package org.apache.airavata.xbaya.ui.registrybrowser;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/JCRBrowserPanel.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/JCRBrowserPanel.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/JCRBrowserPanel.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java&r1=1339684&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/JCRBrowserPanel.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.registrybrowser;
+package org.apache.airavata.xbaya.ui.registrybrowser;
import java.awt.BorderLayout;
import java.awt.Component;
@@ -45,15 +45,15 @@ import javax.swing.tree.DefaultTreeModel
import org.apache.airavata.registry.api.AiravataRegistry;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.component.registry.JCRComponentRegistry;
-import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
-import org.apache.airavata.xbaya.registrybrowser.menu.AddAction;
-import org.apache.airavata.xbaya.registrybrowser.menu.DeleteAction;
-import org.apache.airavata.xbaya.registrybrowser.menu.EditAction;
-import org.apache.airavata.xbaya.registrybrowser.menu.ImportAction;
-import org.apache.airavata.xbaya.registrybrowser.menu.RefreshAction;
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;
public class JCRBrowserPanel extends JPanel implements Observer {
private List<AbstractBrowserActionItem> browserActions = new ArrayList<AbstractBrowserActionItem>();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/AbstractBrowserActionItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/AbstractBrowserActionItem.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/AbstractBrowserActionItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/AbstractBrowserActionItem.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.registrybrowser.menu;
+package org.apache.airavata.xbaya.ui.registrybrowser.menu;
import java.awt.event.ActionListener;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/AddAction.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/AddAction.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/AddAction.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/AddAction.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.registrybrowser.menu;
+package org.apache.airavata.xbaya.ui.registrybrowser.menu;
public class AddAction extends AbstractBrowserActionItem {
public static final String ID = "action.add";
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/DeleteAction.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/DeleteAction.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/DeleteAction.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/DeleteAction.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.registrybrowser.menu;
+package org.apache.airavata.xbaya.ui.registrybrowser.menu;
public class DeleteAction extends AbstractBrowserActionItem {
public static final String ID = "action.delete";
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/EditAction.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/EditAction.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/EditAction.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/EditAction.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.registrybrowser.menu;
+package org.apache.airavata.xbaya.ui.registrybrowser.menu;
public class EditAction extends AbstractBrowserActionItem {
public static final String ID = "action.edit";
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/ImportAction.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/ImportAction.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/ImportAction.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/ImportAction.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.registrybrowser.menu;
+package org.apache.airavata.xbaya.ui.registrybrowser.menu;
public class ImportAction extends AbstractBrowserActionItem {
public static final String ID = "action.import";
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/RefreshAction.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/RefreshAction.java?rev=1339748&r1=1339684&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/RefreshAction.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/registrybrowser/menu/RefreshAction.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.registrybrowser.menu;
+package org.apache.airavata.xbaya.ui.registrybrowser.menu;
public class RefreshAction extends AbstractBrowserActionItem {
public static String ID = "action.refresh";
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterListModel.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/ParameterListModel.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterListModel.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterListModel.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/ParameterListModel.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/ParameterListModel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterListModel.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.wf.gui;
+package org.apache.airavata.xbaya.ui.wf;
import java.util.Collections;
import java.util.List;
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterPropertyPanel.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/ParameterPropertyPanel.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterPropertyPanel.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterPropertyPanel.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/ParameterPropertyPanel.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/ParameterPropertyPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterPropertyPanel.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.wf.gui;
+package org.apache.airavata.xbaya.ui.wf;
import java.awt.event.ActionEvent;
import java.util.List;
@@ -36,10 +36,10 @@ 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.gui.GridPanel;
-import org.apache.airavata.xbaya.gui.XBayaComponent;
-import org.apache.airavata.xbaya.gui.XBayaList;
-import org.apache.airavata.xbaya.gui.XBayaTextArea;
+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.xmlpull.infoset.XmlElement;
public class ParameterPropertyPanel implements XBayaComponent {
@@ -69,7 +69,7 @@ public class ParameterPropertyPanel impl
}
/**
- * @see org.apache.airavata.xbaya.gui.XBayaComponent#getSwingComponent()
+ * @see org.apache.airavata.xbaya.ui.XBayaComponent#getSwingComponent()
*/
public JComponent getSwingComponent() {
return getPanel().getSwingComponent();
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterPropertyWindow.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/ParameterPropertyWindow.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterPropertyWindow.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterPropertyWindow.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/ParameterPropertyWindow.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/ParameterPropertyWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/ParameterPropertyWindow.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.wf.gui;
+package org.apache.airavata.xbaya.ui.wf;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
@@ -37,7 +37,7 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.util.GraphUtil;
import org.apache.airavata.workflow.model.graph.ws.WSGraph;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.gui.XBayaDialog;
+import org.apache.airavata.xbaya.ui.XBayaDialog;
import org.xmlpull.infoset.XmlElement;
public class ParameterPropertyWindow {
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/WorkflowMenu.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/WorkflowMenu.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/WorkflowMenu.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/WorkflowMenu.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.wf.gui;
+package org.apache.airavata.xbaya.ui.wf;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -36,10 +36,10 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.datadriven.WorkflowHarvester;
-import org.apache.airavata.xbaya.graph.dynamic.gui.DynamicWorkflowRunnerWindow;
-import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
-import org.apache.airavata.xbaya.gridchem.gui.GridChemRunnerWindow;
-import org.apache.airavata.xbaya.jython.gui.JythonRunnerWindow;
+import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
+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.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/WorkflowPropertyWindow.java (from r1339699, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowPropertyWindow.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/WorkflowPropertyWindow.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/WorkflowPropertyWindow.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowPropertyWindow.java&r1=1339699&r2=1339748&rev=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowPropertyWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/wf/WorkflowPropertyWindow.java Thu May 17 17:54:09 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.wf.gui;
+package org.apache.airavata.xbaya.ui.wf;
import java.awt.event.ActionEvent;
import java.net.URI;
@@ -34,12 +34,12 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
-import org.apache.airavata.xbaya.gui.GridPanel;
-import org.apache.airavata.xbaya.gui.XBayaDialog;
-import org.apache.airavata.xbaya.gui.XBayaLabel;
-import org.apache.airavata.xbaya.gui.XBayaTextArea;
-import org.apache.airavata.xbaya.gui.XBayaTextField;
+import org.apache.airavata.xbaya.ui.GridPanel;
+import org.apache.airavata.xbaya.ui.XBayaDialog;
+import org.apache.airavata.xbaya.ui.XBayaLabel;
+import org.apache.airavata.xbaya.ui.XBayaTextArea;
+import org.apache.airavata.xbaya.ui.XBayaTextField;
+import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
import org.apache.airavata.common.utils.WSConstants;
import org.xmlpull.infoset.XmlElement;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/AmazonUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/AmazonUtil.java?rev=1339748&r1=1339747&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/AmazonUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/AmazonUtil.java Thu May 17 17:54:09 2012
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.airavata.xbaya.amazonEC2.gui.AmazonCredential;
+import org.apache.airavata.xbaya.ui.amazonEC2.AmazonCredential;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.ec2.AmazonEC2;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/InterpreterUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/InterpreterUtil.java?rev=1339748&r1=1339747&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/InterpreterUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/InterpreterUtil.java Thu May 17 17:54:09 2012
@@ -46,13 +46,13 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.ws.WSNode;
import org.apache.airavata.workflow.model.graph.ws.WSPort;
import org.apache.airavata.xbaya.graph.controller.NodeController;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
import org.apache.airavata.xbaya.interpretor.SystemComponentInvoker;
import org.apache.airavata.xbaya.interpretor.WorkFlowInterpreterException;
import org.apache.airavata.xbaya.invoker.GenericInvoker;
import org.apache.airavata.xbaya.invoker.Invoker;
import org.apache.airavata.xbaya.invoker.WorkflowInvokerWrapperForGFacInvoker;
-import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler;
+import org.apache.airavata.xbaya.ui.graph.NodeGUI;
+import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.infoset.impl.XmlElementWithViewsImpl;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java?rev=1339748&r1=1339747&r2=1339748&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java Thu May 17 17:54:09 2012
@@ -50,7 +50,6 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.component.gui.JCRRegistryWindow;
import org.apache.airavata.xbaya.interpretor.NameValue;
import org.apache.airavata.xbaya.interpretor.SystemComponentInvoker;
import org.apache.airavata.xbaya.interpretor.WorkFlowInterpreterException;
@@ -59,6 +58,7 @@ import org.apache.airavata.xbaya.invoker
import org.apache.airavata.xbaya.invoker.WorkflowInvokerWrapperForGFacInvoker;
import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
+import org.apache.airavata.xbaya.ui.component.JCRRegistryWindow;
import org.apache.axis2.util.XMLUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;