Modified: trunk/gwt-client/src/main/java/org/mule/galaxy/web/client/util/ShowableTabListener.java (2209 => 2210)

---
trunk/gwt-client/src/main/java/org/mule/galaxy/web/client/util/ShowableTabListener.java
 2010-03-10 15:39:25 UTC (rev 2209)
+++
trunk/gwt-client/src/main/java/org/mule/galaxy/web/client/util/ShowableTabListener.java
    2010-03-10 16:17:12 UTC (rev 2210)

@@ -3,19 +3,19 @@

*/
 package org.mule.galaxy.web.client.util;
 

-import
com.extjs.gxt.ui.client.event.SelectionListener;

+import org.mule.galaxy.web.client.ErrorPanel;
+import org.mule.galaxy.web.client.Showable;
+
+import java.util.List;
+
+import com.extjs.gxt.ui.client.event.Listener;

import
com.extjs.gxt.ui.client.event.TabPanelEvent;
 import com.extjs.gxt.ui.client.widget.TabItem;
 import com.extjs.gxt.ui.client.widget.TabPanel;
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.ui.Widget;
 

-import java.util.List;
-
-import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Showable;
-
-public class ShowableTabListener extends
SelectionListener<TabPanelEvent> {

+public class ShowableTabListener implements
Listener<TabPanelEvent> {

   private TabItem previous;
     private List<String> params;
     private List<String> previousParams;

@@ -37,36 +37,6 @@

       this.tabNames = tabNames;
     }
 

-    @Override
-    public void componentSelected(TabPanelEvent ce) {
-        TabItem item = ce.getItem();
-        
-        // Nasty trickery because GXT triggers tab selection
events for every click on the screen
-        if (item.equals(previous) &&
params.equals(previousParams)) {
-            return;
-        }
-        
-        hidePrevious();
-        
-        errorPanel.clearErrorMessage();
-        Widget widget = item.getWidget(0);
-        if (widget instanceof Showable) {
-            ((Showable)widget).showPage(params);
-        }
-        
-        // Update the History token once the tab is selected.
-        int tabIndex = tabPanel.indexOf(item);
-        if (tabNames != null && tabIndex <
tabNames.size()) {
-            String name = tabNames.get(tabIndex);
-            History.newItem(urlBase + "/" + name, false);
-        }
-        
-        previous = item;
-        // Once we've shown a panel, store the previous params. We
aren't going to trigger a new tab  
-        // selection event again until we get new params.
-        previousParams = params;
-        item.layout();
-    }

    /**
      * Update the parameters from a new history event. Call before
calling showTab.

@@ -125,4 +95,45 @@

   protected TabPanel getTabPanel() {
         return tabPanel;
     }

+
+    public void handleEvent(TabPanelEvent event) {
+        TabItem item = event.getItem();
+
+        // Nasty trickery because GXT triggers tab selection
events for every click on the screen
+        if (item.equals(previous) &&
params.equals(previousParams)) {
+            return;
+        }
+
+        hidePrevious();
+
+        errorPanel.clearErrorMessage();
+        Widget widget = item.getWidget(0);
+        if (widget instanceof Showable) {
+            ((Showable)widget).showPage(params);
+        }
+
+        // Update the History token once the tab is selected.
+        int tabIndex = tabPanel.indexOf(item);
+        if (tabNames != null && tabIndex <
tabNames.size()) {
+            String name = tabNames.get(tabIndex);
+            History.newItem(urlBase + "/" + name, false);
+        }
+
+        previous = item;
+        // Once we've shown a panel, store the previous params. We
aren't going to trigger a new tab
+        // selection event again until we get new params.
+        previousParams = params;
+        item.layout();
+    }
+
+    /**
+     * @return tabName as used by History or null if not found
+     */
+    public String getTabName(TabItem item) {
+        int idx = getTabPanel().indexOf(item);
+        if (idx == -1) {
+            return null;
+        }
+        return getTabNames().get(idx);
+    }

}