[PATCH 1 of 8] Cosmetics, doc, obsolete import removal
Wald Commits
scm-commit at wald.intevation.org
Wed Jul 17 09:55:11 CEST 2013
# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1373964239 -7200
# Node ID 7d86ed4537d9101719a16ed0a07e55ec11dbca2c
# Parent d99575a659aff21c3623b9a1c7aaba41ec95be1e
Cosmetics, doc, obsolete import removal.
diff -r d99575a659af -r 7d86ed4537d9 artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Tue Jul 16 10:00:34 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Tue Jul 16 10:43:59 2013 +0200
@@ -310,7 +310,7 @@
return -1;
}
- // Do linear interpolation
+ // Do linear interpolation.
int mod = kmIncreasing ? -1 : +1;
return Linear.linear(km, wkms.getKm(idx+mod), wkms.getKm(idx), wkms.getW(idx+mod), wkms.getW(idx));
}
diff -r d99575a659af -r 7d86ed4537d9 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 Jul 16 10:00:34 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Tue Jul 16 10:43:59 2013 +0200
@@ -18,7 +18,10 @@
import org.dive4elements.river.artifacts.model.Calculation;
import org.dive4elements.river.artifacts.model.CalculationResult;
-
+/**
+ * Perform calculation of differences of bed height (german Sohlhoehe).
+ * The input are either single year data or epochs.
+ */
public class BedDiffCalculation
extends Calculation
{
@@ -84,6 +87,7 @@
*/
}
+ /** Get two BedHeights from factory. */
private static BedHeight [] getHeightPair(int [] ids, String type) {
return new BedHeight [] {
BedHeightFactory.getHeight(type, ids[0], 0),
diff -r d99575a659af -r 7d86ed4537d9 artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java Tue Jul 16 10:00:34 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java Tue Jul 16 10:43:59 2013 +0200
@@ -37,7 +37,7 @@
import org.dive4elements.river.utils.RiverUtils;
import org.dive4elements.river.utils.StringUtil;
-
+/** State of a WINFOArtifact to get differences of data of other artifacts. */
public class WDifferencesState
extends DefaultState
implements FacetTypes
diff -r d99575a659af -r 7d86ed4537d9 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearGenerator.java Tue Jul 16 10:00:34 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearGenerator.java Tue Jul 16 10:43:59 2013 +0200
@@ -15,17 +15,12 @@
import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
import org.dive4elements.artifactdatabase.state.Facet;
import org.dive4elements.river.artifacts.model.FacetTypes;
-import org.dive4elements.river.artifacts.model.minfo.BedDiffYearResult;
import org.dive4elements.river.artifacts.model.minfo.BedDifferencesResult;
import org.dive4elements.river.exports.StyledSeriesBuilder;
-import org.dive4elements.river.exports.fixings.FixChartGenerator;
import org.dive4elements.river.exports.process.BedDiffHeightYearProcessor;
import org.dive4elements.river.exports.process.KMIndexProcessor;
import org.dive4elements.river.exports.process.Processor;
-import org.dive4elements.river.jfree.Bounds;
-import org.dive4elements.river.jfree.DoubleBounds;
import org.dive4elements.river.jfree.RiverAnnotation;
-import org.dive4elements.river.jfree.StyledXYSeries;
public class BedDiffHeightYearGenerator
diff -r d99575a659af -r 7d86ed4537d9 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java Tue Jul 16 10:00:34 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java Tue Jul 16 10:43:59 2013 +0200
@@ -27,8 +27,6 @@
import org.dive4elements.river.exports.process.KMIndexProcessor;
import org.dive4elements.river.exports.process.Processor;
import org.dive4elements.river.exports.process.WOutProcessor;
-import org.dive4elements.river.jfree.Bounds;
-import org.dive4elements.river.jfree.DoubleBounds;
import org.dive4elements.river.jfree.RiverAnnotation;
import org.dive4elements.river.jfree.StyledXYSeries;
import org.dive4elements.river.utils.DataUtil;
diff -r d99575a659af -r 7d86ed4537d9 artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.java Tue Jul 16 10:00:34 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.java Tue Jul 16 10:43:59 2013 +0200
@@ -8,8 +8,6 @@
package org.dive4elements.river.exports.process;
-import java.util.List;
-
import org.apache.log4j.Logger;
import org.jfree.data.xy.XYSeries;
import org.w3c.dom.Document;
@@ -17,12 +15,10 @@
import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
import org.dive4elements.artifacts.CallContext;
import org.dive4elements.river.artifacts.model.FacetTypes;
-import org.dive4elements.river.artifacts.model.minfo.BedHeightSingle;
import org.dive4elements.river.artifacts.model.minfo.BedDiffYearResult;
import org.dive4elements.river.exports.StyledSeriesBuilder;
import org.dive4elements.river.exports.XYChartGenerator;
import org.dive4elements.river.jfree.StyledXYSeries;
-import org.dive4elements.river.model.BedHeightSingleValue;
public class BedDiffHeightYearProcessor implements Processor, FacetTypes {
diff -r d99575a659af -r 7d86ed4537d9 artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffYearProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffYearProcessor.java Tue Jul 16 10:00:34 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffYearProcessor.java Tue Jul 16 10:43:59 2013 +0200
@@ -8,8 +8,6 @@
package org.dive4elements.river.exports.process;
-import java.util.List;
-
import org.apache.log4j.Logger;
import org.jfree.data.xy.XYSeries;
import org.w3c.dom.Document;
@@ -17,12 +15,10 @@
import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
import org.dive4elements.artifacts.CallContext;
import org.dive4elements.river.artifacts.model.FacetTypes;
-import org.dive4elements.river.artifacts.model.minfo.BedHeightSingle;
import org.dive4elements.river.artifacts.model.minfo.BedDiffYearResult;
import org.dive4elements.river.exports.StyledSeriesBuilder;
import org.dive4elements.river.exports.XYChartGenerator;
import org.dive4elements.river.jfree.StyledXYSeries;
-import org.dive4elements.river.model.BedHeightSingleValue;
public class BedDiffYearProcessor implements Processor, FacetTypes {
More information about the Dive4elements-commits
mailing list