Cleaned up Edit menu

[pithos-web-client] / src / gr / grnet / pithos / web / client / TopPanel.java

diff --git a/src/gr/grnet/pithos/web/client/TopPanel.java b/src/gr/grnet/pithos/web/client/TopPanel.java
index b10d5fd..8e9c05a 100644 (file)
--- a/src/gr/grnet/pithos/web/client/TopPanel.java
+++ b/src/gr/grnet/pithos/web/client/TopPanel.java
@@ -1,5 +1,36 @@
 /*
- * Copyright (c) 2011 Greek Research and Technology Network
+ * Copyright 2011 GRNET S.A. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and
+ * documentation are those of the authors and should not be
+ * interpreted as representing official policies, either expressed
+ * or implied, of GRNET S.A.
  */
 package gr.grnet.pithos.web.client;
 
@@ -60,31 +91,6 @@ public class TopPanel extends Composite {
        }
 
        /**
-        * The menu bar widget.
-        */
-       private MenuBar menu;
-
-       /**
-        * The file menu widget.
-        */
-       private FileMenu fileMenu;
-
-       /**
-        * The edit menu widget.
-        */
-       private EditMenu editMenu;
-
-       /**
-        * The settings menu widget.
-        */
-       private SettingsMenu settingsMenu;
-
-       /**
-        * The help menu widget.
-        */
-       private HelpMenu helpMenu;
-
-       /**
         * A widget that displays a message indicating that communication with the
         * server is underway.
         */
@@ -95,18 +101,14 @@ public class TopPanel extends Composite {
         *
         * @param images the supplied images
         */
-       public TopPanel(Images images) {
-               fileMenu = new FileMenu(images);
-               editMenu = new EditMenu(images);
-               settingsMenu = new SettingsMenu(images);
-               helpMenu = new HelpMenu(images);
+       public TopPanel(final Images images) {
                loading = new LoadingIndicator(images);
         loading.hide();
                HorizontalPanel outer = new HorizontalPanel();
 
                outer.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_LEFT);
 
-               menu = new MenuBar();
+               MenuBar menu = new MenuBar();
                menu.setWidth("100%");
                menu.setAutoOpen(false);
                menu.setAnimationEnabled(true);
@@ -121,45 +123,26 @@ public class TopPanel extends Composite {
                };
                MenuItem quitItem = new MenuItem("<table style='font-size: 100%'><tr><td>" +
                                        AbstractImagePrototype.create(images.exit()).getHTML() + "</td><td>Quit</td></tr></table>", true, quitCommand);
-               quitItem.getElement().setId("topMenu.quit");
-               
+
                MenuItem fileItem = new MenuItem("<table style='font-size: 100%'><tr><td>" +
                                        AbstractImagePrototype.create(images.folder()).getHTML() + "</td><td>File</td></tr></table>", true, new MenuBar(true)){
                        @Override
                        public MenuBar getSubMenu() {
-                               return fileMenu.createMenu();
+                               return new FileMenu(GSS.get(), images);
                        }
                };
-               fileItem.getElement().setId("topMenu.file");
-               
+
                MenuItem editItem = new MenuItem("<table style='font-size: 100%'><tr><td>" +
                                        AbstractImagePrototype.create(images.edit()).getHTML() + "</td><td>Edit</td></tr></table>", true, new MenuBar(true)){
                        @Override
                        public MenuBar getSubMenu() {
-                               return editMenu.createMenu();
-                       }
-               };
-               editItem.getElement().setId("topMenu.edit");
-               
-               MenuItem configureItem = new MenuItem("<table style='font-size: 100%'><tr><td>" +
-                                       AbstractImagePrototype.create(images.configure()).getHTML() + "</td><td>Settings</td></tr></table>",
-                                       true,settingsMenu.getContextMenu());
-               configureItem.getElement().setId("topMenu.settings");
-               
-               MenuItem helpItem = new MenuItem("<table style='font-size: 100%'><tr><td>" +
-                                       AbstractImagePrototype.create(images.help()).getHTML() + "</td><td>Help</td></tr></table>", true, new MenuBar(true)){
-                       @Override
-                       public MenuBar getSubMenu() {
-                               return helpMenu.createMenu();
+                               return new EditMenu(GSS.get(), images);
                        }
                };
-               helpItem.getElement().setId("topMenu.help");
-               
+
                menu.addItem(quitItem);
                menu.addItem(fileItem);
                menu.addItem(editItem);
-               menu.addItem(configureItem);
-               menu.addItem(helpItem);
 
                outer.setSpacing(2);
                outer.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
@@ -188,22 +171,4 @@ public class TopPanel extends Composite {
        public LoadingIndicator getLoading() {
                return loading;
        }
-
-       /**
-        * Retrieve the fileMenu.
-        *
-        * @return the fileMenu
-        */
-       FileMenu getFileMenu() {
-               return fileMenu;
-       }
-
-       /**
-        * Retrieve the editMenu.
-        *
-        * @return the editMenu
-        */
-       EditMenu getEditMenu() {
-               return editMenu;
-       }
 }