airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1197565 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: component/gui/ gui/ menues/edit/ menues/registry/ menues/tools/ menues/view/ menues/xbaya/
Date Fri, 04 Nov 2011 13:44:48 GMT
Author: lahiru
Date: Fri Nov  4 13:44:48 2011
New Revision: 1197565

URL: http://svn.apache.org/viewvc?rev=1197565&view=rev
Log:
https://issues.apache.org/jira/browse/AIRAVATA-102 etc.

Added:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/
  (with props)
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java
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/gui/XBayaMenu.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/edit/EditMenuItem.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/registry/RegistryMenuItem.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/view/ViewMenuItem.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=1197565&r1=1197564&r2=1197565&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 13:44:48 2011
@@ -66,7 +66,6 @@ public class ComponentMenu {
 
     private JMenuItem workflowItem;
 
-    private JMenuItem globusFileTransferItem;
 
     /**
      * Constructs a ComponentMenu.
@@ -88,7 +87,6 @@ public class ComponentMenu {
 
     private void createComponentMenu() {
         this.fileRegistryItem = createFileRegistryMenuItem();
-        this.globusFileTransferItem = createGlobusFileTransferItem();
         this.webItem = createWebRegistryItem();
         this.urlItem = createURLRegistryItem();
         this.workflowItem = createWorkflowItem();
@@ -99,7 +97,6 @@ public class ComponentMenu {
         this.componentMenu = new JMenu("Component");
         this.componentMenu.setMnemonic(KeyEvent.VK_C);
         this.componentMenu.add(this.fileRegistryItem);
-        this.componentMenu.add(this.globusFileTransferItem);
         this.componentMenu.add(this.webItem);
         this.componentMenu.add(this.urlItem);
         this.componentMenu.add(this.workflowItem);
@@ -269,22 +266,6 @@ public class ComponentMenu {
         return item;
     }
 
-    private JMenuItem createGlobusFileTransferItem() {
-        JMenuItem item = new JMenuItem("Globus File Transfer");
-        item.setMnemonic(KeyEvent.VK_J);
-        item.addActionListener(new AbstractAction() {
-            private GlobusFileTransferWindow window;
-
-            public void actionPerformed(ActionEvent e) {
-                if (this.window == null) {
-                    this.window = new GlobusFileTransferWindow(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/gui/XBayaMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java?rev=1197565&r1=1197564&r2=1197565&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java
Fri Nov  4 13:44:48 2011
@@ -41,6 +41,7 @@ import org.apache.airavata.xbaya.gpel.gu
 import org.apache.airavata.xbaya.menues.edit.EditMenuItem;
 import org.apache.airavata.xbaya.menues.registry.RegistryMenuItem;
 import org.apache.airavata.xbaya.menues.run.RunMenuItem;
+import org.apache.airavata.xbaya.menues.tools.ToolsMenuItem;
 import org.apache.airavata.xbaya.menues.view.ViewMenuItem;
 import org.apache.airavata.xbaya.menues.xbaya.XBayaMenuItem;
 import org.apache.airavata.xbaya.monitor.gui.MonitorMenu;
@@ -83,6 +84,8 @@ public class XBayaMenu implements XBayaC
 
 	private RegistryMenuItem registryMenuItem;
 
+	private ToolsMenuItem toolsMenuItem;
+
     /**
      * Constructs an XwfMenu.
      * 
@@ -98,6 +101,7 @@ public class XBayaMenu implements XBayaC
         viewMenuItem = new ViewMenuItem(engine);
         runMenuItem = new RunMenuItem(engine);
         registryMenuItem = new RegistryMenuItem(engine);
+        toolsMenuItem = new ToolsMenuItem(engine);
         
         this.workflowMenu = new WorkflowMenu(this.engine);
         this.experimentMenu = new ExperimentMenu(this.engine);
@@ -129,6 +133,7 @@ public class XBayaMenu implements XBayaC
         menuBar.add(editMenuItem.getMenu());
         menuBar.add(viewMenuItem.getMenu());
         menuBar.add(runMenuItem.getMenu());
+        menuBar.add(toolsMenuItem.getMenu());
         menuBar.add(registryMenuItem.getMenu());
 
 //        this.menuBar.add(this.fileMenu.getMenu());

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/edit/EditMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/edit/EditMenuItem.java?rev=1197565&r1=1197564&r2=1197565&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/edit/EditMenuItem.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/edit/EditMenuItem.java
Fri Nov  4 13:44:48 2011
@@ -132,6 +132,8 @@ public class EditMenuItem {
             	//TODO
             }
         });
+        //FIXME enable the menu once this functionality is implemented
+        menuItem.setEnabled(false);
         return menuItem;
     }
     
@@ -142,6 +144,8 @@ public class EditMenuItem {
             	//TODO
             }
         });
+        //FIXME enable the menu once this functionality is implemented
+        menuItem.setEnabled(false);        
         return menuItem;
     }
     
@@ -152,6 +156,8 @@ public class EditMenuItem {
             	//TODO
             }
         });
+        //FIXME enable the menu once this functionality is implemented
+        menuItem.setEnabled(false);        
         return menuItem;
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/registry/RegistryMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/registry/RegistryMenuItem.java?rev=1197565&r1=1197564&r2=1197565&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/registry/RegistryMenuItem.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/registry/RegistryMenuItem.java
Fri Nov  4 13:44:48 2011
@@ -68,7 +68,7 @@ public class RegistryMenuItem {
         this.jcrRegistryItem = createJCRRegistryItem();
 
         registryMenu = new JMenu("Registry");
-        registryMenu.setMnemonic(KeyEvent.VK_R);
+        registryMenu.setMnemonic(KeyEvent.VK_G);
 
         registryMenu.add(this.jcrRegistryItem);
 

Propchange: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/
------------------------------------------------------------------------------
    bugtraq:number = true

Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java?rev=1197565&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java
(added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java
Fri Nov  4 13:44:48 2011
@@ -0,0 +1,90 @@
+/*
+ *
+ * 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.menues.tools;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.component.gui.GlobusFileTransferWindow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ToolsMenuItem {
+
+    private XBayaEngine engine;
+
+    private JMenu toolsMenu;
+    
+    private JMenuItem globusFileTransferItem;
+    
+    private static final Logger logger = LoggerFactory.getLogger(ToolsMenuItem.class);
+
+    /**
+     * Constructs a WorkflowMenu.
+     * 
+     * @param engine
+     */
+    public ToolsMenuItem(XBayaEngine engine) {
+        this.engine = engine;
+        createWorkflowMenu();
+    }
+
+    /**
+     * @return The workflow menu.
+     */
+    public JMenu getMenu() {
+        return this.toolsMenu;
+    }
+
+    /**
+     * Creates workflow menu.
+     */
+    private void createWorkflowMenu() {
+        this.globusFileTransferItem = createGlobusFileTransferItem();
+
+        toolsMenu = new JMenu("Tools");
+        toolsMenu.setMnemonic(KeyEvent.VK_T);
+        toolsMenu.add(this.globusFileTransferItem);
+
+    }
+    
+    private JMenuItem createGlobusFileTransferItem() {
+        JMenuItem item = new JMenuItem("Globus File Transfer");
+        item.setMnemonic(KeyEvent.VK_J);
+        item.addActionListener(new AbstractAction() {
+            private GlobusFileTransferWindow window;
+
+            public void actionPerformed(ActionEvent e) {
+                if (this.window == null) {
+                    this.window = new GlobusFileTransferWindow(engine);
+                }
+                this.window.show();
+            }
+        });
+        return item;
+    }
+}
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/view/ViewMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/view/ViewMenuItem.java?rev=1197565&r1=1197564&r2=1197565&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/view/ViewMenuItem.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/view/ViewMenuItem.java
Fri Nov  4 13:44:48 2011
@@ -34,100 +34,109 @@ import org.slf4j.LoggerFactory;
 
 public class ViewMenuItem {
 
-    private XBayaEngine engine;
+	private XBayaEngine engine;
 
-    private JMenu viewMenu;
+	private JMenu viewMenu;
 
-    private JMenuItem jcrRegistryView;
+	private JMenuItem jcrRegistryView;
 
-    private JMenuItem componentsView;
+	private JMenuItem componentsView;
 
 	private JMenuItem monitoringView;
 
 	private JMenuItem parametersView;
 
-    private static final Logger logger = LoggerFactory.getLogger(ViewMenuItem.class);
+	private static final Logger logger = LoggerFactory
+			.getLogger(ViewMenuItem.class);
+
+	/**
+	 * Constructs a WorkflowMenu.
+	 * 
+	 * @param engine
+	 */
+	public ViewMenuItem(XBayaEngine engine) {
+		this.engine = engine;
+		createWorkflowMenu();
+	}
+
+	/**
+	 * @return The workflow menu.
+	 */
+	public JMenu getMenu() {
+		return this.viewMenu;
+	}
+
+	/**
+	 * Creates workflow menu.
+	 */
+	private void createWorkflowMenu() {
+		this.jcrRegistryView = createShpwJCRRegistryView();
+		this.componentsView = createShowComponentsView();
+
+		monitoringView = createShowMonitoringView();
+		parametersView = createShowParameterView();
+
+		viewMenu = new JMenu("View");
+		viewMenu.setMnemonic(KeyEvent.VK_V);
+
+		viewMenu.add(this.jcrRegistryView);
+
+		viewMenu.addSeparator();
+
+		viewMenu.add(this.componentsView);
+
+		viewMenu.addSeparator();
+
+		viewMenu.add(monitoringView);
+		viewMenu.add(parametersView);
+	}
+
+	private JMenuItem createShpwJCRRegistryView() {
+		JMenuItem menuItem = new JMenuItem("JCR Registry");
+		menuItem.addActionListener(new AbstractAction() {
+			public void actionPerformed(ActionEvent e) {
+				// TODO
+			}
+		});
+		// FIXME remove this once save all functionality is fixed
+		menuItem.setEnabled(false);
+		return menuItem;
+	}
+
+	private JMenuItem createShowComponentsView() {
+		JMenuItem menuItem = new JMenuItem("Components");
+		menuItem.addActionListener(new AbstractAction() {
+			public void actionPerformed(ActionEvent e) {
+				// TODO
+			}
+		});
+		// FIXME remove this once save all functionality is fixed
+		menuItem.setEnabled(false);
+		return menuItem;
+	}
+
+	private JMenuItem createShowMonitoringView() {
+		JMenuItem menuItem = new JMenuItem("Monitoring");
+		menuItem.addActionListener(new AbstractAction() {
+			public void actionPerformed(ActionEvent e) {
+				// TODO
+			}
+		});
+		// FIXME remove this once save all functionality is fixed
+		menuItem.setEnabled(false);
+		return menuItem;
+	}
+
+	private JMenuItem createShowParameterView() {
+		JMenuItem menuItem = new JMenuItem("Parameters");
+		menuItem.addActionListener(new AbstractAction() {
+			public void actionPerformed(ActionEvent e) {
+				// TODO
+			}
+		});
+		// FIXME remove this once save all functionality is fixed
+		menuItem.setEnabled(false);
+		return menuItem;
+	}
 
-    /**
-     * Constructs a WorkflowMenu.
-     * 
-     * @param engine
-     */
-    public ViewMenuItem(XBayaEngine engine) {
-        this.engine = engine;
-        createWorkflowMenu();
-    }
-
-    /**
-     * @return The workflow menu.
-     */
-    public JMenu getMenu() {
-        return this.viewMenu;
-    }
-
-    /**
-     * Creates workflow menu.
-     */
-    private void createWorkflowMenu() {
-        this.jcrRegistryView = createShpwJCRRegistryView();
-        this.componentsView = createShowComponentsView();
-
-        monitoringView = createShowMonitoringView();
-        parametersView = createShowParameterView();
-
-        viewMenu = new JMenu("View");
-        viewMenu.setMnemonic(KeyEvent.VK_V);
-
-        viewMenu.add(this.jcrRegistryView);
-        
-        viewMenu.addSeparator();
-        
-        viewMenu.add(this.componentsView);
-        
-        viewMenu.addSeparator();
-        
-        viewMenu.add(monitoringView);
-        viewMenu.add(parametersView);
-    }
-
-    private JMenuItem createShpwJCRRegistryView() {
-        JMenuItem menuItem = new JMenuItem("JCR Registry");
-        menuItem.addActionListener(new AbstractAction() {
-            public void actionPerformed(ActionEvent e) {
-            	//TODO
-            }
-        });
-        return menuItem;
-    }
-
-    private JMenuItem createShowComponentsView() {
-        JMenuItem menuItem = new JMenuItem("Components");
-        menuItem.addActionListener(new AbstractAction() {
-            public void actionPerformed(ActionEvent e) {
-            	//TODO
-            }
-        });
-        return menuItem;
-    }
-
-    private JMenuItem createShowMonitoringView() {
-        JMenuItem menuItem = new JMenuItem("Monitoring");
-        menuItem.addActionListener(new AbstractAction() {
-            public void actionPerformed(ActionEvent e) {
-            	//TODO
-            }
-        });
-        return menuItem;
-    }
-    
-    private JMenuItem createShowParameterView() {
-        JMenuItem menuItem = new JMenuItem("Parameters");
-        menuItem.addActionListener(new AbstractAction() {
-            public void actionPerformed(ActionEvent e) {
-            	//TODO
-            }
-        });
-        return menuItem;
-    }
-    
 }
\ No newline at end of file

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=1197565&r1=1197564&r2=1197565&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 13:44:48 2011
@@ -151,7 +151,7 @@ public class XBayaMenuItem {
         createRegisterApplicationDesc();
         
         xbayaMenuItem = new JMenu("XBaya");
-        xbayaMenuItem.setMnemonic(KeyEvent.VK_F);
+        xbayaMenuItem.setMnemonic(KeyEvent.VK_X);
         
         JMenu newMenu = new JMenu("New");
 	        newMenu.add(newWorkflowTabItem);
@@ -380,6 +380,8 @@ public class XBayaMenuItem {
                 XBayaMenuItem.this.graphFiler.saveAllWorkflows();
             }
         });
+        //FIXME remove this once save all functionality is fixed
+        saveAllWorkflowItem.setEnabled(false);
     }
 
     private void createImportWorkflowItemFromFileSystem() {



Mime
View raw message