diff backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java @ 6338:d518a42cdcd3 double-precision

merge changes from default into double-precision
author Tom Gottfried <tom.gottfried@intevation.de>
date Fri, 14 Jun 2013 16:46:33 +0200
parents e7526a074c0d 1173e9f47b52
children cc21c197d204
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java	Wed Jun 12 14:25:58 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java	Fri Jun 14 16:46:33 2013 +0200
@@ -42,6 +42,7 @@
 import org.dive4elements.river.model.BedHeightType;
 import org.dive4elements.river.importer.ImporterSession;
 import org.dive4elements.river.utils.EpsilonComparator;
+import org.dive4elements.river.importer.parsers.LineParser;
 
 public abstract class BedHeightParser {
 
@@ -165,23 +166,6 @@
     }
 
 
-    public static Date getStartDateFromYear(int year) {
-        Calendar cal = Calendar.getInstance();
-	cal.clear();
-        cal.set(year, 0, 1, 0, 0, 0);
-
-        return cal.getTime();
-    }
-
-    public static Date getEndDateFromYear(int year) {
-        Calendar cal = Calendar.getInstance();
-	cal.clear();
-        cal.set(year, 11, 31, 23, 59, 59);
-
-        return cal.getTime();
-    }
-
-
     protected void handleMetaLine(ImportBedHeight obj, String line) {
         String meta = stripMetaLine(line);
 
@@ -252,8 +236,8 @@
                 int lower = Integer.valueOf(lo);
                 int upper = Integer.valueOf(up);
 
-                Date fromYear = getStartDateFromYear(lower);
-                Date toYear   = getEndDateFromYear(upper);
+                Date fromYear = LineParser.getStartDateFromYear(lower);
+                Date toYear   = LineParser.getEndDateFromYear(upper);
 
                 obj.setTimeInterval(new ImportTimeInterval(fromYear, toYear));
             }

http://dive4elements.wald.intevation.org