--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/stationinfo/MeasurementStationListGrid.java	Mon Feb 04 13:49:15 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/stationinfo/MeasurementStationListGrid.java	Mon Feb 04 14:56:41 2013 +0100
@@ -1,23 +1,18 @@
 package de.intevation.flys.client.client.ui.stationinfo;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.i18n.client.DateTimeFormat;
-import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
-import com.google.gwt.user.client.ui.Grid;
 
 import com.smartgwt.client.types.ListGridFieldType;
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.WidgetCanvas;
 import com.smartgwt.client.widgets.grid.ListGridField;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
-import com.smartgwt.client.widgets.layout.VLayout;
 
 import de.intevation.flys.client.client.FLYS;
 import de.intevation.flys.client.shared.model.MeasurementStation;
 import de.intevation.flys.client.shared.model.RiverInfo;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -84,51 +79,6 @@
         this.addData(record);
     }
 
-    class MeasurementStationDecoratorPanel extends VLayout {
-
-        public MeasurementStationDecoratorPanel(MeasurementStation station) {
-            setStyleName("infopanel");
-            setWidth100();
-
-            Grid grid = new Grid(5, 2);
-
-            String type = station.getMeasurementType();
-            if (type != null) {
-                grid.setText(0, 0, MSG.measurement_station_type());
-                grid.setText(0, 1, type);
-            }
-
-            String riverside = station.getRiverSide();
-            if (riverside != null) {
-                grid.setText(1, 0, MSG.riverside());
-                grid.setText(1, 1, riverside);
-            }
-
-            String gaugename = station.getGaugeName();
-            if (gaugename != null) {
-               grid.setText(2, 0, MSG.measurement_station_gauge_name());
-               grid.setText(2, 1, gaugename);
-            }
-
-            DateTimeFormat df = DateTimeFormat.getFormat(
-                    PredefinedFormat.DATE_MEDIUM);
-
-            Date starttime = station.getStartTime();
-            if (starttime != null) {
-               grid.setText(3, 0, MSG.measurement_station_start_time());
-               grid.setText(3, 1, df.format(starttime));
-            }
-
-            String moperator = station.getOperator();
-            if (moperator != null) {
-                grid.setText(4, 0, MSG.measurement_station_operator());
-                grid.setText(4, 1, moperator);
-            }
-
-            addMember(grid);
-        }
-    }
-
     @Override
     public void open() {
     }
@@ -136,6 +86,6 @@
     @Override
     protected Canvas getExpandPanel(ListGridRecord record) {
         MeasurementStationRecord station = (MeasurementStationRecord)record;
-        return new WidgetCanvas(new MeasurementStationDecoratorPanel(station));
+        return new WidgetCanvas(new MeasurementStationInfoPanel(station));
     }
 }