[PATCH 28 of 45] Remove obsolete class hierarchy for bed height data

[Wald Commits]

# HG changeset patch
# User "Tom Gottfried <tom at intevation.de>"
# Date 1424077932 -3600
# Node ID d0ea092a32f51730c5399fbcdcabcfc7488f15a2
# Parent  29ab66ce06aa811296e57e03418ddb5adc4b9fa4
Remove obsolete class hierarchy for bed height data.

diff -r 29ab66ce06aa -r d0ea092a32f5 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightData.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightData.java	Mon Feb 16 09:50:39 2015 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightData.java	Mon Feb 16 10:12:12 2015 +0100
@@ -20,16 +20,23 @@
 
     protected TDoubleArrayList heights;
     protected TDoubleArrayList station;
+    protected TDoubleArrayList data_gap;
+    protected TDoubleArrayList soundingWidth;
+    protected Integer year;
 
     public BedHeightData() {
         heights = new TDoubleArrayList();
         station = new TDoubleArrayList();
+        data_gap = new TDoubleArrayList();
+        soundingWidth = new TDoubleArrayList();
     }
 
     public BedHeightData(String name) {
         super(name);
         heights = new TDoubleArrayList();
         station = new TDoubleArrayList();
+        data_gap = new TDoubleArrayList();
+        soundingWidth = new TDoubleArrayList();
     }
 
     public BedHeightData(int capacity) {
@@ -42,9 +49,20 @@
         station = new TDoubleArrayList(capacity);
     }
 
-    public void add(double value, double station) {
+    public void add(
+        double value,
+        double station,
+        double gap,
+        double sounding,
+        Integer year
+    ) {
         this.heights.add(value);
         this.station.add(station);
+        if (year != null) {
+            this.year = year;
+        }
+        this.data_gap.add(gap);
+        this.soundingWidth.add(sounding);
     }
 
     public int size() {
@@ -82,6 +100,32 @@
         return index >= 0 ? heights.getQuick(index) : Double.NaN;
     }
 
+    public Integer getYear() {
+        return this.year;
+    }
+
+    public double getSoundingWidth(int idx) {
+        return this.soundingWidth.getQuick(idx);
+    }
+
+    public double getDataGap(int idx) {
+        return this.data_gap.getQuick(idx);
+    }
+
+    public double getSoundingWidth(double station) {
+        int index = this.station.indexOf(station);
+        return index >= 0 ? soundingWidth.getQuick(index): Double.NaN;
+    }
+
+    public double getDataGap(double station) {
+        int index = this.station.indexOf(station);
+        return index >= 0 ? data_gap.getQuick(index) : Double.NaN;
+    }
+
+    public double[] getSoundingWidths() {
+        return this.soundingWidth.toNativeArray();
+    }
+
 
     public static void removeNaNs(TDoubleArrayList [] arrays) {
 
diff -r 29ab66ce06aa -r d0ea092a32f5 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightSingleData.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightSingleData.java	Mon Feb 16 09:50:39 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +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 gnu.trove.TDoubleArrayList;
-
-
-public class BedHeightSingleData
-extends BedHeightData
-{
-    protected Integer year;
-    protected TDoubleArrayList data_gap;
-    protected TDoubleArrayList soundingWidth;
-
-    public BedHeightSingleData() {
-        super();
-        data_gap = new TDoubleArrayList();
-        soundingWidth = new TDoubleArrayList();
-    }
-
-    public BedHeightSingleData(String name) {
-        super(name);
-        data_gap = new TDoubleArrayList();
-        soundingWidth = new TDoubleArrayList();
-    }
-
-    public void add(
-        double value,
-        double station,
-        double gap,
-        double sounding,
-        Integer year
-    ) {
-        super.add(value, station);
-        if (year != null) {
-            this.year = year;
-        }
-        this.data_gap.add(gap);
-        this.soundingWidth.add(sounding);
-    }
-
-    public Integer getYear() {
-        return this.year;
-    }
-
-    public double getSoundingWidth(int idx) {
-        return this.soundingWidth.getQuick(idx);
-    }
-
-    public double getDataGap(int idx) {
-        return this.data_gap.getQuick(idx);
-    }
-
-    public double getSoundingWidth(double station) {
-        int index = this.station.indexOf(station);
-        return index >= 0 ? soundingWidth.getQuick(index): Double.NaN;
-    }
-
-    public double getDataGap(double station) {
-        int index = this.station.indexOf(station);
-        return index >= 0 ? data_gap.getQuick(index) : Double.NaN;
-    }
-
-    public double[] getSoundingWidths() {
-        return this.soundingWidth.toNativeArray();
-    }
-
-}