[PATCH 06 of 13] Moved BedHeightEpoch to BedHeightEpochData

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1382016117 -7200
# Node ID 04b70a6fe8c5f07e8a7eb1b4609e1b05bb5eb5dd
# Parent  9513d1af7d58b38ea434812500f0fe9e5c05bd92
Moved BedHeightEpoch to BedHeightEpochData.

diff -r 9513d1af7d58 -r 04b70a6fe8c5 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java	Thu Oct 17 15:08:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java	Thu Oct 17 15:21:57 2013 +0200
@@ -120,8 +120,8 @@
                 heights2.add(h2);
             }
         }
-        Date start = ((BedHeightEpoch)bh1).getStart();
-        Date end   = ((BedHeightEpoch)bh2).getEnd();
+        Date start = ((BedHeightEpochData)bh1).getStart();
+        Date end   = ((BedHeightEpochData)bh2).getEnd();
         return new BedDiffEpochResult(kms, diffRes, heights1, heights2, start, end);
     }
 
diff -r 9513d1af7d58 -r 04b70a6fe8c5 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightEpoch.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightEpoch.java	Thu Oct 17 15:08:59 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde
- * Software engineering by Intevation GmbH
- *
- * This file is Free Software under the GNU AGPL (>=v3)
- * and comes with ABSOLUTELY NO WARRANTY! Check out the
- * documentation coming with Dive4Elements River for details.
- */
-
-package org.dive4elements.river.artifacts.model.minfo;
-
-import java.util.Date;
-
-
-public class BedHeightEpoch
-extends BedHeightData
-{
-
-    protected Date start;
-    protected Date end;
-
-    public BedHeightEpoch() {
-        this.start = new Date();
-        this.end = new Date();
-    }
-
-    public BedHeightEpoch(String name) {
-        super(name);
-        this.start = new Date();
-        this.end = new Date();
-    }
-
-    public void add(
-        double value,
-        double station,
-        Date start,
-        Date end
-    ) {
-        super.add(value, station);
-        this.start = start;
-        this.end = end;
-    }
-
-    public Date getStart() {
-        return start;
-    }
-
-    public Date getEnd() {
-        return end;
-    }
-}
diff -r 9513d1af7d58 -r 04b70a6fe8c5 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightEpochData.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightEpochData.java	Thu Oct 17 15:21:57 2013 +0200
@@ -0,0 +1,50 @@
+/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde
+ * Software engineering by Intevation GmbH
+ *
+ * This file is Free Software under the GNU AGPL (>=v3)
+ * and comes with ABSOLUTELY NO WARRANTY! Check out the
+ * documentation coming with Dive4Elements River for details.
+ */
+
+package org.dive4elements.river.artifacts.model.minfo;
+
+import java.util.Date;
+
+
+public class BedHeightEpochData
+extends BedHeightData
+{
+
+    protected Date start;
+    protected Date end;
+
+    public BedHeightEpochData() {
+        this.start = new Date();
+        this.end = new Date();
+    }
+
+    public BedHeightEpochData(String name) {
+        super(name);
+        this.start = new Date();
+        this.end = new Date();
+    }
+
+    public void add(
+        double value,
+        double station,
+        Date start,
+        Date end
+    ) {
+        super.add(value, station);
+        this.start = start;
+        this.end = end;
+    }
+
+    public Date getStart() {
+        return start;
+    }
+
+    public Date getEnd() {
+        return end;
+    }
+}
diff -r 9513d1af7d58 -r 04b70a6fe8c5 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java	Thu Oct 17 15:08:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java	Thu Oct 17 15:21:57 2013 +0200
@@ -163,8 +163,8 @@
             return height;
         }
         else if (type.equals("epoch")) {
-            BedHeightEpoch height =
-                new BedHeightEpoch(getHeightName(type, height_id));
+            BedHeightEpochData height =
+                new BedHeightEpochData(getHeightName(type, height_id));
             sqlQuery = session.createSQLQuery(SQL_SELECT_EPOCH)
                 .addScalar("height", StandardBasicTypes.DOUBLE)
                 .addScalar("station", StandardBasicTypes.DOUBLE)