Mercurial > dive4elements > river
changeset 3875:d12f108ccc9c
The usual whitespace and import cleanups.
flys-artifacts/trunk@5508 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Tue Sep 18 15:03:20 2012 +0000 +++ b/flys-artifacts/ChangeLog Tue Sep 18 15:45:49 2012 +0000 @@ -1,3 +1,16 @@ +2012-09-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java, + src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java, + src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java, + src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java, + src/main/java/de/intevation/flys/exports/OutputHelper.java, + src/main/java/de/intevation/flys/exports/ChartGenerator.java, + src/main/java/de/intevation/flys/themes/ThemeFactory.java, + src/main/java/de/intevation/flys/themes/ThemeMapping.java, + src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: + The usual whitespace and import cleanups. + 2012-09-18 Raimund Renkert <raimund.renkert@intevation.de> * src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurementFactory.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java Tue Sep 18 15:03:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java Tue Sep 18 15:45:49 2012 +0000 @@ -139,7 +139,7 @@ TDoubleArrayList porositySub = new TDoubleArrayList(); TDoubleArrayList densityCap = new TDoubleArrayList(); TDoubleArrayList densitySub = new TDoubleArrayList(); - + for(double km : kms) { double[] pCap = calculatePorosity(capFiltered, km); double[] pSub = calculatePorosity(subFiltered, km); @@ -163,7 +163,7 @@ porositySub.add((pSubRes / pSub.length) * 100); densityCap.add((dCapRes / dCap.length) / 1000); densitySub.add((dSubRes / dSub.length) / 1000); - + } return new BedParametersResult(
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java Tue Sep 18 15:03:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java Tue Sep 18 15:45:49 2012 +0000 @@ -6,8 +6,6 @@ import de.intevation.flys.artifacts.model.DateRange; -import gnu.trove.TDoubleArrayList; - public class BedQualityResult implements Serializable {
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java Tue Sep 18 15:03:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java Tue Sep 18 15:45:49 2012 +0000 @@ -75,12 +75,12 @@ ) { List<BedHeightSingle> singles = BedHeightSingle.getBedHeightSingles(river, kmLo, kmHi); - + if (singles != null) { int size = singles.size(); - + logger.debug("Found " + size + " singles."); - + for (int i = 0; i < size; i++) { BedHeightSingle s = singles.get(i); @@ -104,9 +104,9 @@ if (epochs != null) { int size = epochs.size(); - + logger.debug("Found " + size + " epochs."); - + for (int i = 0; i < size; i++) { BedHeightEpoch e = epochs.get(i);
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Tue Sep 18 15:03:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Tue Sep 18 15:45:49 2012 +0000 @@ -67,8 +67,6 @@ import de.intevation.flys.utils.Formatter; -import java.text.NumberFormat; - /** * The base class for chart creation. It should provide some basic things that * equal in all chart types.
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/OutputHelper.java Tue Sep 18 15:03:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/OutputHelper.java Tue Sep 18 15:45:49 2012 +0000 @@ -457,7 +457,6 @@ pattern, outName, "default"); - if (t != null) { log.debug("found theme for facet '" + facet + "'");
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java Tue Sep 18 15:03:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java Tue Sep 18 15:45:49 2012 +0000 @@ -9,7 +9,6 @@ import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.minfo.BedDiameterResult; import de.intevation.flys.artifacts.model.minfo.BedParametersResult; -import de.intevation.flys.artifacts.model.minfo.BedQualityResult; import de.intevation.flys.artifacts.model.minfo.BedloadDiameterResult; import de.intevation.flys.exports.StyledSeriesBuilder; import de.intevation.flys.exports.XYChartGenerator;
--- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java Tue Sep 18 15:03:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java Tue Sep 18 15:45:49 2012 +0000 @@ -121,7 +121,6 @@ import gnu.trove.TDoubleArrayList; -import de.intevation.flys.artifacts.resources.Resources; import de.intevation.flys.artifacts.math.Linear; import java.text.NumberFormat;
--- a/flys-artifacts/src/main/java/de/intevation/flys/themes/ThemeFactory.java Tue Sep 18 15:03:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/themes/ThemeFactory.java Tue Sep 18 15:45:49 2012 +0000 @@ -130,7 +130,7 @@ && tm.outputMatches(output)) { String target = tm.getTo(); - + logger.debug("Found theme '" + target + "'"); return t.get(target); }
--- a/flys-artifacts/src/main/java/de/intevation/flys/themes/ThemeMapping.java Tue Sep 18 15:03:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/themes/ThemeMapping.java Tue Sep 18 15:45:49 2012 +0000 @@ -88,7 +88,7 @@ return true; } Matcher m = pattern.matcher(text); - + if (m.matches()) { logger.debug("Pattern matches: " + text); return true;