--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/sinfo/CollisionLoadEpochPanel.java	Tue May 22 15:32:00 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/sinfo/CollisionLoadEpochPanel.java	Tue May 22 17:44:05 2018 +0200
@@ -11,7 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.dive4elements.river.client.client.FLYSConstants;
 import org.dive4elements.river.client.client.services.SedimentLoadInfoService;
 import org.dive4elements.river.client.client.services.SedimentLoadInfoServiceAsync;
 import org.dive4elements.river.client.client.ui.AbstractUIProvider;
@@ -46,12 +45,14 @@
 public class CollisionLoadEpochPanel extends AbstractUIProvider {
     protected SedimentLoadInfoServiceAsync sedLoadInfoService = GWT.create(SedimentLoadInfoService.class);
 
-    protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class);
-
     protected ListGrid elements;
     private TextItem start;
     private TextItem end;
 
+    private final String getDatakey() {
+        return "epochs";
+    }
+
     protected List<String> validYears = new ArrayList<String>();
 
     public Canvas createWidget(final DataList data) {
@@ -154,7 +155,7 @@
         label.setHeight(25);
 
         final List<Data> items = dataList.getAll();
-        final Data str = getData(items, "epochs");
+        final Data str = getData(items, getDatakey());
         final DataItem[] strItems = str.getItems();
 
         final String[] pairs = strItems[0].getLabel().split(";");
@@ -184,7 +185,7 @@
         final IColumnClickHandler fromHandler = createHandler(this.start);
         final IColumnClickHandler toHandler = createHandler(this.end);
 
-        final FromToTableHelperPanel helper = new FromToTableHelperPanel(data, "epochs", this.MSG, fromHandler, toHandler);
+        final FromToTableHelperPanel helper = new FromToTableHelperPanel(data, getDatakey(), this.MSG, fromHandler, toHandler);
         this.validYears = helper.getKeycolEntries();
         final Canvas table = helper.getTable();
 
@@ -219,8 +220,8 @@
             d += ";";
         }
 
-        final DataItem item = new DefaultDataItem("epochs", null, d);
-        data.add(new DefaultData("epochs", null, null, new DataItem[] { item }));
+        final DataItem item = new DefaultDataItem(getDatakey(), null, d);
+        data.add(new DefaultData(getDatakey(), null, null, new DataItem[] { item }));
         return data.toArray(new Data[data.size()]);
     }
 
@@ -238,13 +239,13 @@
             iY1 = Integer.parseInt(y1);
         }
         catch (final NumberFormatException e) {
-            errors.add(this.MESSAGES.wrongFormat() + ": " + y1);
+            errors.add(this.MSG.wrongFormat() + ": " + y1);
         }
         try {
             iY2 = Integer.parseInt(y2);
         }
         catch (final NumberFormatException e) {
-            errors.add(this.MESSAGES.wrongFormat() + ": " + y2);
+            errors.add(this.MSG.wrongFormat() + ": " + y2);
         }
         if (!errors.isEmpty()) {
             showErrors(errors);
@@ -272,12 +273,12 @@
              */
         }
         if (!startIsGood) {
-            String tmp = this.MESSAGES.no_data_for_year();
+            String tmp = this.MSG.no_data_for_year();
             tmp = tmp.replace("$1", y1);
             errors.add(tmp);
         }
         if (!endIsGood) {
-            String tmp = this.MESSAGES.no_data_for_year();
+            String tmp = this.MSG.no_data_for_year();
             tmp = tmp.replace("$1", y2);
             errors.add(tmp);
         }