# HG changeset patch # User Sascha L. Teichmann # Date 1342368896 0 # Node ID 0f7abd95c6e28377d95a2b256c739fce9b3157ac # Parent 2495b24147ff7fda7c65acab1f385516db5dd033 Removed same package imports. flys-artifacts/trunk@5007 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/ChangeLog Sun Jul 15 16:14:56 2012 +0000 @@ -1,3 +1,29 @@ +2012-07-15 Sascha L. Teichmann + + * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java, + src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java, + src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java, + src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java, + src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java, + src/main/java/de/intevation/flys/artifacts/states/SQRelation.java, + src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java, + src/main/java/de/intevation/flys/artifacts/states/PeriodsSelect.java, + src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java, + src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java, + src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java, + src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java, + src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java, + src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java, + src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, + src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java, + src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java, + src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java, + src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java, + src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, + src/main/java/de/intevation/flys/artifacts/model/WQFacet.java: + Removed same package imports. + 2012-07-15 Sascha L. Teichmann * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java Sun Jul 15 16:14:56 2012 +0000 @@ -23,7 +23,6 @@ import de.intevation.artifactdatabase.state.Output; import de.intevation.flys.artifacts.datacage.Recommendations; -import de.intevation.flys.artifacts.ChartArtifact; public class CollectionMonitor implements Hook { diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java Sun Jul 15 16:14:56 2012 +0000 @@ -15,7 +15,6 @@ import de.intevation.artifacts.ArtifactFactory; import de.intevation.artifacts.CallMeta; -import de.intevation.flys.artifacts.StaticFLYSArtifact; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.WQKms; diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java Sun Jul 15 16:14:56 2012 +0000 @@ -6,8 +6,6 @@ import de.intevation.flys.artifacts.model.FixingsOverview.Fixing.Filter; -import de.intevation.flys.artifacts.model.Range; - import de.intevation.flys.artifacts.model.FixingsOverview.IdFilter; import de.intevation.flys.artifacts.model.FixingsOverview.IdsFilter; import de.intevation.flys.artifacts.model.FixingsOverview.KmFilter; diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java Sun Jul 15 16:14:56 2012 +0000 @@ -12,7 +12,6 @@ import de.intevation.flys.model.River; import de.intevation.flys.artifacts.access.FlowVelocityAccess; -import de.intevation.flys.artifacts.model.FlowVelocityData; import de.intevation.flys.utils.FLYSUtils; diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java Sun Jul 15 16:14:56 2012 +0000 @@ -10,8 +10,6 @@ import de.intevation.flys.artifacts.cache.CacheFactory; -import de.intevation.flys.artifacts.model.AnnotationsFactory; - public class LocationProvider { private static final Logger log = diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java Sun Jul 15 16:14:56 2012 +0000 @@ -13,8 +13,6 @@ import de.intevation.flys.artifacts.MainValuesArtifact; import de.intevation.flys.artifacts.math.Linear; -import de.intevation.flys.artifacts.model.FacetTypes; -import de.intevation.flys.artifacts.model.WQDay; import de.intevation.flys.jfree.FLYSAnnotation; import de.intevation.flys.jfree.StickyAxisAnnotation; diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java Sun Jul 15 16:14:56 2012 +0000 @@ -13,8 +13,6 @@ import de.intevation.flys.artifacts.MainValuesArtifact; import de.intevation.flys.artifacts.math.Linear; -import de.intevation.flys.artifacts.model.FacetTypes; -import de.intevation.flys.artifacts.model.WQDay; import de.intevation.flys.jfree.FLYSAnnotation; import de.intevation.flys.jfree.StickyAxisAnnotation; diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java Sun Jul 15 16:14:56 2012 +0000 @@ -15,7 +15,6 @@ import de.intevation.flys.model.TimeInterval; import de.intevation.flys.artifacts.access.BedHeightAccess; -import de.intevation.flys.artifacts.model.MiddleBedHeightData; public class MiddleBedHeightCalculation extends Calculation { diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java Sun Jul 15 16:14:56 2012 +0000 @@ -11,10 +11,6 @@ import de.intevation.flys.artifacts.StaticWKmsArtifact; import de.intevation.flys.artifacts.math.Linear; -import de.intevation.flys.artifacts.model.FacetTypes; -import de.intevation.flys.artifacts.model.DurationCurveFacet; -import de.intevation.flys.artifacts.model.ReferenceCurveFacet; -import de.intevation.flys.artifacts.model.WQDay; /** * Facet to access a point. diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java Sun Jul 15 16:14:56 2012 +0000 @@ -4,7 +4,6 @@ import de.intevation.artifacts.CallContext; import de.intevation.flys.artifacts.StaticWKmsArtifact; -import de.intevation.flys.artifacts.model.FacetTypes; /** * Facet to show W|km Values. diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java Sun Jul 15 16:14:56 2012 +0000 @@ -12,9 +12,6 @@ import org.hibernate.SQLQuery; import org.hibernate.type.StandardBasicTypes; -import de.intevation.flys.artifacts.model.WKms; -import de.intevation.flys.artifacts.model.WKmsImpl; - import de.intevation.flys.artifacts.cache.CacheFactory; import de.intevation.flys.backend.SessionHolder; diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQFacet.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQFacet.java Sun Jul 15 16:14:56 2012 +0000 @@ -6,7 +6,6 @@ import de.intevation.artifactdatabase.state.DefaultFacet; import de.intevation.flys.artifacts.WQKmsInterpolArtifact; -import de.intevation.flys.artifacts.model.FacetTypes; /** * Facet to show W|Q Values. diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java Sun Jul 15 16:14:56 2012 +0000 @@ -6,7 +6,6 @@ import de.intevation.artifacts.CallContext; import de.intevation.flys.artifacts.StaticWQKmsArtifact; -import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.states.DefaultState.ComputeType; diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java Sun Jul 15 16:14:56 2012 +0000 @@ -12,8 +12,6 @@ import org.hibernate.SQLQuery; import org.hibernate.type.StandardBasicTypes; -import de.intevation.flys.artifacts.model.WQKms; - import de.intevation.flys.artifacts.cache.CacheFactory; import de.intevation.flys.backend.SessionHolder; diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java Sun Jul 15 16:14:56 2012 +0000 @@ -15,8 +15,6 @@ import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.Parameters; -import de.intevation.flys.artifacts.model.fixings.FixFacetUtils; - import de.intevation.flys.artifacts.states.DefaultState.ComputeType; import org.apache.log4j.Logger; diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java Sun Jul 15 16:14:56 2012 +0000 @@ -2,8 +2,6 @@ import org.apache.log4j.Logger; -import de.intevation.flys.artifacts.states.DefaultState; - /** * @author Raimund Renkert */ diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/PeriodsSelect.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/PeriodsSelect.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/PeriodsSelect.java Sun Jul 15 16:14:56 2012 +0000 @@ -2,8 +2,6 @@ import org.apache.log4j.Logger; -import de.intevation.flys.artifacts.states.DefaultState; - /** * @author Raimund Renkert */ diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SQRelation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SQRelation.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SQRelation.java Sun Jul 15 16:14:56 2012 +0000 @@ -23,8 +23,6 @@ import de.intevation.flys.artifacts.resources.Resources; -import de.intevation.flys.artifacts.states.DefaultState; - import java.util.List; import org.apache.log4j.Logger; diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java Sun Jul 15 16:14:56 2012 +0000 @@ -18,9 +18,6 @@ import org.jfree.ui.RectangleEdge; -import de.intevation.flys.jfree.JFreeUtil; - - /** * Custom Annotations class that is drawn only if no collisions with other * already drawn CustomAnnotations in current plot are found. diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java --- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java Sun Jul 15 16:14:56 2012 +0000 @@ -26,9 +26,6 @@ import org.jfree.util.ShapeUtilities; import org.jfree.text.TextUtilities; -import de.intevation.flys.jfree.HasLabel; -import de.intevation.flys.jfree.JFreeUtil; - /** * Renderer with additional the additional functionality of renderering minima * and/or maxima of dataseries contained in datasets. diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java Sun Jul 15 16:14:56 2012 +0000 @@ -7,11 +7,8 @@ import org.jfree.chart.annotations.XYTextAnnotation; -import de.intevation.flys.jfree.StickyAxisAnnotation; - import de.intevation.flys.artifacts.model.HYKFactory; - /** * List of Text- Annotations with name and theme. */ diff -r 2495b24147ff -r 0f7abd95c6e2 flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledXYSeries.java --- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledXYSeries.java Sun Jul 15 16:02:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledXYSeries.java Sun Jul 15 16:14:56 2012 +0000 @@ -9,9 +9,6 @@ import org.jfree.data.xy.XYDataItem; import org.jfree.data.xy.XYSeries; -import de.intevation.flys.jfree.HasLabel; - - /** * @author Ingo Weinzierl */