Mercurial > dive4elements > river
changeset 6733:d2fddd344d7c double-precision
merged changes from default into double-precision branch
| author | Tom Gottfried <tom.gottfried@intevation.de> |
|---|---|
| date | Wed, 31 Jul 2013 12:31:09 +0200 |
| parents | c14e17dabf39 (current diff) 563f3793d334 (diff) |
| children | 839f1a889c4a |
| files | |
| diffstat | 2 files changed, 1 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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); }
--- 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; }