[PATCH] merged changes from default into double-precision branch

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom.gottfried at intevation.de>
# Date 1375266669 -7200
# Branch double-precision
# Node ID d2fddd344d7c4a80387cd0e4dacc49bffb1c9b40
# Parent  c14e17dabf3997ef4821ada5ab296ab5eb05d34b
# Parent  563f3793d334b9854feeba48b501f733402e5a32
merged changes from default into double-precision branch

diff -r c14e17dabf39 -r d2fddd344d7c backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java	Wed Jul 31 11:31:23 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java	Wed Jul 31 12:31:09 2013 +0200
@@ -251,11 +251,9 @@
         Integer kind;
 
         if (inputFile.getAbsolutePath().contains("amtliche Epochen")) {
-            log.warn("is amtlichbamtlich");
             kind = new Integer(1);
         }
         else {
-            log.warn("is unamtlichbamtlich");
             kind = new Integer(0);
         }
 
diff -r c14e17dabf39 -r d2fddd344d7c gwt-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadOffEpochPanel.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadOffEpochPanel.java	Wed Jul 31 11:31:23 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadOffEpochPanel.java	Wed Jul 31 12:31:09 2013 +0200
@@ -122,12 +122,7 @@
         date.setType(ListGridFieldType.TEXT);
         date.setWidth(100);
 
-        ListGridField descr =
-            new ListGridField("description", MSG.description());
-        descr.setType(ListGridFieldType.TEXT);
-        descr.setWidth("*");
-
-        sedLoadTable.setFields(date, descr);
+        sedLoadTable.setFields(date);
         return sedLoadTable;
     }