svn commit: r1080906 - /cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/NavigationSidebarPresenter.java

[tomekopo]

Author: tomekopo
Date: Sat Mar 12 10:33:23 2011
New Revision: 1080906

URL: http://svn.apache.org/viewvc?rev=1080906&view=rev
Log:
Fixed building URL from filter options and bugs related with bad interpreting  
selected endpoint.

Modified:
    
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/NavigationSidebarPresenter.java

Modified: 
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/NavigationSidebarPresenter.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/NavigationSidebarPresenter.java?rev=1080906&r1=1080905&r2=1080906&view=diff
==============================================================================
--- 
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/NavigationSidebarPresenter.java
 (original)
+++ 
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/NavigationSidebarPresenter.java
 Sat Mar 12 10:33:23 2011
@@ -23,6 +23,7 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
@@ -48,7 +49,9 @@ public class NavigationSidebarPresenter 
 
     @Nonnull private FilterOptions filterOptions = FilterOptions.EMPTY;
 
-    @Nullable private Subscription selectedSubscription;
+    @Nullable private Subscription selectedSubscriptionInExplorer;
+    @Nullable private Subscription selectedSubscriptionInFilter;
+
     @Nonnull private List<Subscription> subscriptions;
 
     @Inject
@@ -70,33 +73,41 @@ public class NavigationSidebarPresenter 
 
     public void onExploreSubcriptionItemClicked(int row) {
         assert row >= 0 && row < subscriptions.size();
-        selectedSubscription = subscriptions.get(row);
-        eventBus.fireEvent(new 
SelectedSubscriptionEvent(selectedSubscription.getUrl()));
+
+        selectedSubscriptionInExplorer = subscriptions.get(row);
+        selectedSubscriptionInFilter = null;
+
+        eventBus.fireEvent(new 
SelectedSubscriptionEvent(selectedSubscriptionInExplorer.getUrl()));
     }
 
     public void onFilterSubcriptionItemClicked(int row) {
         assert row >= 0 && row < subscriptions.size();
-        selectedSubscription = subscriptions.get(row);
+
+        selectedSubscriptionInFilter = subscriptions.get(row);
+        selectedSubscriptionInExplorer = null;
+
         selectSubscriptionWithFilterOptions();
     }
 
     private void selectSubscriptionWithFilterOptions() {
-        assert selectedSubscription != null;
+        assert selectedSubscriptionInFilter != null;
 
-        StringBuilder url = new StringBuilder(selectedSubscription.getUrl());
+        StringBuilder url = new 
StringBuilder(selectedSubscriptionInFilter.getUrl());
 
         if (filterOptions != FilterOptions.EMPTY) {
             url.append("?_s=");
 
+            DateTimeFormat dateTimeFormater = 
DateTimeFormat.getFormat("yyyy-MM-dd");
+
             if (filterOptions.getFrom() != null) {
                 url.append("date=ge=");
-                url.append(filterOptions.getFrom().getTime());
+                url.append(dateTimeFormater.format(filterOptions.getFrom()));
                 url.append(";");
             }
 
             if (filterOptions.getTo() != null) {
                 url.append("date=lt=");
-                url.append(filterOptions.getTo().getTime());
+                url.append(dateTimeFormater.format(filterOptions.getTo()));
                 url.append(";");
             }
 
@@ -104,9 +115,11 @@ public class NavigationSidebarPresenter 
                 for (Level level : filterOptions.getLevels()) {
                     url.append("level==");
                     url.append(level);
-                    url.append(";");
+                    url.append(",");
                 }
             }
+
+            url.deleteCharAt(url.length() - 1);
         }
 
         eventBus.fireEvent(new SelectedSubscriptionEvent(url.toString()));
@@ -137,7 +150,9 @@ public class NavigationSidebarPresenter 
 
             public void onChangedFilterOptions(ChangedFilterOptionsEvent 
event) {
                 filterOptions = event.getFilterOptions();
-                selectSubscriptionWithFilterOptions();
+                if (selectedSubscriptionInFilter != null) {
+                    selectSubscriptionWithFilterOptions();
+                }
             }
         });
     }