--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartOutputTab.java	Fri May 27 13:10:09 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartOutputTab.java	Fri May 27 13:48:25 2011 +0000
@@ -4,7 +4,6 @@
 
 import com.google.gwt.core.client.GWT;
 
-import com.smartgwt.client.widgets.Button;
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.Img;
 import com.smartgwt.client.widgets.Label;
@@ -12,22 +11,15 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import com.smartgwt.client.widgets.events.ClickEvent;
-import com.smartgwt.client.widgets.events.ClickHandler;
-import com.smartgwt.client.widgets.events.CloseClickHandler;
-import com.smartgwt.client.widgets.events.CloseClientEvent;
 import com.smartgwt.client.widgets.events.ResizedEvent;
 import com.smartgwt.client.widgets.events.ResizedHandler;
 
-import de.intevation.flys.client.shared.model.Artifact;
 import de.intevation.flys.client.shared.model.Collection;
 import de.intevation.flys.client.shared.model.OutputMode;
 import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
 import de.intevation.flys.client.client.event.OutputParameterChangeEvent;
 import de.intevation.flys.client.client.event.OutputParameterChangeHandler;
 import de.intevation.flys.client.client.ui.CollectionView;
-import de.intevation.flys.client.client.ui.DatacageWindow;
 import de.intevation.flys.client.client.ui.OutputTab;
 
 
@@ -44,8 +36,6 @@
     public static final int THEMEPANEL_MIN_WIDTH = 200;
 
 
-    protected FLYSConstants MSG = GWT.create(FLYSConstants.class);
-
 
     /** The canvas that wraps the chart toolbar.*/
     protected Canvas tbarPanel;
@@ -72,12 +62,10 @@
     ){
         super(title, collection, mode);
 
-        tbarPanel = new Canvas();
         left      = new Canvas();
         right     = new Canvas();
+        tbarPanel = new ChartToolbar(collectionView);
 
-        tbarPanel.setBorder("1px solid black");
-        tbarPanel.setHeight(30);
         left.setBorder("1px solid black");
         left.setWidth(THEMEPANEL_MIN_WIDTH);
         left.setMinWidth(THEMEPANEL_MIN_WIDTH);
@@ -99,8 +87,6 @@
 
         right.addChild(createChartPanel());
         left.addChild(ctp);
-        tbarPanel.addChild(
-            createTBarPanel(collectionView));
 
         vLayout.addMember(tbarPanel);
         vLayout.addMember(hLayout);
@@ -143,41 +129,6 @@
     }
 
 
-    protected Canvas createTBarPanel(
-        final CollectionView collectionView
-    ) {
-        HLayout hLayout = new HLayout();
-        hLayout.setWidth100();
-        hLayout.setHeight100();
-        hLayout.setMembersMargin(10);
-
-        Button datacage = new Button(MSG.databasket());
-        datacage.setHeight(20);
-
-        hLayout.setMargin(5);
-        hLayout.addMember(datacage);
-        datacage.addClickHandler(new ClickHandler() {
-            public void onClick(ClickEvent event) {
-                GWT.log("Clicked 'datacage' button.");
-                openDatacageWindow(
-                    collectionView.getArtifact());
-            }
-        });
-
-        return hLayout;
-    }
-
-    protected void openDatacageWindow(Artifact artifact) {
-        final DatacageWindow dc = new DatacageWindow(artifact);
-        dc.addCloseClickHandler(new CloseClickHandler() {
-            public void onCloseClick(CloseClientEvent event) {
-                dc.destroy();
-            }
-        });
-        dc.show();
-    }
-
-
     protected Canvas createChartPanel() {
         return createChartPanel(DEFAULT_CHART_WIDTH, DEFAULT_CHART_HEIGHT);
     }