cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomek...@apache.org
Subject svn commit: r1030396 [1/2] - in /cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client: ./ event/ ui/ ui/accesscontroler/ ui/browser/ ui/common/ ui/resources/ ui/settings/
Date Wed, 03 Nov 2010 10:33:22 GMT
Author: tomekopo
Date: Wed Nov  3 10:33:20 2010
New Revision: 1030396

URL: http://svn.apache.org/viewvc?rev=1030396&view=rev
Log:
Refactoring of user interface - fixes according to MVP design pattern. This is small part of bigger whole. Project compile successfully, but there can be issues in runtime.

Added:
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/event/GoToEditCriteriaEvent.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/event/GoToEditCriteriaEventHandler.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/AbstractDialog.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/BindStrategy.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/DialogBindStrategyImpl.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/PresenterWidget.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/WidgetBindStrategyImpl.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaPresenter.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaView.java
      - copied, changed from r1023578, cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialog.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaView.ui.xml
      - copied unchanged from r1023578, cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialog.ui.xml
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaViewImpl.java
      - copied, changed from r1023578, cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialogImpl.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarPresenter.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarView.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarView.ui.xml
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarViewImpl.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderPresenter.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderView.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderView.ui.xml
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderViewImpl.java
Removed:
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialog.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialog.ui.xml
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialogImpl.java
Modified:
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/Dispatcher.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/Module.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/BasePresenter.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/accesscontroler/AccessControlPresenter.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowsePresenter.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseView.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseView.ui.xml
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseViewImpl.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/resources/LogBrowserConstans.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsPresenter.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsView.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsView.ui.xml
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsViewImpl.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SubscriptionDialog.java
    cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SubscriptionDialogImpl.java

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/Dispatcher.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/Dispatcher.java?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/Dispatcher.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/Dispatcher.java Wed Nov  3 10:33:20 2010
@@ -25,11 +25,12 @@ import javax.annotation.Nullable;
 import com.google.gwt.user.client.ui.RootLayoutPanel;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-
 import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToAccessControlerEvent;
 import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToAccessControlerEventHandler;
 import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToBrowserEvent;
 import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToBrowserEventHandler;
+import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToEditCriteriaEvent;
+import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToEditCriteriaEventHandler;
 import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToSettingsEvent;
 import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToSettingsEventHandler;
 import org.apache.cxf.management.web.logging.logbrowser.client.event.SignOutEvent;
@@ -39,10 +40,11 @@ import org.apache.cxf.management.web.log
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.Presenter;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.accesscontroler.AccessControlPresenter;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.browser.BrowsePresenter;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.browser.EditCriteriaPresenter;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.settings.SettingsPresenter;
 
 import static org.apache.cxf.management.web.logging.logbrowser.client.service.settings.SettingsFacade
-    .StorageStrategy.LOCAL_AND_REMOTE;
+        .StorageStrategy.LOCAL_AND_REMOTE;
 
 public class Dispatcher {
 
@@ -56,6 +58,9 @@ public class Dispatcher {
     private final Provider<BrowsePresenter> browseProvider;
 
     @Nonnull
+    private final Provider<EditCriteriaPresenter> editCriteriaProvider;
+
+    @Nonnull
     private final Provider<SettingsPresenter> settingsProvider;
 
     @Nonnull
@@ -69,10 +74,12 @@ public class Dispatcher {
                       @Nonnull final SettingsFacade settingsFacade,
                       @Nonnull final Provider<AccessControlPresenter> accessControlProvider,
                       @Nonnull final Provider<BrowsePresenter> browseProvider,
+                      @Nonnull final Provider<EditCriteriaPresenter> editCriteriaProvider,
                       @Nonnull final Provider<SettingsPresenter> settingsProvider) {
         this.eventBus = eventBus;
         this.accessControlProvider = accessControlProvider;
         this.browseProvider = browseProvider;
+        this.editCriteriaProvider = editCriteriaProvider;
         this.settingsProvider = settingsProvider;
         this.settingsFacade = settingsFacade;
 
@@ -112,6 +119,12 @@ public class Dispatcher {
             }
         });
 
+        eventBus.addHandler(GoToEditCriteriaEvent.TYPE, new GoToEditCriteriaEventHandler() {
+            public void onGoToEditCriteria(@Nonnull final GoToEditCriteriaEvent event) {
+                go(editCriteriaProvider.get());
+            }
+        });
+
         eventBus.addHandler(GoToSettingsEvent.TYPE, new GoToSettingsEventHandler() {
 
             public void onGoToSettings(@Nonnull final GoToSettingsEvent event) {

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/Module.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/Module.java?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/Module.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/Module.java Wed Nov  3 10:33:20 2010
@@ -20,17 +20,25 @@
 package org.apache.cxf.management.web.logging.logbrowser.client;
 
 import com.google.gwt.inject.client.AbstractGinModule;
-
+import com.google.inject.name.Names;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.IdentifierGenerator;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.IdentifierGeneratorImpl;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.LocalStorage;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.LocalStorageImpl;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.RemoteStorageProxy;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.RemoteStorageProxyImpl;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.BindStrategy;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.WidgetBindStrategyImpl;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.accesscontroler.AccessControlView;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.accesscontroler.AccessControlViewImpl;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.browser.BrowseView;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.browser.BrowseViewImpl;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.browser.EditCriteriaView;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.browser.EditCriteriaViewImpl;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.browser.NavigationSidebarView;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.browser.NavigationSidebarViewImpl;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.common.NavigationHeaderView;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.common.NavigationHeaderViewImpl;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.settings.SettingsView;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.settings.SettingsViewImpl;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.settings.SubscriptionDialog;
@@ -46,8 +54,37 @@ public class Module extends AbstractGinM
         bind(SettingsView.class).to(SettingsViewImpl.class);
         bind(SubscriptionDialog.class).to(SubscriptionDialogImpl.class);
         bind(BrowseView.class).to(BrowseViewImpl.class);
+        bind(NavigationHeaderView.class).to(NavigationHeaderViewImpl.class);
+        bind(NavigationSidebarView.class).to(NavigationSidebarViewImpl.class);
+        bind(EditCriteriaView.class).to(EditCriteriaViewImpl.class);
         bind(RemoteStorageProxy.class).to(RemoteStorageProxyImpl.class);
         bind(LocalStorage.class).to(LocalStorageImpl.class);
+
+        //TODO move it to view class:
+
+        bind(BindStrategy.class)
+                .annotatedWith(Names.named("BindStrategyForAccessControl"))
+                .to(WidgetBindStrategyImpl.class);
+
+        bind(BindStrategy.class)
+                .annotatedWith(Names.named("BindStrategyForBrowser"))
+                .to(WidgetBindStrategyImpl.class);
+
+        bind(BindStrategy.class)
+                .annotatedWith(Names.named("BindStrategyForNavigationHeader"))
+                .to(WidgetBindStrategyImpl.class);
+
+        bind(BindStrategy.class)
+                .annotatedWith(Names.named("BindStrategyForNavigationHeader"))
+                .to(WidgetBindStrategyImpl.class);        
+
+        bind(BindStrategy.class)
+                .annotatedWith(Names.named("BindStrategyForNavigationSidebar"))
+                .to(WidgetBindStrategyImpl.class);
+
+        bind(BindStrategy.class)
+                .annotatedWith(Names.named("BindStrategyForSettings"))
+                .to(WidgetBindStrategyImpl.class);        
     }
 
 }

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/event/GoToEditCriteriaEvent.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/event/GoToEditCriteriaEvent.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/event/GoToEditCriteriaEvent.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/event/GoToEditCriteriaEvent.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,39 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.event;
+
+import javax.annotation.Nonnull;
+
+import com.google.gwt.event.shared.GwtEvent;
+
+public class GoToEditCriteriaEvent extends GwtEvent<GoToEditCriteriaEventHandler> {
+    public static final Type<GoToEditCriteriaEventHandler> TYPE = new Type<GoToEditCriteriaEventHandler>();
+
+    @Override
+    @Nonnull
+    public Type<GoToEditCriteriaEventHandler> getAssociatedType() {
+        return TYPE;
+    }
+
+    @Override
+    protected void dispatch(@Nonnull final GoToEditCriteriaEventHandler handler) {
+        handler.onGoToEditCriteria(this);
+    }
+}

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/event/GoToEditCriteriaEventHandler.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/event/GoToEditCriteriaEventHandler.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/event/GoToEditCriteriaEventHandler.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/event/GoToEditCriteriaEventHandler.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,26 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.event;
+
+import com.google.gwt.event.shared.EventHandler;
+
+public interface GoToEditCriteriaEventHandler extends EventHandler {
+    void onGoToEditCriteria(GoToEditCriteriaEvent event);
+}

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/AbstractDialog.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/AbstractDialog.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/AbstractDialog.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/AbstractDialog.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,37 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui;
+
+import javax.annotation.Nonnull;
+
+import com.google.gwt.user.client.ui.DialogBox;
+import com.google.gwt.user.client.ui.Widget;
+
+public abstract class AbstractDialog extends DialogBox {
+
+    protected void init(@Nonnull final String title, @Nonnull final Widget widget) {
+        setGlassEnabled(true);
+        setAnimationEnabled(false);
+        setAutoHideEnabled(true);
+
+        setText(title);
+        setWidget(widget);
+    }
+}

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/BasePresenter.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/BasePresenter.java?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/BasePresenter.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/BasePresenter.java Wed Nov  3 10:33:20 2010
@@ -21,11 +21,10 @@ package org.apache.cxf.management.web.lo
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.annotation.Nonnull;
 
 import com.google.gwt.event.shared.HandlerRegistration;
-
+import com.google.gwt.user.client.ui.HasWidgets;
 import org.apache.cxf.management.web.logging.logbrowser.client.EventBus;
 
 public abstract class BasePresenter implements Presenter {
@@ -34,14 +33,29 @@ public abstract class BasePresenter impl
     protected final EventBus eventBus;
 
     @Nonnull
+    private final View view;
+
+    @Nonnull
+    private final BindStrategy bindStrategy;
+
+    @Nonnull
     private final List<HandlerRegistration> handlerRegistrations;
 
-    public BasePresenter(@Nonnull final EventBus eventBus) {
+    public BasePresenter(@Nonnull final EventBus eventBus, @Nonnull final View view,
+                         @Nonnull final BindStrategy bindStrategy) {
         this.eventBus = eventBus;
+        this.view = view;
+        this.bindStrategy = bindStrategy;
         this.handlerRegistrations = new ArrayList<HandlerRegistration>();
     }
 
+    public void go(HasWidgets container) {
+        bindStrategy.bind(container, view);
+    }
+
     public void unbind() {
+        bindStrategy.unbind(view);
+        
         for (HandlerRegistration handlerRegistration : handlerRegistrations) {
             handlerRegistration.removeHandler();
         }

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/BindStrategy.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/BindStrategy.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/BindStrategy.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/BindStrategy.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,30 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui;
+
+import javax.annotation.Nonnull;
+
+import com.google.gwt.user.client.ui.HasWidgets;
+
+//TODO view should decide how to present it - bindstrategy should be receive by View not inject to presenter
+public interface BindStrategy {
+    void bind(@Nonnull HasWidgets container, @Nonnull View view);
+    void unbind(@Nonnull View view);
+}

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/DialogBindStrategyImpl.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/DialogBindStrategyImpl.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/DialogBindStrategyImpl.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/DialogBindStrategyImpl.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,42 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui;
+
+import javax.annotation.Nonnull;
+
+import com.google.gwt.user.client.ui.DialogBox;
+import com.google.gwt.user.client.ui.HasWidgets;
+import com.google.inject.Singleton;
+
+@Singleton
+public class DialogBindStrategyImpl implements BindStrategy {
+    
+    public void bind(@Nonnull final HasWidgets container, @Nonnull final View view) {
+        assert view instanceof DialogBox;
+
+        ((DialogBox) view).center();
+    }
+
+    public void unbind(@Nonnull final View view) {
+        assert view instanceof DialogBox;
+
+        ((DialogBox) view).hide();
+    }
+}

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/PresenterWidget.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/PresenterWidget.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/PresenterWidget.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/PresenterWidget.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,27 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui;
+
+import com.google.gwt.user.client.ui.HasWidgets;
+
+public interface PresenterWidget {
+    void bind(HasWidgets container, View view);
+    void unbind();
+}

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/WidgetBindStrategyImpl.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/WidgetBindStrategyImpl.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/WidgetBindStrategyImpl.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/WidgetBindStrategyImpl.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,39 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui;
+
+import javax.annotation.Nonnull;
+
+import com.google.gwt.user.client.ui.HasWidgets;
+import com.google.inject.Singleton;
+
+@Singleton
+public class WidgetBindStrategyImpl implements BindStrategy {
+
+    public void bind(@Nonnull final HasWidgets container, @Nonnull final View view) {
+        assert view.asWidget() != null;
+
+        container.clear();
+        container.add(view.asWidget());
+    }
+
+    public void unbind(@Nonnull final View view) {
+    }
+}

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/accesscontroler/AccessControlPresenter.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/accesscontroler/AccessControlPresenter.java?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/accesscontroler/AccessControlPresenter.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/accesscontroler/AccessControlPresenter.java Wed Nov  3 10:33:20 2010
@@ -24,18 +24,19 @@ import javax.annotation.Nullable;
 
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.inject.Inject;
-
+import com.google.inject.name.Named;
 import org.apache.cxf.management.web.logging.logbrowser.client.EventBus;
 import org.apache.cxf.management.web.logging.logbrowser.client.event.RemoteStorageAccessDeniedEvent;
 import org.apache.cxf.management.web.logging.logbrowser.client.event.RemoteStorageAccessDeniedEventHandler;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.Credentials;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.SettingsFacade;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.BasePresenter;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.BindStrategy;
 
-import static org.apache.cxf.management.web.logging.logbrowser.client.service.settings.
-    SettingsFacade.StorageStrategy.LOCAL_AND_REMOTE;
-import static org.apache.cxf.management.web.logging.logbrowser.client.service.settings.
-    SettingsFacade.StorageStrategy.REMOTE;
+import static org.apache.cxf.management.web.logging.logbrowser.client.service.settings
+        .SettingsFacade.StorageStrategy.LOCAL_AND_REMOTE;
+import static org.apache.cxf.management.web.logging.logbrowser.client.service.settings
+        .SettingsFacade.StorageStrategy.REMOTE;
 
 public class AccessControlPresenter extends BasePresenter implements AccessControlView.Presenter {
 
@@ -46,9 +47,11 @@ public class AccessControlPresenter exte
     private final SettingsFacade settingsFacade;
 
     @Inject
-    public AccessControlPresenter(@Nonnull final EventBus eventBus, @Nonnull final AccessControlView view,
-                                  @Nonnull final SettingsFacade settingsFacade) {
-        super(eventBus);
+    public AccessControlPresenter(@Nonnull final EventBus eventBus,
+            @Nonnull final AccessControlView view,
+            @Nonnull @Named("BindStrategyForAccessControl") final BindStrategy bindStrategy,
+            @Nonnull final SettingsFacade settingsFacade) {
+        super(eventBus, view, bindStrategy);
 
         this.view = view;
         this.settingsFacade = settingsFacade;

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowsePresenter.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowsePresenter.java?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowsePresenter.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowsePresenter.java Wed Nov  3 10:33:20 2010
@@ -23,17 +23,16 @@ import java.util.List;
 import javax.annotation.Nonnull;
 
 import com.google.gwt.http.client.Request;
-import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.inject.Inject;
-
+import com.google.inject.name.Named;
 import org.apache.cxf.management.web.logging.logbrowser.client.EventBus;
-import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToSettingsEvent;
-import org.apache.cxf.management.web.logging.logbrowser.client.event.SignOutEvent;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.browser.Feed;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.browser.FeedProxyImpl;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.SettingsFacade;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.Subscription;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.BasePresenter;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.BindStrategy;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.common.NavigationHeaderPresenter;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.resources.LogBrowserConstans;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.resources.LogBrowserResources;
 
@@ -59,14 +58,17 @@ public class BrowsePresenter extends Bas
     @Nonnull
     private Feed feed;
 
+    // CHECKSTYLE:OFF
     @Inject
     public BrowsePresenter(@Nonnull final EventBus eventBus,
                            @Nonnull final BrowseView view,
+                           @Nonnull @Named("BindStrategyForBrowser") final BindStrategy bindStrategy,
+                           @Nonnull final NavigationHeaderPresenter navigationHeaderPresenter,
                            @Nonnull final SettingsFacade settingsManager,
                            @Nonnull final FeedProxyImpl proxy,
                            @Nonnull final LogBrowserConstans constans,
                            @Nonnull final LogBrowserResources resources) {
-        super(eventBus);
+        super(eventBus, view, bindStrategy);
 
         this.view = view;
         this.proxy = proxy;
@@ -75,23 +77,17 @@ public class BrowsePresenter extends Bas
         this.resources = resources;
 
         this.view.setPresenter(this);
-        
+
         setFeed(Feed.EMPTY);
         updateSubscriptions();
+
+        navigationHeaderPresenter.go(view.getNaviagationHeaderSlot());
     }
+    // CHECKSTYLE:ON
 
     private void updateSubscriptions() {
         subscriptions = settingsManager.getSubscriptions();
-        view.setSubscriptions(subscriptions);
-    }
-
-    public void go(@Nonnull final HasWidgets container) {
-        container.clear();
-        container.add(view.asWidget());
-    }
-
-    public void onManageSubscriptionsButtonClicked() {
-        eventBus.fireEvent(new GoToSettingsEvent());
+//        view.setSubscriptions(subscriptions);
     }
 
     public void onSubcriptionItemClicked(final int row) {
@@ -105,10 +101,6 @@ public class BrowsePresenter extends Bas
         view.setEntryDetails(feed.getEntries().get(row));
     }
 
-    public void onSignOutButtonClicked() {
-        eventBus.fireEvent(new SignOutEvent());
-    }
-
     public void onNewerButtonClicked() {
         getFeed(feed.getLinks().getNext());
     }

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseView.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseView.java?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseView.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseView.java Wed Nov  3 10:33:20 2010
@@ -21,21 +21,15 @@ package org.apache.cxf.management.web.lo
 
 import java.util.List;
 
+import com.google.gwt.user.client.ui.HasWidgets;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.browser.Entry;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.browser.Links;
-import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.Subscription;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.View;
 
 public interface BrowseView extends View {
     
     public interface Presenter {
 
-        void onSignOutButtonClicked();
-
-        void onManageSubscriptionsButtonClicked();
-
-        void onSubcriptionItemClicked(int row);
-
         void onEntryItemClicked(int row);
 
         void onOlderButtonClicked();
@@ -49,6 +43,8 @@ public interface BrowseView extends View
         void onRefreshButtonClicked();
     }
 
+    HasWidgets getNaviagationHeaderSlot();
+
     void setMessageInsteadOfEntries(String message, String styleName);
 
     void setEntries(List<Entry> entries);
@@ -57,7 +53,5 @@ public interface BrowseView extends View
 
     void setLinks(Links links);
 
-    void setSubscriptions(List<Subscription> subscriptions);
-
     void setPresenter(Presenter presenter);
 }

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseView.ui.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseView.ui.xml?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseView.ui.xml (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseView.ui.xml Wed Nov  3 10:33:20 2010
@@ -29,54 +29,14 @@
 		<g:layer>
 			<g:DockLayoutPanel unit='EM'>
 				<g:north size='2'>
-					<g:Hyperlink ui:field="signOutHyperlink"
-                                 addStyleNames="{res.css.browserTabSignOutButton}">
-						Sign out
-                    </g:Hyperlink>
+                    <g:FlowPanel ui:field="navigationHeaderSlot"/>
 				</g:north>
 
 				<g:center>
 					<g:SplitLayoutPanel>
 						<g:west size='192'>
-                            <g:StackLayoutPanel unit='EM'>
-                                <g:stack>
-                                    <g:header size='3'>
-                                        <div>
-                                            <div/>
-                                            Explore
-                                        </div>
-                                    </g:header>
-
-                                    <g:VerticalPanel width="100%">
-                                        <g:Label>Tasks</g:Label>
-                                        <g:Hyperlink ui:field="manageSubscriptionsHyperlink">
-                                                Manage endpoints
-                                        </g:Hyperlink>
-                                        <g:Label>Endpoints</g:Label>
-                                        <logbrowser:SubscriptionTable ui:field='exploreSubscriptionTable'
-                                                                      styleName='{res.css.browserTabEntrySelectableTable}'/>
-                                    </g:VerticalPanel>
-                                </g:stack>
-                                <g:stack>
-                                    <g:header size='3'>
-                                        <div>
-                                            <div/>
-                                            Filter
-                                        </div>
-                                    </g:header>
-
-                                    <g:VerticalPanel width="100%">
-                                        <g:Label>Tasks</g:Label>
-                                        <g:Hyperlink ui:field="editCriteriaHyperlink">
-                                                Edit criteria
-                                        </g:Hyperlink>
-                                        <g:Label>Endpoints</g:Label>
-                                        <logbrowser:SubscriptionTable ui:field='filterSubscriptionTable'
-                                                                          styleName='{res.css.browserTabEntrySelectableTable}'/>
-                                    </g:VerticalPanel>
-                                </g:stack>
-                            </g:StackLayoutPanel>
-						</g:west>
+                            <g:FlowPanel ui:field="navigationSidebarSlot"/>
+                        </g:west>
 
 						<g:north size='200'>
 							<g:DockLayoutPanel styleName='{res.css.browserTabToolBar}'

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseViewImpl.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseViewImpl.java?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseViewImpl.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/BrowseViewImpl.java Wed Nov  3 10:33:20 2010
@@ -30,17 +30,17 @@ import com.google.gwt.event.dom.client.C
 import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.uibinder.client.UiHandler;
 import com.google.gwt.uibinder.client.UiTemplate;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
+import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.inject.Inject;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.browser.Entry;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.browser.Links;
-import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.Subscription;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.resources.LogBrowserConstans;
 
 import static org.apache.cxf.management.web.logging.logbrowser.client.ui.browser
@@ -58,19 +58,19 @@ public class BrowseViewImpl extends Comp
     private static final BrowseViewUiBinder UI_BINDER = GWT.create(BrowseViewUiBinder.class);
 
     @UiField @Nonnull
-    SubscriptionTable exploreSubscriptionTable;
+    FlexTable entryTableHeader;
 
     @UiField @Nonnull
-    SubscriptionTable filterSubscriptionTable;
+    EntryTable entryTable;
 
     @UiField @Nonnull
-    FlexTable entryTableHeader;
+    HTML entryDetails;
 
     @UiField @Nonnull
-    EntryTable entryTable;
+    FlowPanel navigationHeaderSlot;
 
     @UiField @Nonnull
-    HTML entryDetails;
+    FlowPanel navigationSidebarSlot;    
 
     @Nonnull
     private NavigationLinks navigationLinks;
@@ -89,22 +89,18 @@ public class BrowseViewImpl extends Comp
 
         initNavigationLinks();
         initEntryTableHeader();
-
-        initSubscriptionTable(exploreSubscriptionTable);
-        initSubscriptionTable(filterSubscriptionTable);
         
         initEntryTable();
     }
 
-    public void setSubscriptions(@Nonnull final List<Subscription> subscriptions) {
-        exploreSubscriptionTable.setData(subscriptions);
-        filterSubscriptionTable.setData(subscriptions);
-    }
-
     public void setEntries(@Nonnull final List<Entry> entries) {
         entryTable.setData(entries);
     }
 
+    public HasWidgets getNaviagationHeaderSlot() {
+        return navigationHeaderSlot;
+    }
+
     public void setMessageInsteadOfEntries(@Nonnull final String message, @Nullable final String styleName) {
         entryTable.setMessageInsteadOfData(message, styleName);
     }
@@ -135,25 +131,6 @@ public class BrowseViewImpl extends Comp
         navigationLinks.firstButton.setVisible(links.firstAvailable());
     }
 
-    @UiHandler("signOutHyperlink")
-    void onSignOutHyperlinkClicked(@Nonnull final ClickEvent event) {
-        assert presenter != null;
-        presenter.onSignOutButtonClicked();
-    }
-    
-    @UiHandler("editCriteriaHyperlink")
-    void onEditCriteriaHyperlinkClicked(@Nonnull final ClickEvent event) {
-
-        //TODO temporary solution
-        new EditCriteriaDialogImpl().show();    
-    }
-
-    @UiHandler("manageSubscriptionsHyperlink")
-    void onManageSubscriptionsHyperlinkClicked(@Nonnull final ClickEvent event) {
-        assert presenter != null;
-        presenter.onManageSubscriptionsButtonClicked();
-    }
-
     public void setPresenter(@Nonnull final Presenter presenter) {
         this.presenter = presenter;
     }
@@ -218,32 +195,6 @@ public class BrowseViewImpl extends Comp
         entryTableHeader.getCellFormatter().setHorizontalAlignment(0, 3, HasHorizontalAlignment.ALIGN_RIGHT);
     }
 
-    private void initSubscriptionTable(@Nonnull final SubscriptionTable table) {
-        List<ColumnDefinition<Subscription>> columnDefinitions =
-            new ArrayList<ColumnDefinition<Subscription>>();
-
-        columnDefinitions.add(new ColumnDefinition<Subscription>() {
-
-            public String getContent(Subscription subscription) {
-                return subscription.getName();
-            }
-
-            public String getWidth() {
-                return null;
-            }
-        });
-
-        table.setColumnDefinitions(columnDefinitions);
-
-        table.addSelectRowHandler(new SelectRowHandler() {
-
-            public void onSelectRow(int row) {
-                assert presenter != null;
-                presenter.onSubcriptionItemClicked(row);
-            }
-        });
-    }
-
     private void initEntryTable() {
         List<ColumnDefinition<Entry>> columnDefinitions =
             new ArrayList<ColumnDefinition<Entry>>();

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaPresenter.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaPresenter.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaPresenter.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaPresenter.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,44 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui.browser;
+
+import javax.annotation.Nonnull;
+
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import org.apache.cxf.management.web.logging.logbrowser.client.EventBus;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.BasePresenter;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.BindStrategy;
+
+public class EditCriteriaPresenter extends BasePresenter implements EditCriteriaView.Presenter {
+
+    @Nonnull
+    private final EditCriteriaView view;
+
+    @Inject
+    public EditCriteriaPresenter(@Nonnull final EventBus eventBus,
+            @Nonnull final EditCriteriaView view,
+            @Nonnull @Named("BindStrategyForEditCriteria") final BindStrategy bindStrategy) {
+        super(eventBus, view, bindStrategy);
+
+        this.view = view;
+        this.view.setPresenter(this);
+    }
+}

Copied: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaView.java (from r1023578, cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialog.java)
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaView.java?p2=cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaView.java&p1=cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialog.java&r1=1023578&r2=1030396&rev=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialog.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaView.java Wed Nov  3 10:33:20 2010
@@ -19,5 +19,13 @@
 
 package org.apache.cxf.management.web.logging.logbrowser.client.ui.browser;
 
-public interface EditCriteriaDialog {
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.View;
+
+public interface EditCriteriaView extends View {
+    
+    public interface Presenter {
+
+    }
+
+    void setPresenter(Presenter presenter);
 }

Copied: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaViewImpl.java (from r1023578, cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialogImpl.java)
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaViewImpl.java?p2=cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaViewImpl.java&p1=cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialogImpl.java&r1=1023578&r2=1030396&rev=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaDialogImpl.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/EditCriteriaViewImpl.java Wed Nov  3 10:33:20 2010
@@ -25,29 +25,34 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiTemplate;
 import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.Widget;
+import com.google.inject.Inject;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.AbstractDialog;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.resources.LogBrowserConstans;
 
-public class EditCriteriaDialogImpl extends DialogBox implements EditCriteriaDialog {
+public class EditCriteriaViewImpl extends AbstractDialog implements EditCriteriaView {
 
     @Nonnull
     private Form form;
 
-    public EditCriteriaDialogImpl() {
+    @Inject
+    public EditCriteriaViewImpl(@Nonnull final LogBrowserConstans constans) {
+        this.form = new Form();
 
-        //TODO temporary solution
-        form = new Form();
-        setGlassEnabled(true);
-        setAnimationEnabled(false);
-        setAutoHideEnabled(true);
-        setText("Edit criteria");
-        setWidget(form);
-        center();
+        init(constans.editCriteriaDialogTitle(), form);
+    }
+
+    public Widget asWidget() {
+        return null;
+    }
+
+    public void setPresenter(Presenter presenter) {
+        //TODO implement
     }
 
     protected static class Form extends Composite {
 
-        @UiTemplate("EditCriteriaDialog.ui.xml")
+        @UiTemplate("EditCriteriaView.ui.xml")
         interface FormViewUiBinder extends UiBinder<Widget, Form> { }
 
         private static final FormViewUiBinder UI_BINDER = GWT.create(FormViewUiBinder.class);

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarPresenter.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarPresenter.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarPresenter.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarPresenter.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,63 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui.browser;
+
+import javax.annotation.Nonnull;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+import org.apache.cxf.management.web.logging.logbrowser.client.EventBus;
+import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToEditCriteriaEvent;
+import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToSettingsEvent;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.BasePresenter;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.BindStrategy;
+
+@Singleton
+public class NavigationSidebarPresenter extends BasePresenter implements NavigationSidebarView.Presenter {
+
+    @Nonnull
+    private final NavigationSidebarView view;
+
+    @Inject
+    public NavigationSidebarPresenter(@Nonnull final EventBus eventBus,
+            @Nonnull final NavigationSidebarView view,
+            @Nonnull @Named("BindStrategyForNavigationSidebar") final BindStrategy bindStrategy) {
+        super(eventBus, view, bindStrategy);
+
+        this.view = view;
+        this.view.setPresenter(this);
+    }
+
+    public void onSubcriptionItemClicked(final int row) {
+//        assert row >= 0 && row < subscriptions.size();
+//        Subscription selectedSubscription = subscriptions.get(row);
+//        getFeed(selectedSubscription.getUrl());
+    }
+
+    public void onManageSubscriptionsButtonClicked() {
+        eventBus.fireEvent(new GoToSettingsEvent());
+    }
+
+    public void onEditCriteriaHyperinkClicked() {
+        eventBus.fireEvent(new GoToEditCriteriaEvent());
+    }    
+
+}

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarView.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarView.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarView.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarView.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,40 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui.browser;
+
+import java.util.List;
+
+import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.Subscription;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.View;
+
+public interface NavigationSidebarView extends View {
+
+    public interface Presenter {
+        void onSubcriptionItemClicked(int row);
+        
+        void onManageSubscriptionsButtonClicked();
+
+        void onEditCriteriaHyperinkClicked();
+    }
+
+    void setSubscriptions(List<Subscription> subscriptions);
+    
+    void setPresenter(Presenter presenter);
+}

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarView.ui.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarView.ui.xml?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarView.ui.xml (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarView.ui.xml Wed Nov  3 10:33:20 2010
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+  -->
+
+<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+             xmlns:g='urn:import:com.google.gwt.user.client.ui'
+             xmlns:logbrowser='urn:import:org.apache.cxf.management.web.logging.logbrowser.client.ui.browser'>
+
+    <ui:with field='res'
+             type='org.apache.cxf.management.web.logging.logbrowser.client.ui.resources.LogBrowserResources'/>
+
+    <g:StackLayoutPanel unit='EM'>
+        <g:stack>
+            <g:header size='3'>
+                <div>
+                    <div/>
+                    Explore
+                </div>
+            </g:header>
+
+            <g:VerticalPanel width="100%">
+                <g:Label>Tasks</g:Label>
+                <g:Hyperlink ui:field="manageSubscriptionsHyperlink">
+                    Manage endpoints
+                </g:Hyperlink>
+                <g:Label>Endpoints</g:Label>
+                <logbrowser:SubscriptionTable ui:field='exploreSubscriptionTable'
+                                              styleName='{res.css.browserTabEntrySelectableTable}'/>
+            </g:VerticalPanel>
+        </g:stack>
+        <g:stack>
+            <g:header size='3'>
+                <div>
+                    <div/>
+                    Filter
+                </div>
+            </g:header>
+
+            <g:VerticalPanel width="100%">
+                <g:Label>Tasks</g:Label>
+                <g:Hyperlink ui:field="editCriteriaHyperlink">
+                    Edit criteria
+                </g:Hyperlink>
+                <g:Label>Endpoints</g:Label>
+                <logbrowser:SubscriptionTable ui:field='filterSubscriptionTable'
+                                              styleName='{res.css.browserTabEntrySelectableTable}'/>
+            </g:VerticalPanel>
+        </g:stack>
+    </g:StackLayoutPanel>
+</ui:UiBinder>
\ No newline at end of file

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarViewImpl.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarViewImpl.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarViewImpl.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/browser/NavigationSidebarViewImpl.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,111 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui.browser;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.uibinder.client.UiHandler;
+import com.google.gwt.uibinder.client.UiTemplate;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Widget;
+import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.Subscription;
+
+public class NavigationSidebarViewImpl extends Composite implements NavigationSidebarView {
+
+    @UiTemplate("NavigationSidebarView.ui.xml")
+    interface NavigationSidebarViewUiBinder extends UiBinder<Widget, NavigationSidebarViewImpl> { }
+
+    private static final NavigationSidebarViewUiBinder UI_BINDER =
+            GWT.create(NavigationSidebarViewUiBinder.class);    
+
+    @UiField @Nonnull
+    SubscriptionTable exploreSubscriptionTable;
+
+    @UiField @Nonnull
+    SubscriptionTable filterSubscriptionTable;
+
+    @Nullable
+    private Presenter presenter;
+
+    public NavigationSidebarViewImpl() {
+        initWidget(UI_BINDER.createAndBindUi(this));
+
+        initSubscriptionTable(exploreSubscriptionTable);
+        initSubscriptionTable(filterSubscriptionTable);
+    }
+
+    public void setSubscriptions(@Nonnull final List<Subscription> subscriptions) {
+        exploreSubscriptionTable.setData(subscriptions);
+        filterSubscriptionTable.setData(subscriptions);
+    }
+
+    @UiHandler("editCriteriaHyperlink")
+    void onEditCriteriaHyperlinkClicked(@Nonnull final ClickEvent event) {
+        assert presenter != null;
+        presenter.onEditCriteriaHyperinkClicked();
+    }
+
+    @UiHandler("manageSubscriptionsHyperlink")
+    void onManageSubscriptionsHyperlinkClicked(@Nonnull final ClickEvent event) {
+        assert presenter != null;
+        presenter.onManageSubscriptionsButtonClicked();
+    }
+
+    private void initSubscriptionTable(@Nonnull final SubscriptionTable table) {
+        List<SelectableTable.ColumnDefinition<Subscription>> columnDefinitions =
+            new ArrayList<SelectableTable.ColumnDefinition<Subscription>>();
+
+        columnDefinitions.add(new SelectableTable.ColumnDefinition<Subscription>() {
+
+            public String getContent(Subscription subscription) {
+                return subscription.getName();
+            }
+
+            public String getWidth() {
+                return null;
+            }
+        });
+
+        table.setColumnDefinitions(columnDefinitions);
+
+        table.addSelectRowHandler(new SelectableTable.SelectRowHandler() {
+
+            public void onSelectRow(int row) {
+                assert presenter != null;
+                presenter.onSubcriptionItemClicked(row);
+            }
+        });
+    }    
+
+    public void setPresenter(Presenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public Widget asWidget() {
+        return this;
+    }
+}

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderPresenter.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderPresenter.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderPresenter.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderPresenter.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,51 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui.common;
+
+import javax.annotation.Nonnull;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+import org.apache.cxf.management.web.logging.logbrowser.client.EventBus;
+import org.apache.cxf.management.web.logging.logbrowser.client.event.SignOutEvent;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.BasePresenter;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.BindStrategy;
+
+@Singleton
+public class NavigationHeaderPresenter extends BasePresenter implements NavigationHeaderView.Presenter {
+
+    @Nonnull
+    private NavigationHeaderView view;
+
+    @Inject
+    public NavigationHeaderPresenter(@Nonnull final EventBus eventBus,
+            @Nonnull final NavigationHeaderView view,
+            @Nonnull @Named("BindStrategyForNavigationHeader") final BindStrategy bindStrategy) {
+        super(eventBus, view, bindStrategy);
+
+        this.view = view;
+        this.view.setPresenter(this);
+    }
+
+    public void onSignOutButtonClicked() {
+        eventBus.fireEvent(new SignOutEvent());
+    }
+}

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderView.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderView.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderView.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderView.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,31 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui.common;
+
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.View;
+
+public interface NavigationHeaderView extends View {
+    
+    public interface Presenter {
+        void onSignOutButtonClicked();
+    }
+
+    void setPresenter(Presenter presenter);
+}

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderView.ui.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderView.ui.xml?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderView.ui.xml (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderView.ui.xml Wed Nov  3 10:33:20 2010
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+  -->
+
+<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+	xmlns:g='urn:import:com.google.gwt.user.client.ui'
+    xmlns:logbrowser='urn:import:org.apache.cxf.management.web.logging.logbrowser.client.ui.browser'>
+
+    <ui:with field='res'
+             type='org.apache.cxf.management.web.logging.logbrowser.client.ui.resources.LogBrowserResources'/>
+
+    <g:HTMLPanel>
+        <g:Hyperlink ui:field="signOutHyperlink"
+                     addStyleNames="{res.css.browserTabSignOutButton}">
+            Sign out
+        </g:Hyperlink>
+    </g:HTMLPanel>
+</ui:UiBinder>
\ No newline at end of file

Added: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderViewImpl.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderViewImpl.java?rev=1030396&view=auto
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderViewImpl.java (added)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/common/NavigationHeaderViewImpl.java Wed Nov  3 10:33:20 2010
@@ -0,0 +1,60 @@
+/**
+ * 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.cxf.management.web.logging.logbrowser.client.ui.common;
+
+import javax.annotation.Nonnull;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiHandler;
+import com.google.gwt.uibinder.client.UiTemplate;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Widget;
+
+public class NavigationHeaderViewImpl extends Composite implements NavigationHeaderView {
+
+    @UiTemplate("NavigationHeaderView.ui.xml")
+    interface NavigationHeaderViewUiBinder extends UiBinder<Widget, NavigationHeaderViewImpl> { }
+
+    private static final NavigationHeaderViewUiBinder UI_BINDER =
+            GWT.create(NavigationHeaderViewUiBinder.class);
+
+    @Nonnull
+    private Presenter presenter;
+
+    public NavigationHeaderViewImpl() {
+        initWidget(UI_BINDER.createAndBindUi(this));
+    }
+
+    @UiHandler("signOutHyperlink")
+    void onSignOutHyperlinkClicked(@Nonnull final ClickEvent event) {
+        assert presenter != null;
+        presenter.onSignOutButtonClicked();
+    }
+
+    public void setPresenter(@Nonnull final Presenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public Widget asWidget() {
+        return this;
+    }
+}

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/resources/LogBrowserConstans.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/resources/LogBrowserConstans.java?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/resources/LogBrowserConstans.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/resources/LogBrowserConstans.java Wed Nov  3 10:33:20 2010
@@ -21,6 +21,7 @@ package org.apache.cxf.management.web.lo
 
 import com.google.gwt.i18n.client.Constants;
 
+//TODO divide items into groups (like: browseTab, settingsTab etc.)
 public interface LogBrowserConstans extends Constants {
 
     @DefaultStringValue("Application Error")
@@ -53,6 +54,9 @@ public interface LogBrowserConstans exte
     @DefaultStringValue("Loading")
     String browserTabLoading();
 
+    @DefaultStringValue("Edit criteria")
+    String editCriteriaDialogTitle();
+
     @DefaultStringValue("Add endpoint")
     String settingsTabAddSubscriptionDialogTitle();
 

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsPresenter.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsPresenter.java?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsPresenter.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsPresenter.java Wed Nov  3 10:33:20 2010
@@ -27,13 +27,15 @@ import javax.annotation.Nullable;
 import com.google.gwt.user.client.ui.HasValue;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.inject.Inject;
-
+import com.google.inject.name.Named;
 import org.apache.cxf.management.web.logging.logbrowser.client.EventBus;
 import org.apache.cxf.management.web.logging.logbrowser.client.event.GoToBrowserEvent;
 import org.apache.cxf.management.web.logging.logbrowser.client.event.SignOutEvent;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.SettingsFacade;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.Subscription;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.BasePresenter;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.BindStrategy;
+import org.apache.cxf.management.web.logging.logbrowser.client.ui.common.NavigationHeaderPresenter;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.resources.LogBrowserConstans;
 
 public class SettingsPresenter extends BasePresenter
@@ -54,10 +56,12 @@ public class SettingsPresenter extends B
     @Inject
     public SettingsPresenter(@Nonnull final EventBus eventBus,
                              @Nonnull final SettingsView view,
+                             @Nonnull @Named("BindStrategyForSettings") final BindStrategy bindStrategy,
+                             @Nonnull final NavigationHeaderPresenter navigationHeaderPresenter,
                              @Nonnull final SettingsFacade settingsFacade,
                              @Nonnull final SubscriptionDialog subscriptionDialog,
                              @Nonnull final LogBrowserConstans constans) {
-        super(eventBus);
+        super(eventBus, view, bindStrategy);
 
         this.view = view;
         this.settingsFacade = settingsFacade;
@@ -66,7 +70,9 @@ public class SettingsPresenter extends B
         
         this.view.setPresenter(this);
         this.subscriptionDialog.setPresenter(this);
-        
+
+        navigationHeaderPresenter.go(view.getNaviagationHeaderSlot());
+
         updateSubscriptions();
     }
 

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsView.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsView.java?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsView.java (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsView.java Wed Nov  3 10:33:20 2010
@@ -21,6 +21,7 @@ package org.apache.cxf.management.web.lo
 
 import java.util.List;
 
+import com.google.gwt.user.client.ui.HasWidgets;
 import org.apache.cxf.management.web.logging.logbrowser.client.service.settings.Subscription;
 import org.apache.cxf.management.web.logging.logbrowser.client.ui.View;
 
@@ -39,6 +40,8 @@ public interface SettingsView extends Vi
         void onSingOutHyperlinkClicked();
     }
 
+    HasWidgets getNaviagationHeaderSlot();
+
     void setData(List<Subscription> subscriptions);
 
     void setPresenter(Presenter presenter);

Modified: cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsView.ui.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsView.ui.xml?rev=1030396&r1=1030395&r2=1030396&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsView.ui.xml (original)
+++ cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/logbrowser/client/ui/settings/SettingsView.ui.xml Wed Nov  3 10:33:20 2010
@@ -27,9 +27,8 @@
     <g:DockLayoutPanel unit='EM'>
         <g:north size='7.2'>
             <g:HTMLPanel>
-                <g:Hyperlink ui:field="singOutHyperlink" addStyleNames="{res.css.settingsTabSignOutButton}">
-                    Sign out
-                </g:Hyperlink>
+                <g:FlowPanel ui:field="navigationHeaderSlot"/>
+
                 <div class="{res.css.settingsTabHeader}">
                     <g:Label addStyleNames="{res.css.settingsTabTitle}">
                         Settings



Mime
View raw message