--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/SelectProvider.java	Wed Mar 09 08:00:06 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/SelectProvider.java	Wed Mar 09 09:41:45 2011 +0000
@@ -6,12 +6,15 @@
 
 import com.google.gwt.core.client.GWT;
 
+import com.smartgwt.client.types.VerticalAlignment;
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.IButton;
+import com.smartgwt.client.widgets.Label;
 import com.smartgwt.client.widgets.events.ClickEvent;
 import com.smartgwt.client.widgets.events.ClickHandler;
 import com.smartgwt.client.widgets.form.DynamicForm;
 import com.smartgwt.client.widgets.form.fields.ComboBoxItem;
+import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
 import de.intevation.flys.client.shared.model.Data;
@@ -53,11 +56,8 @@
 
     public void addStepForwardHandler(StepForwardHandler handler) {
         if (handler != null) {
-            GWT.log("SelectProvider - addStepForwardHandler()");
             forwardHandlers.add(handler);
         }
-
-        GWT.log("Handlers now: " + forwardHandlers.size());
     }
 
 
@@ -70,16 +70,13 @@
     protected void fireStepForwardEvent(StepForwardEvent e) {
         GWT.log("SelectProvider - fireStepForwardEvent() handlers: " + forwardHandlers.size());
         for (StepForwardHandler handler: forwardHandlers) {
-            GWT.log("SelectProvider - fireStepForwardEvent()");
             handler.onStepForward(e);
         }
     }
 
     public void onClick(ClickEvent e) {
-        GWT.log("SelectProvider - feed and advance...");
         Data[] data = getData();
 
-        GWT.log("GO ON...");
         SelectProvider.this.fireStepForwardEvent(new StepForwardEvent(data));
     }
 
@@ -98,15 +95,6 @@
         Canvas content = createWidget(data);
 
         IButton button = new IButton(messages.next(), this);
-        //IButton button = new IButton(messages.next(), new ClickHandler() {
-        //    public void onClick(ClickEvent e) {
-        //        GWT.log("SelectProvider - feed and advance...");
-        //        Data[] data = getData();
-
-        //        GWT.log("GO ON...");
-        //        SelectProvider.this.fireStepForwardEvent(new StepForwardEvent(data));
-        //    }
-        //});
 
         v.addMember(content);
         v.addMember(button);
@@ -125,8 +113,10 @@
     protected Canvas createWidget(Data data) {
         GWT.log("SelectProvider - create()");
 
-        DynamicForm form      = new DynamicForm();
-        combobox = new ComboBoxItem("river");
+        HLayout layout   = new HLayout();
+        Label label      = new Label(messages.river_selection());
+        DynamicForm form = new DynamicForm();
+        combobox         = new ComboBoxItem("river");
 
         LinkedHashMap<String, String> it = new LinkedHashMap<String, String>();
 
@@ -135,18 +125,24 @@
             it.put(item.getStringValue(), item.getLabel());
         }
 
+        label.setWidth(50);
         combobox.setValueMap(it);
+        combobox.setShowTitle(false);
         form.setItems(combobox);
 
-        return form;
+        layout.addMember(label);
+        layout.addMember(form);
+
+        label.setValign(VerticalAlignment.TOP);
+        layout.setAlign(VerticalAlignment.TOP);
+
+        return layout;
     }
 
 
     protected Data[] getData() {
         String selection = combobox.getValueAsString();
-
-        GWT.log("SelectProvider - getData() Selected value = " + selection);
-        DataItem item = new DefaultDataItem("river", null, selection);
+        DataItem item    = new DefaultDataItem("river", null, selection);
 
         return new Data[] { new DefaultData(
             "river", null, null, new DataItem[] { item }, null) };