--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixEventSelect.java	Fri Jul 13 11:56:22 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixEventSelect.java	Fri Jul 13 12:04:21 2018 +0200
@@ -8,58 +8,48 @@
 
 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 java.util.List;
 
 import org.dive4elements.river.client.client.FLYSConstants;
-
+import org.dive4elements.river.client.client.services.FixingsOverviewService;
+import org.dive4elements.river.client.client.services.FixingsOverviewServiceAsync;
 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.FixingsOverviewInfo;
+import org.dive4elements.river.client.shared.model.FixingsOverviewInfo.FixEvent;
 import org.dive4elements.river.client.shared.model.IntDataItem;
 import org.dive4elements.river.client.shared.model.IntegerArrayData;
-import org.dive4elements.river.client.shared.model.FixingsOverviewInfo.FixEvent;
 
-import org.dive4elements.river.client.client.services.FixingsOverviewService;
-import org.dive4elements.river.client.client.services.FixingsOverviewServiceAsync;
+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;
 
 /**
  * This UIProvider lets you select events.
  *
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
  */
-public class FixEventSelect
-extends      FixationPanel
-{
+public class FixEventSelect extends FixationPanel {
     /** The message class that provides i18n strings. */
-    protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class);
-
-    public static final int MAX_DISPLAYED_ITEMS = 5;
+    private final FLYSConstants MESSAGES = GWT.create(FLYSConstants.class);
 
-    protected FixingsOverviewServiceAsync overviewService =
-        GWT.create(FixingsOverviewService.class);
-
-    protected List<String> events;
+    private static final int MAX_DISPLAYED_ITEMS = 5;
 
-    public FixEventSelect() {
-        htmlOverview = "";
-        events = new ArrayList<String>();
-    }
+    private final FixingsOverviewServiceAsync overviewService = GWT.create(FixingsOverviewService.class);
 
-    public Canvas createWidget(DataList data) {
+    private final List<String> events = new ArrayList<String>();
+
+    @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.eventselect());
+        final Canvas title = new Label(this.MESSAGES.eventselect());
         title.setHeight("25px");
 
         layout.addMember(title);
@@ -67,44 +57,43 @@
     }
 
     @Override
-    public Canvas createOld(DataList dataList) {
-        List<Data> list = dataList.getAll();
+    public Canvas createOld(final DataList dataList) {
+        final List<Data> list = dataList.getAll();
 
-        Data data = getData(list, "events");
+        final Data data = getData(list, "events");
 
-        VLayout dataLayout = new VLayout();
+        final VLayout dataLayout = new VLayout();
         dataLayout.setWidth(130);
 
-        DataItem[] items = data.getItems();
+        final DataItem[] items = data.getItems();
 
         if (items.length > MAX_DISPLAYED_ITEMS) {
-            for (int i = 0; i < MAX_DISPLAYED_ITEMS-2; ++i) {
-                Label l = new Label(items[i].getLabel());
+            for (int i = 0; i < MAX_DISPLAYED_ITEMS - 2; ++i) {
+                final Label l = new Label(items[i].getLabel());
                 l.setHeight(25);
                 dataLayout.addMember(l);
             }
             Label l = new Label("...");
             l.setHeight(25);
             dataLayout.addMember(l);
-            l = new Label(items[items.length-1].getLabel());
+            l = new Label(items[items.length - 1].getLabel());
             l.setHeight(25);
             dataLayout.addMember(l);
-        }
-        else {
-            for (int i = 0; i < items.length; i++) {
-                Label l = new Label(items[i].getLabel());
+        } else {
+            for (final DataItem item : items) {
+                final Label l = new Label(item.getLabel());
                 l.setHeight(25);
                 dataLayout.addMember(l);
             }
         }
 
-        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(dataLayout);
@@ -113,29 +102,28 @@
         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>();
 
-        if (events.size() > 0) {
-            IntDataItem[] arr = new IntDataItem[events.size()];
-            for (int i = 0, E = events.size(); i < E; i++) {
+        if (this.events.size() > 0) {
+            final IntDataItem[] arr = new IntDataItem[this.events.size()];
+            for (int i = 0, E = this.events.size(); i < E; i++) {
                 try {
-                    Integer v = new Integer(events.get(i));
+                    final Integer v = new Integer(this.events.get(i));
                     arr[i] = new IntDataItem("id", "id", v.intValue());
                 }
-                catch (NumberFormatException nfe) {
-                    return  data.toArray(new Data[data.size()]);
+                catch (final NumberFormatException nfe) {
+                    return data.toArray(new Data[data.size()]);
                 }
             }
 
-            IntegerArrayData iad =
-                new IntegerArrayData("events", "events", arr);
+            final IntegerArrayData iad = new IntegerArrayData("events", "events", arr);
 
             data.add(iad);
         }
@@ -143,36 +131,33 @@
         return data.toArray(new Data[data.size()]);
     }
 
-
     @Override
-    public void setValues(String cid, boolean checked) {
+    public void setValues(final String cid, final boolean checked) {
         if (checked) {
-            events.add(cid);
-        }
-        else {
-            if (events.contains(cid)) {
-                events.remove(cid);
+            this.events.add(cid);
+        } else {
+            if (this.events.contains(cid)) {
+                this.events.remove(cid);
             }
         }
     }
 
-
     @Override
     public boolean renderCheckboxes() {
         return true;
     }
 
-
-    public void success() {
-        for (FixEvent fe: fixInfo.getEvents()) {
-            events.add(fe.getCId());
+    @Override
+    public void success(final FixingsOverviewInfo fixInfo) {
+        for (final FixEvent fe : fixInfo.getEvents()) {
+            this.events.add(fe.getCId());
         }
     }
 
-    public void dumpGWT(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());
-    }
+    // public void dumpGWT(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());
+    // }
 }