# HG changeset patch
# User gernotbelger
# Date 1538391430 -7200
# Node ID 5c1e66a3c878df3090dff565b1f22c25abed0901
# Parent  73819a194bfd7649e380af5d775f3a204927949e# Parent  9ea704de63ee790f5cbafd64204a9026f014a90e
Zusammenführen

diff -r 9ea704de63ee -r 5c1e66a3c878 artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/LoadScenarioSelect.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/LoadScenarioSelect.java	Mon Oct 01 09:56:14 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/LoadScenarioSelect.java	Mon Oct 01 12:57:10 2018 +0200
@@ -11,7 +11,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.dive4elements.artifactdatabase.data.StateData;
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.CallContext;
@@ -24,9 +23,8 @@
 
 /** State in which to fetch years for sedminent load calculation. */
 public class LoadScenarioSelect extends DefaultState {
+
     private static final long serialVersionUID = 1L;
-    /** The log used in this class. */
-    private static Logger log = Logger.getLogger(LoadScenarioSelect.class);
 
     /**
      * The default constructor that initializes an empty State object.
@@ -49,7 +47,7 @@
                 final AddTableDataHelper helper = new AddTableDataHelper(creator, select, "cm", context.getMeta());
 
                 helper.addColumn(0, "pinfrom", "60", "common.client.ui.selection", "ICON", "CENTER", "from");
-                helper.addColumn(1, "cm", "60", "Delta [cm]", "INTEGER", "RIGHT", null);
+                helper.addColumn(1, "cm", "60", "uinfo_select_delta_w_column", "INTEGER", "RIGHT", null);
 
                 for (int i = -200; i < 210; i = i + 10) {
                     final Map<String, String> row = new HashMap<>();
diff -r 9ea704de63ee -r 5c1e66a3c878 artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadScenarioSelectLimit5.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadScenarioSelectLimit5.java	Mon Oct 01 09:56:14 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadScenarioSelectLimit5.java	Mon Oct 01 12:57:10 2018 +0200
@@ -48,7 +48,8 @@
 
                 final AddTableDataHelper helper = new AddTableDataHelper(creator, select, "cm", context.getMeta());
                 helper.addColumn(0, "regional_scenario_select", "60", "common.client.ui.selection", "ICON", "CENTER", "from");
-                helper.addColumn(1, "cm", "60", "year", "INTEGER", "LEFT", null);
+                // FIXME: year ist wrong --> cm
+                helper.addColumn(1, "cm", "60", "uinfo_select_delta_w_column", "INTEGER", "LEFT", null);
                 for (int i = -200; i < +210; i = i + 10) {
                     final Map<String, String> row = new HashMap<>();
                     row.put("cm", Integer.toString(i));
diff -r 9ea704de63ee -r 5c1e66a3c878 artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties	Mon Oct 01 09:56:14 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties	Mon Oct 01 12:57:10 2018 +0200
@@ -92,6 +92,7 @@
 state.uinfo.year=Year
 state.uinfo.epoch=Epoch
 state.uinfo.totalepoch= Longtime Mean ({0} - {1})
+uinfo_select_delta_w_column = \u0394W [cm]
 
 state.sinfo.year_epoch = Year/Epoch
 state.sinfo.load.year= Year(s)
diff -r 9ea704de63ee -r 5c1e66a3c878 artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Mon Oct 01 09:56:14 2018 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Mon Oct 01 12:57:10 2018 +0200
@@ -92,6 +92,7 @@
 state.uinfo.year=Einzeljahr
 state.uinfo.epoch=Epoche
 state.uinfo.totalepoch=Langj\u00e4hriges Mittel ({0} - {1})
+uinfo_select_delta_w_column = \u0394W [cm]
 
 state.sinfo.year_epoch = Jahr/Epoche
 state.sinfo.load.year= Jahr(e)