Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java @ 7391:9513d1af7d58
Renamed artifacts/**/BedHeight(Single) to BedHeight(Single)Data, to resolve
class name conflict with class in backend.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Thu, 17 Oct 2013 15:08:59 +0200 |
parents | 4eccd72595ee |
children | 04b70a6fe8c5 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Thu Oct 17 11:12:14 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Thu Oct 17 15:08:59 2013 +0200 @@ -66,7 +66,7 @@ BedDiffYearResult [] results = new BedDiffYearResult[heightIds.length]; for (int i = 0; i < heightIds.length; i++) { - BedHeight [] pair = getHeightPair(heightIds[i], "single"); + BedHeightData [] pair = getHeightPair(heightIds[i], "single"); results[i] = calculateYearDifference(pair); } return new CalculationResult(results, this); @@ -88,17 +88,17 @@ } /** Get two BedHeights from factory. */ - private static BedHeight [] getHeightPair(int [] ids, String type) { - return new BedHeight [] { + private static BedHeightData [] getHeightPair(int [] ids, String type) { + return new BedHeightData [] { BedHeightFactory.getHeight(type, ids[0], 0), BedHeightFactory.getHeight(type, ids[1], 0) }; } - private BedDiffEpochResult calculateEpochDifference(BedHeight[] pair) { + private BedDiffEpochResult calculateEpochDifference(BedHeightData[] pair) { - BedHeight bh1 = pair[0]; - BedHeight bh2 = pair[1]; + BedHeightData bh1 = pair[0]; + BedHeightData bh2 = pair[1]; TDoubleArrayList stations = bh1.getStations(); int size = stations.size(); @@ -125,10 +125,10 @@ return new BedDiffEpochResult(kms, diffRes, heights1, heights2, start, end); } - private BedDiffYearResult calculateYearDifference(BedHeight[] pair) { + private BedDiffYearResult calculateYearDifference(BedHeightData[] pair) { logger.debug("BedDiffCalculation.calculateYearDifference"); - BedHeightSingle s1 = (BedHeightSingle) pair[0]; - BedHeightSingle s2 = (BedHeightSingle) pair[1]; + BedHeightSingleData s1 = (BedHeightSingleData) pair[0]; + BedHeightSingleData s2 = (BedHeightSingleData) pair[1]; TDoubleArrayList stations = s1.getStations(); int size = stations.size();