# HG changeset patch # User Sascha L. Teichmann # Date 1355763543 -3600 # Node ID 0ba0f3e4f4c200398f0b308506f4d91a9e392bc2 # Parent 756aba0d2a7acc8e00111aba7f93ead8106268b0# Parent dfac28805d7952496a629ea64f3ff2cfa5a9b0fe Merged diff -r dfac28805d79 -r 0ba0f3e4f4c2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/GaugeAccess.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/GaugeAccess.java Mon Dec 17 17:56:56 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/GaugeAccess.java Mon Dec 17 17:59:03 2012 +0100 @@ -1,13 +1,10 @@ package de.intevation.flys.artifacts.access; -import java.util.Arrays; - import org.apache.log4j.Logger; import de.intevation.artifacts.CallContext; import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.utils.FLYSUtils; -import de.intevation.flys.utils.StringUtil; /** For the moment, light-weight wrapper around FLYSUtils. */ // TODO employ 'Caching' like other Accesses, remove usage of FLYSUtils. diff -r dfac28805d79 -r 0ba0f3e4f4c2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/RangeAccess.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/RangeAccess.java Mon Dec 17 17:56:56 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/RangeAccess.java Mon Dec 17 17:59:03 2012 +0100 @@ -1,13 +1,10 @@ package de.intevation.flys.artifacts.access; -import java.util.Arrays; - import org.apache.log4j.Logger; import de.intevation.artifacts.CallContext; import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.utils.FLYSUtils; -import de.intevation.flys.utils.StringUtil; /** For the moment, light-weight wrapper around FLYSUtils. */ // TODO employ 'Caching' like other Accesses, remove usage of FLYSUtils. diff -r dfac28805d79 -r 0ba0f3e4f4c2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityFacet.java Mon Dec 17 17:56:56 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityFacet.java Mon Dec 17 17:59:03 2012 +0100 @@ -7,10 +7,6 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.RiverAccess; -import de.intevation.flys.artifacts.context.FLYSContext; - -import de.intevation.flys.artifacts.math.MovingAverage; import de.intevation.flys.artifacts.states.DefaultState.ComputeType; import org.apache.log4j.Logger; diff -r dfac28805d79 -r 0ba0f3e4f4c2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffEpochFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffEpochFacet.java Mon Dec 17 17:56:56 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffEpochFacet.java Mon Dec 17 17:59:03 2012 +0100 @@ -6,12 +6,8 @@ import de.intevation.artifacts.Artifact; import de.intevation.artifacts.CallContext; import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.RiverAccess; -import de.intevation.flys.artifacts.context.FLYSContext; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; -import de.intevation.flys.artifacts.math.MovingAverage; -import de.intevation.flys.artifacts.model.ZoomScale; import de.intevation.flys.artifacts.states.DefaultState.ComputeType; diff -r dfac28805d79 -r 0ba0f3e4f4c2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffYearFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffYearFacet.java Mon Dec 17 17:56:56 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffYearFacet.java Mon Dec 17 17:59:03 2012 +0100 @@ -6,12 +6,8 @@ import de.intevation.artifacts.Artifact; import de.intevation.artifacts.CallContext; import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.RiverAccess; -import de.intevation.flys.artifacts.context.FLYSContext; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; -import de.intevation.flys.artifacts.math.MovingAverage; -import de.intevation.flys.artifacts.model.ZoomScale; import de.intevation.flys.artifacts.states.DefaultState.ComputeType; diff -r dfac28805d79 -r 0ba0f3e4f4c2 flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedDifferenceYearGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedDifferenceYearGenerator.java Mon Dec 17 17:56:56 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedDifferenceYearGenerator.java Mon Dec 17 17:59:03 2012 +0100 @@ -6,9 +6,6 @@ import de.intevation.artifactdatabase.state.ArtifactAndFacet; import de.intevation.artifactdatabase.state.Facet; -import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.BedDifferencesAccess; -import de.intevation.flys.artifacts.access.FlowVelocityAccess; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.minfo.BedDiffYearResult; import de.intevation.flys.artifacts.model.minfo.BedDifferencesResult;