changeset 8568:078b07a94023

Use updated class name instead of no more existant.
author Tom Gottfried <tom@intevation.de>
date Thu, 26 Feb 2015 15:37:03 +0100
parents 9bbce0edd36b
children 26c7aa469bfc
files artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java	Tue Feb 24 18:32:18 2015 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java	Thu Feb 26 15:37:03 2015 +0100
@@ -42,7 +42,7 @@
 
         BedDiffYearResult [] results = new BedDiffYearResult[heightIds.length];
         for (int i = 0; i < heightIds.length; i++) {
-            BedHeightSingleData [] pair = getHeightPair(heightIds[i], fromKm, toKm);
+            BedHeightData [] pair = getHeightPair(heightIds[i], fromKm, toKm);
             if (pair[0].getYear() == null || pair[1].getYear() == null) {
                 addProblem("beddiff.missing.year");
             }
@@ -53,20 +53,20 @@
     }
 
     /** Get two BedHeights from factory. */
-    private static BedHeightSingleData [] getHeightPair(int [] ids, double from, double to) {
-        return new BedHeightSingleData [] {
-            (BedHeightSingleData)BedHeightFactory.getHeight("single", ids[0], from, to),
-            (BedHeightSingleData)BedHeightFactory.getHeight("single", ids[1], from, to)
+    private static BedHeightData [] getHeightPair(int [] ids, double from, double to) {
+        return new BedHeightData [] {
+            (BedHeightData)BedHeightFactory.getHeight("single", ids[0], from, to),
+            (BedHeightData)BedHeightFactory.getHeight("single", ids[1], from, to)
         };
     }
 
     private BedDiffYearResult calculateYearDifference(
-        BedHeightSingleData[] pair,
+        BedHeightData[] pair,
         int[] ids
         ) {
         log.debug("BedDiffCalculation.calculateYearDifference");
-        BedHeightSingleData s1 = pair[0];
-        BedHeightSingleData s2 = pair[1];
+        BedHeightData s1 = pair[0];
+        BedHeightData s2 = pair[1];
 
         TDoubleArrayList stations = s1.getStations();
         int size = stations.size();
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java	Tue Feb 24 18:32:18 2015 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java	Thu Feb 26 15:37:03 2015 +0100
@@ -144,8 +144,8 @@
         Session session = SessionHolder.HOLDER.get();
         SQLQuery sqlQuery = null;
         if (type.equals("single")) {
-            BedHeightSingleData height =
-                new BedHeightSingleData(getHeightName(type, height_id));
+            BedHeightData height =
+                new BedHeightData(getHeightName(type, height_id));
             String queryString = SQL_SELECT_SINGLE;
             if (Double.isNaN(from) || Double.isNaN(to)) {
                 queryString += ID_CLAUSE;

http://dive4elements.wald.intevation.org