--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java	Sun Oct 14 14:44:28 2012 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java	Mon Oct 15 00:04:35 2012 +0200
@@ -1,67 +1,62 @@
 package de.intevation.flys.client.client.ui;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
 
+import com.smartgwt.client.data.AdvancedCriteria;
 import com.smartgwt.client.data.Criteria;
 import com.smartgwt.client.data.Criterion;
-import com.smartgwt.client.data.AdvancedCriteria;
+import com.smartgwt.client.data.Record;
+import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.types.ListGridFieldType;
 import com.smartgwt.client.types.OperatorId;
-
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.Label;
 import com.smartgwt.client.widgets.form.DynamicForm;
-import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
+import com.smartgwt.client.widgets.form.fields.FormItem;
+import com.smartgwt.client.widgets.form.fields.RadioGroupItem;
+import com.smartgwt.client.widgets.form.fields.SelectItem;
+import com.smartgwt.client.widgets.form.fields.StaticTextItem;
 import com.smartgwt.client.widgets.form.fields.events.BlurEvent;
+import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
+import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
 import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
-import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
-import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
 import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
-
-import com.smartgwt.client.widgets.form.fields.FormItem;
-import com.smartgwt.client.widgets.form.fields.SelectItem;
-import com.smartgwt.client.widgets.form.fields.RadioGroupItem;
-import com.smartgwt.client.widgets.form.fields.StaticTextItem;
-import com.smartgwt.client.widgets.layout.HLayout;
-import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
+import com.smartgwt.client.widgets.grid.CellFormatter;
 import com.smartgwt.client.widgets.grid.ListGrid;
 import com.smartgwt.client.widgets.grid.ListGridField;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
-import com.smartgwt.client.widgets.grid.CellFormatter;
-import com.smartgwt.client.widgets.grid.events.RecordClickHandler;
+import com.smartgwt.client.widgets.grid.events.CellClickEvent;
+import com.smartgwt.client.widgets.grid.events.CellClickHandler;
 import com.smartgwt.client.widgets.grid.events.RecordClickEvent;
-import com.smartgwt.client.widgets.grid.events.CellClickHandler;
-import com.smartgwt.client.widgets.grid.events.CellClickEvent;
-import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
+import com.smartgwt.client.widgets.grid.events.RecordClickHandler;
+import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.tab.Tab;
+import com.smartgwt.client.widgets.tab.TabSet;
 import com.smartgwt.client.widgets.tab.events.TabSelectedEvent;
+import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
 
-import com.smartgwt.client.widgets.tab.TabSet;
-import com.smartgwt.client.widgets.tab.Tab;
-import com.smartgwt.client.data.Record;
-
-import com.smartgwt.client.types.ListGridFieldType;
-import com.smartgwt.client.types.Alignment;
-
+import de.intevation.flys.client.client.Config;
+import de.intevation.flys.client.client.FLYSConstants;
+import de.intevation.flys.client.client.event.FilterHandler;
+import de.intevation.flys.client.client.event.RangeFilterEvent;
+import de.intevation.flys.client.client.event.StringFilterEvent;
+import de.intevation.flys.client.client.services.DistanceInfoService;
+import de.intevation.flys.client.client.services.DistanceInfoServiceAsync;
+import de.intevation.flys.client.client.ui.range.DistanceInfoDataSource;
+import de.intevation.flys.client.shared.model.ArtifactDescription;
 import de.intevation.flys.client.shared.model.Data;
 import de.intevation.flys.client.shared.model.DataItem;
 import de.intevation.flys.client.shared.model.DataList;
 import de.intevation.flys.client.shared.model.DefaultData;
 import de.intevation.flys.client.shared.model.DefaultDataItem;
 import de.intevation.flys.client.shared.model.DistanceInfoObject;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
 
-import de.intevation.flys.client.client.services.DistanceInfoService;
-import de.intevation.flys.client.client.services.DistanceInfoServiceAsync;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.event.FilterHandler;
-import de.intevation.flys.client.client.event.StringFilterEvent;
-import de.intevation.flys.client.client.event.RangeFilterEvent;
-import de.intevation.flys.client.client.ui.range.DistanceInfoDataSource;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
 
 
 /**
@@ -73,6 +68,8 @@
 extends      AbstractUIProvider
 implements   ChangeHandler, BlurHandler, FilterHandler
 {
+    private static final long serialVersionUID = -10820092176039372L;
+
     /** The message class that provides i18n strings. */
     protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class);
 
@@ -183,6 +180,7 @@
      *
      * @return a panel.
      */
+    @Override
     public Canvas create(DataList data) {
         VLayout layout = new VLayout();
         layout.setMembersMargin(10);
@@ -224,6 +222,7 @@
         distanceTable.setCanReorderFields(false);
 
         CellFormatter cf = new CellFormatter() {
+            @Override
             public String format(
                 Object value,
                 ListGridRecord record,
@@ -245,6 +244,7 @@
         addDistance.setType (ListGridFieldType.ICON);
         addDistance.setWidth (20);
         addDistance.addRecordClickHandler (new RecordClickHandler () {
+            @Override
             public void onRecordClick (RecordClickEvent e) {
                 if (!isLocationMode ()) {
                     Record r = e.getRecord();
@@ -339,6 +339,7 @@
         locationsTable.setCanReorderFields(false);
 
         CellFormatter cf = new CellFormatter() {
+            @Override
             public String format(
                 Object value,
                 ListGridRecord record,
@@ -363,6 +364,7 @@
         addLocation.setWidth (20);
 
         addLocation.addRecordClickHandler (new RecordClickHandler () {
+            @Override
             public void onRecordClick (RecordClickEvent e) {
                 Record record = e.getRecord();
                 double[] selected;
@@ -435,6 +437,7 @@
         locationDistanceTable.setCanReorderFields(false);
 
         CellFormatter cf = new CellFormatter() {
+            @Override
             public String format(
                 Object value,
                 ListGridRecord record,
@@ -463,6 +466,7 @@
         addto2.setCellIcon(baseUrl + MESSAGES.markerRed());
 
         locationDistanceTable.addCellClickHandler (new CellClickHandler () {
+            @Override
             public void onCellClick (CellClickEvent e) {
                 if (e.getColNum() == 0) {
                     Record r = e.getRecord ();
@@ -521,6 +525,7 @@
     }
 
 
+    @Override
     public Canvas createOld(DataList dataList) {
         List<Data> items = dataList.getAll();
 
@@ -705,6 +710,7 @@
 
         inputTables   = new TabSet();
         inputTables.addTabSelectedHandler(new TabSelectedHandler() {
+            @Override
             public void onTabSelected(TabSelectedEvent evt) {
                 filterDescription.clear();
                 filterRange.clear();
@@ -746,6 +752,7 @@
         filterCriteria.setShowTitle(false);
         filterCriteria.setWidth(100);
         filterCriteria.addChangedHandler(new ChangedHandler() {
+            @Override
             public void onChanged(ChangedEvent e) {
                 if(e.getValue().toString().equals("range")) {
                     filterRange.setVisible(true);
@@ -795,6 +802,7 @@
     }
 
 
+    @Override
     public void onFilterCriteriaChanged(StringFilterEvent event) {
         String search = event.getFilter();
 
@@ -815,6 +823,7 @@
     }
 
 
+    @Override
     public void onFilterCriteriaChanged(RangeFilterEvent event) {
         Float from = event.getFrom() - 0.001f;
         Float to = event.getTo() + 0.001f;
@@ -974,10 +983,11 @@
      *
      * @return the selected/inserted data.
      */
+    @Override
     public Data[] getData() {
         List<Data> data = new ArrayList<Data>();
 
-        // XXX If we have entered a value and click right afterwards on the
+        // If we have entered a value and click right afterwards on the
         // 'next' button, the BlurEvent is not fired, and the values are not
         // saved. So, we gonna save those values explicitly.
         if (isLocationMode()) {
@@ -1158,6 +1168,7 @@
      *
      * @param event The click event fired by a RadioButtonGroupItem.
      */
+    @Override
     public void onChange(ChangeEvent event) {
         String value = (String) event.getValue();
 
@@ -1211,6 +1222,7 @@
      * @param event The BlurEvent that gives information about the FormItem that
      * has been modified and its value.
      */
+    @Override
     public void onBlur(BlurEvent event) {
         FormItem item = event.getItem();
         String  field = item.getFieldName();
@@ -1305,11 +1317,11 @@
         radio.setVertical(false);
         radio.setWrap(false);
 
-        LinkedHashMap values = new LinkedHashMap();
+        LinkedHashMap<String, String> values = new LinkedHashMap<String, String>();
         values.put(FIELD_VALUE_LOCATION, MESSAGES.location());
         values.put(FIELD_VALUE_DISTANCE, MESSAGES.distance());
 
-        LinkedHashMap initial = new LinkedHashMap();
+        LinkedHashMap<String, String> initial = new LinkedHashMap<String, String>();
         initial.put(FIELD_MODE, FIELD_VALUE_DISTANCE);
 
         radio.setValueMap(values);
@@ -1325,7 +1337,6 @@
     protected void createDistanceInputPanel() {
         Config config = Config.getInstance();
         String url    = config.getServerUrl();
-        String locale = config.getLocale ();
         String river  = "";
 
         ArtifactDescription adescr = artifact.getArtifactDescription();
@@ -1355,21 +1366,6 @@
     }
 
 
-/*    protected void updateDistanceInfo(DistanceInfoObject[] di) {
-        int i = 0;
-        for (DistanceInfoObject dio: di) {
-            if (dio.getTo() != null) {
-                distanceTable.addData(new DistanceInfoRecord(dio));
-            }
-            else {
-                locationsTable.addData(new DistanceInfoRecord(dio));
-                locationDistanceTable.addData(new DistanceInfoRecord(dio));
-            }
-        }
-        return;
-    }*/
-
-
     protected double getFrom() {
         return from;
     }