[Dive4elements-commits] [PATCH 05 of 11] Use the FLYSHeader instead of the MainMenu

[Wald Commits]

# HG changeset patch
# User Björn Ricks <bjoern.ricks at intevation.de>
# Date 1354265947 -3600
# Node ID 7b8063c2d5890be9b026aff89119beca2f8ca773
# Parent  33bb8bf3899a0bedee8fdfcfd5ffca9f7c414639
Use the FLYSHeader instead of the MainMenu

The MainMenu is obsolete now and got completely replaced by the FLYSHeader.

diff -r 33bb8bf3899a -r 7b8063c2d589 flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java	Fri Nov 30 09:57:56 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java	Fri Nov 30 09:59:07 2012 +0100
@@ -31,7 +31,6 @@
 import de.intevation.flys.client.client.ui.FLYSHeader;
 import de.intevation.flys.client.client.ui.FLYSView;
 import de.intevation.flys.client.client.ui.FLYSWorkspace;
-import de.intevation.flys.client.client.ui.MainMenu;
 import de.intevation.flys.client.client.ui.ProjectList;
 import de.intevation.flys.client.shared.model.Artifact;
 import de.intevation.flys.client.shared.model.Collection;
@@ -77,10 +76,7 @@
     protected CreateCollectionServiceAsync collectionService =
         GWT.create(CreateCollectionService.class);
 
-    /** The menu bar at the top of the application. */
-    protected MainMenu menu;
-
-    /** The content window. It takes the whole space beneath the menu bar. */
+    /** The content window. It takes the whole space beneath the header. */
     protected FLYSView view;
 
     /** The project list that displays the projects of the user. */
@@ -98,6 +94,8 @@
     /** This list is used to track the opened projects. */
     protected List<String> openProjects;
 
+    private FLYSHeader header;
+
 
     public static String getExceptionString(FLYSConstants msg, Throwable caught) {
         try {
@@ -131,11 +129,10 @@
         vertical.setWidth100();
         vertical.setHeight100();
 
-        menu = new MainMenu(this);
         view = new FLYSView();
+        header = new FLYSHeader(this);
 
-        vertical.addMember(new FLYSHeader());
-        vertical.addMember(menu);
+        vertical.addMember(header);
         vertical.addMember(view);
 
         vertical.draw();
@@ -158,7 +155,7 @@
                 GWT.log("Found a user. Set '"+ user.getName() + "'");
                 setCurrentUser(user);
 
-                menu.setCurrentUser(user);
+                header.setCurrentUser(user);
 
                 projectList = new ProjectList(FLYS.this, user);
                 workspace   = new FLYSWorkspace();