You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/11/04 17:06:27 UTC

svn commit: r1197619 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: component/gui/ComponentMenu.java menues/xbaya/XBayaMenuItem.java

Author: lahiru
Date: Fri Nov  4 16:06:27 2011
New Revision: 1197619

URL: http://svn.apache.org/viewvc?rev=1197619&view=rev
Log:
adding import wsdl from url  option

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/XBayaMenuItem.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java?rev=1197619&r1=1197618&r2=1197619&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java Fri Nov  4 16:06:27 2011
@@ -54,8 +54,6 @@ public class ComponentMenu {
 
     private JMenuItem webItem;
 
-    private JMenuItem urlItem;
-
     private JMenuItem removeItem;
 
     private JMenuItem refreshSelectedItem;
@@ -88,7 +86,6 @@ public class ComponentMenu {
     private void createComponentMenu() {
         this.fileRegistryItem = createFileRegistryMenuItem();
         this.webItem = createWebRegistryItem();
-        this.urlItem = createURLRegistryItem();
         this.workflowItem = createWorkflowItem();
         this.removeItem = createRemoveRegistryItem();
         this.refreshSelectedItem = createRefreshSelectedRegistryItem();
@@ -98,7 +95,6 @@ public class ComponentMenu {
         this.componentMenu.setMnemonic(KeyEvent.VK_C);
         this.componentMenu.add(this.fileRegistryItem);
         this.componentMenu.add(this.webItem);
-        this.componentMenu.add(this.urlItem);
         this.componentMenu.add(this.workflowItem);
         this.componentMenu.addSeparator();
         this.componentMenu.add(this.removeItem);
@@ -250,22 +246,6 @@ public class ComponentMenu {
         return item;
     }
 
-    private JMenuItem createURLRegistryItem() {
-        JMenuItem item = new JMenuItem("Add WSDL by URL");
-        item.setMnemonic(KeyEvent.VK_U);
-        item.addActionListener(new AbstractAction() {
-            private URLRegistryWindow window;
-
-            public void actionPerformed(ActionEvent e) {
-                if (this.window == null) {
-                    this.window = new URLRegistryWindow(ComponentMenu.this.engine);
-                }
-                this.window.show();
-            }
-        });
-        return item;
-    }
-
     private JMenuItem createFileRegistryMenuItem() {
         JMenuItem item = new JMenuItem("Add Local Directory");
         item.setMnemonic(KeyEvent.VK_L);

Modified: 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/menues/xbaya/XBayaMenuItem.java?rev=1197619&r1=1197618&r2=1197619&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/menues/xbaya/XBayaMenuItem.java Fri Nov  4 16:06:27 2011
@@ -34,6 +34,8 @@ import org.apache.airavata.xbaya.XBayaEx
 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.ComponentMenu;
+import org.apache.airavata.xbaya.component.gui.URLRegistryWindow;
 import org.apache.airavata.xbaya.experiment.gui.RegistryLoaderWindow;
 import org.apache.airavata.xbaya.ode.ODEDeploymentDescriptor;
 import org.apache.airavata.xbaya.registry.RegistryAccesser;
@@ -56,6 +58,8 @@ public class XBayaMenuItem {
     private BPELFiler bpelFiler;
 
     private ScuflFiler scuflFiler;
+    
+    private JMenuItem urlItem;
 
     private ODEDeploymentDescriptor odeDeploymentDescription;
 
@@ -145,6 +149,7 @@ public class XBayaMenuItem {
         closeWorkflowItem = createCloseWorkflowTabItem();
         closeAllWorkflowItem = createCloseAllWorkflowTabItem();
         nextWorkflowTabItem = createNextWorkflowTabItem();
+        urlItem = createURLRegistryItem();
         
         createRegisterHostDesc();
         createRegisterServiceDesc();
@@ -185,6 +190,8 @@ public class XBayaMenuItem {
         JMenu importMenu = new JMenu("Import");
         	importMenu.add(importWorkflowItemFromFileSystem);
         	importMenu.add(importWorkflowItemFromRegistry);
+        	importMenu.addSeparator();
+        	importMenu.add(urlItem);	
         	
         JMenu exportMenu = new JMenu("Export");
         	exportMenu.add(saveWorkflowtoRegistryItem);
@@ -220,6 +227,22 @@ public class XBayaMenuItem {
         });
     }
     
+    private JMenuItem createURLRegistryItem() {
+        JMenuItem item = new JMenuItem("WSDL from URL");
+        item.setMnemonic(KeyEvent.VK_U);
+        item.addActionListener(new AbstractAction() {
+            private URLRegistryWindow window;
+
+            public void actionPerformed(ActionEvent e) {
+                if (this.window == null) {
+                    this.window = new URLRegistryWindow(engine);
+                }
+                this.window.show();
+            }
+        });
+        return item;
+    }
+    
     private void createRegisterServiceDesc() {
         this.registerServiceDesc = new JMenuItem("Service Description...");