# HG changeset patch # User Sascha L. Teichmann # Date 1308422284 0 # Node ID b6f57d927905a756e3d4bece329b74f0d57d6690 # Parent ddd8b37d5cd3cefc72dc733690400e7aa00520f7 Removed more dead code. flys-artifacts/trunk@2159 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r ddd8b37d5cd3 -r b6f57d927905 flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Sat Jun 18 18:19:34 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Sat Jun 18 18:38:04 2011 +0000 @@ -39,7 +39,6 @@ import de.intevation.flys.utils.DoubleUtil; import de.intevation.flys.model.Gauge; -import de.intevation.flys.model.Range; import de.intevation.flys.model.River; import de.intevation.flys.artifacts.context.FLYSContext; @@ -526,34 +525,6 @@ /** - * This method returns the given distance - * - * @return an array with lower and upper kilometer range for each - * intersected gauge. - */ - public double[][] getSplittedDistance() { - double[] dist = getDistance(); - List gauges = getGauges(); - - int num = gauges != null ? gauges.size() : 0; - - double[][] res = new double[num][2]; - - for (int i = 0; i < num; i++) { - Range range = gauges.get(i).getRange(); - - double lower = range.getA().doubleValue(); - double upper = range.getB().doubleValue(); - - res[i][0] = dist[0] < lower ? lower : dist[0]; - res[i][1] = dist[1] > upper ? upper : dist[1]; - } - - return res; - } - - - /** * Returns the selected locations based on a given array of locations. * * @param locations The StateData that contains the locations. @@ -629,7 +600,7 @@ step = DEFAULT_KM_STEPS; } - return getExplodedValues(distance[0], distance[1], step); + return DoubleUtil.explode(distance[0], distance[1], step); } @@ -1010,7 +981,7 @@ step = diff / DEFAULT_Q_STEPS; } - return getExplodedValues(from, to, step); + return DoubleUtil.explode(from, to, step); } @@ -1049,25 +1020,6 @@ /** - * Returns an array of double values. The values contained in this array - * begin with the value from and end with the value to. The - * number of values in the result array depends on the step width. - * - * @param from The lower value. - * @param to The upper value. - * @param step The step width between two values in the result array. - * - * @return an array of double values. - */ - public static double[] getExplodedValues( - double from, - double to, - double step - ) { - return DoubleUtil.explode(from, to, step); - } - - /** * Computes the hash code of the entered values. * * @return a hash code. diff -r ddd8b37d5cd3 -r b6f57d927905 flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java Sat Jun 18 18:19:34 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java Sat Jun 18 18:38:04 2011 +0000 @@ -12,7 +12,6 @@ import au.com.bytecode.opencsv.CSVWriter; -import de.intevation.artifacts.Artifact; import de.intevation.artifacts.CallContext; import de.intevation.flys.artifacts.model.WQKms;