[PATCH 38 of 45] Use updated class name instead of no more existant
Wald Commits
scm-commit at wald.intevation.org
Tue Mar 10 17:06:06 CET 2015
# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1424961423 -3600
# Node ID 078b07a940239d3c9b818e5aec3f477c031cfcf5
# Parent 9bbce0edd36b38e5cfbc98f81c6c26980c7e5cb2
Use updated class name instead of no more existant.
diff -r 9bbce0edd36b -r 078b07a94023 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 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();
diff -r 9bbce0edd36b -r 078b07a94023 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 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;
More information about the Dive4Elements-commits
mailing list