--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixLocationPanel.java	Mon May 28 10:56:57 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixLocationPanel.java	Mon May 28 13:22:45 2018 +0200
@@ -8,45 +8,39 @@
 
 package org.dive4elements.river.client.client.ui.fixation;
 
-import java.util.List;
 import java.util.ArrayList;
-
-import com.google.gwt.core.client.GWT;
-
-import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.Label;
-
-import com.smartgwt.client.widgets.layout.HLayout;
-import com.smartgwt.client.widgets.layout.VLayout;
-
-import com.smartgwt.client.widgets.form.fields.FormItem;
-import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
-import com.smartgwt.client.widgets.form.fields.events.BlurEvent;
+import java.util.List;
 
 import org.dive4elements.river.client.client.FLYSConstants;
 import org.dive4elements.river.client.client.ui.DoubleRangePanel;
-
 import org.dive4elements.river.client.shared.model.Data;
 import org.dive4elements.river.client.shared.model.DataItem;
 import org.dive4elements.river.client.shared.model.DataList;
 import org.dive4elements.river.client.shared.model.DefaultData;
 import org.dive4elements.river.client.shared.model.DefaultDataItem;
+
+import com.google.gwt.core.client.GWT;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.form.fields.FormItem;
+import com.smartgwt.client.widgets.form.fields.events.BlurEvent;
+import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
+import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.layout.VLayout;
+
 /**
  * This UIProvider creates a panel for location or distance input.
  *
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
  */
-public class FixLocationPanel
-extends      FixationPanel
-implements   BlurHandler
-{
+public class FixLocationPanel extends FixationPanel implements BlurHandler {
     /** The message class that provides i18n strings. */
     protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class);
 
-    /** The constant name of the input field to enter locations.*/
+    /** The constant name of the input field to enter locations. */
     public static final String FIELD_VALUE_LOCATION = "location";
 
-    /** The constant name of the input field to enter distance.*/
+    /** The constant name of the input field to enter distance. */
     public static final String FIELD_VALUE_DISTANCE = "distance";
 
     DoubleRangePanel inputPanel;
@@ -56,61 +50,54 @@
     double step;
 
     public FixLocationPanel() {
-        htmlOverview = "";
+        this.htmlOverview = "";
     }
 
-    public Canvas createWidget(DataList data) {
+    @Override
+    public Canvas createWidget(final DataList data) {
         instances.put(this.artifact.getUuid(), this);
 
-        VLayout layout = new VLayout();
+        final VLayout layout = new VLayout();
 
-        Canvas title = new Label(MESSAGES.distance());
+        final Canvas title = new Label(this.MESSAGES.distance());
         title.setHeight("25px");
 
-        inputPanel = new DoubleRangePanel(
-                MESSAGES.unitFrom(),
-                MESSAGES.unitTo(),
-                MESSAGES.unitWidth(),
-                0d,
-                0d,
-                0d,
-                240,
-                this);
+        this.inputPanel = new DoubleRangePanel(this.MESSAGES.unitFrom(), this.MESSAGES.unitTo(), this.MESSAGES.unitWidth(), 0d, 0d, 0d, 240, this);
 
         layout.addMember(title);
-        layout.addMember(inputPanel);
+        layout.addMember(this.inputPanel);
         return layout;
     }
 
     @Override
-    public Canvas createOld(DataList dataList) {
-        List<Data> items = dataList.getAll();
+    public Canvas createOld(final DataList dataList) {
+        final List<Data> items = dataList.getAll();
 
-        Data       f      = getData(items, "ld_from");
-        Data       t      = getData(items, "ld_to");
-        Data       s      = getData(items, "ld_step");
-        DataItem[] fItems = f.getItems();
-        DataItem[] tItems = t.getItems();
-        DataItem[] sItems = s.getItems();
+        final Data f = getData(items, "ld_from");
+        final Data t = getData(items, "ld_to");
+        final Data s = getData(items, "ld_step");
+        final DataItem[] fItems = f.getItems();
+        final DataItem[] tItems = t.getItems();
+        final DataItem[] sItems = s.getItems();
 
-        StringBuilder sb = new StringBuilder();
+        final StringBuilder sb = new StringBuilder();
         sb.append(fItems[0].getLabel());
-        sb.append(" " + MESSAGES.unitFrom() + " ");
+        sb.append(" " + this.MESSAGES.unitFrom() + " ");
         sb.append(tItems[0].getLabel());
-        sb.append(" " + MESSAGES.unitTo() + " ");
+        sb.append(" " + this.MESSAGES.unitTo() + " ");
         sb.append(sItems[0].getLabel());
-        sb.append(" " + MESSAGES.unitWidth());
+        sb.append(" " + this.MESSAGES.unitWidth());
 
-        Label old = new Label(sb.toString());
+        final Label old = new Label(sb.toString());
         old.setWidth(130);
 
-        HLayout layout = new HLayout();
+        final HLayout layout = new HLayout();
         layout.setWidth("400px");
 
-        Label   label  = new Label(dataList.getLabel());
+        final Label label = new Label(dataList.getLabel());
         label.setWidth("200px");
 
-        Canvas back = getBackButton(dataList.getState());
+        final Canvas back = getBackButton(dataList.getState());
 
         layout.addMember(label);
         layout.addMember(old);
@@ -119,40 +106,36 @@
         return layout;
     }
 
-
     /**
      * This method returns the selected data.
      *
      * @return the selected/inserted data.
      */
+    @Override
     public Data[] getData() {
-        List<Data> data = new ArrayList<Data>();
+        final List<Data> data = new ArrayList<Data>();
 
-        boolean valid = saveRangeValues(inputPanel);
+        final boolean valid = saveRangeValues(this.inputPanel);
         if (valid) {
-            String f = Double.valueOf(this.from).toString();
-            String t = Double.valueOf(this.to).toString();
-            String s = Double.valueOf(this.step).toString();
-            DataItem fi = new DefaultDataItem("ld_from", "ld_from", f);
-            DataItem ti = new DefaultDataItem("ld_to", "ld_to", t);
-            DataItem si = new DefaultDataItem("ld_step", "ld_step", s);
-            data.add(new DefaultData(
-                    "ld_from", null, null, new DataItem[]{ fi }));
-            data.add(new DefaultData(
-                    "ld_to", null, null, new DataItem[]{ ti }));
-            data.add(new DefaultData(
-                    "ld_step", null, null, new DataItem[]{ si }));
+            final String f = Double.valueOf(this.from).toString();
+            final String t = Double.valueOf(this.to).toString();
+            final String s = Double.valueOf(this.step).toString();
+            final DataItem fi = new DefaultDataItem("ld_from", "ld_from", f);
+            final DataItem ti = new DefaultDataItem("ld_to", "ld_to", t);
+            final DataItem si = new DefaultDataItem("ld_step", "ld_step", s);
+            data.add(new DefaultData("ld_from", null, null, new DataItem[] { fi }));
+            data.add(new DefaultData("ld_to", null, null, new DataItem[] { ti }));
+            data.add(new DefaultData("ld_step", null, null, new DataItem[] { si }));
         }
         // what else?
         return data.toArray(new Data[data.size()]);
     }
 
+    protected boolean saveRangeValues(final DoubleRangePanel p) {
+        final FormItem[] items = p.getFields();
+        final boolean valid = p.validateForm();
 
-    protected boolean saveRangeValues(DoubleRangePanel p) {
-        FormItem[] items = p.getFields();
-        boolean valid = p.validateForm();
-
-        if(valid) {
+        if (valid) {
             this.from = p.getFrom();
             this.to = p.getTo();
             this.step = p.getStep();
@@ -160,45 +143,45 @@
         return valid;
     }
 
-
     @Override
-    public void setValues(String cid, boolean checked) {
+    public void setValues(final String cid, final boolean checked) {
         // No user interaction, do nothing.
     }
 
-
     @Override
     public boolean renderCheckboxes() {
         // No selection, return false.
         return false;
     }
 
-
+    @Override
     public void success() {
-        inputPanel.setValues(fixInfo.getFrom(), fixInfo.getTo(), 100d);
+        this.inputPanel.setValues(this.fixInfo.getLowerKm(), // TODO: check if revert makes sense
+                this.fixInfo.getUpperKm(), 100d);
     }
 
     /**
      * This method is used to validate the inserted data in the form fields.
      *
-     * @param event The BlurEvent that gives information about the FormItem that
-     * has been modified and its value.
+     * @param event
+     *            The BlurEvent that gives information about the FormItem that
+     *            has been modified and its value.
      */
-    public void onBlur(BlurEvent event) {
-        FormItem item = event.getItem();
-        String  field = item.getFieldName();
+    @Override
+    public void onBlur(final BlurEvent event) {
+        final FormItem item = event.getItem();
+        final String field = item.getFieldName();
 
         if (field == null) {
             return;
         }
-        DoubleRangePanel p = (DoubleRangePanel) event.getForm();
+        final DoubleRangePanel p = (DoubleRangePanel) event.getForm();
     }
 
-
-    public void dumpGWT(String cid) {
+    public void dumpGWT(final String cid) {
         GWT.log("Setting values for cId: " + cid);
-        GWT.log("River: " + fixInfo.getRiver());
-        GWT.log("Date: " + fixInfo.getEventByCId(cid).getDate());
-        GWT.log("Name: " + fixInfo.getEventByCId(cid).getDescription());
+        GWT.log("River: " + this.fixInfo.getRiver());
+        GWT.log("Date: " + this.fixInfo.getEventByCId(cid).getDate());
+        GWT.log("Name: " + this.fixInfo.getEventByCId(cid).getDescription());
     }
 }