# HG changeset patch # User Sascha L. Teichmann # Date 1340292206 0 # Node ID 5888c4685701feab2a20c1f94f95a42366da588b # Parent 9c147bbffc36ce7fea40b700252e91871440ee56 Removed superfluous import. flys-artifacts/trunk@4747 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 9c147bbffc36 -r 5888c4685701 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Thu Jun 21 15:18:46 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu Jun 21 15:23:26 2012 +0000 @@ -1,3 +1,10 @@ +2012-06-21 Sascha L. Teichmann + + * src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java, + src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, + src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: + Removed superfluous imports. + 2012-06-21 Sascha L. Teichmann * src/main/java/de/intevation/flys/artifacts/model/Range.java: diff -r 9c147bbffc36 -r 5888c4685701 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java Thu Jun 21 15:18:46 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java Thu Jun 21 15:23:26 2012 +0000 @@ -6,9 +6,6 @@ import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.artifacts.FixationArtifactAccess; -import de.intevation.flys.artifacts.math.fitting.Function; -import de.intevation.flys.artifacts.math.fitting.FunctionFactory; - import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; import de.intevation.flys.artifacts.model.FacetTypes; diff -r 9c147bbffc36 -r 5888c4685701 flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java Thu Jun 21 15:18:46 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java Thu Jun 21 15:23:26 2012 +0000 @@ -1,57 +1,61 @@ package de.intevation.flys.exports; -import java.awt.Color; -import java.awt.Font; -import java.awt.Paint; -import java.awt.BasicStroke; -import java.awt.Stroke; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Date; - -import org.json.JSONArray; -import org.json.JSONException; - -import org.apache.log4j.Logger; - -import org.w3c.dom.Document; - -import org.jfree.chart.ChartFactory; -import org.jfree.chart.JFreeChart; -import org.jfree.chart.axis.ValueAxis; -import org.jfree.chart.plot.XYPlot; -import org.jfree.chart.annotations.XYTextAnnotation; -import org.jfree.chart.LegendItemCollection; -import org.jfree.chart.plot.Marker; -import org.jfree.chart.plot.ValueMarker; -import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; - -import org.jfree.ui.Layer; - -import org.jfree.data.Range; -import org.jfree.data.time.TimeSeriesCollection; -import org.jfree.data.general.Series; -import org.jfree.data.xy.XYDataset; -import org.jfree.data.time.Day; -import org.jfree.data.time.TimeSeries; -import org.jfree.data.time.RegularTimePeriod; - import de.intevation.artifactdatabase.state.ArtifactAndFacet; import de.intevation.artifactdatabase.state.Facet; import de.intevation.flys.jfree.Bounds; +import de.intevation.flys.jfree.CollisionFreeXYTextAnnotation; import de.intevation.flys.jfree.DoubleBounds; -import de.intevation.flys.jfree.TimeBounds; +import de.intevation.flys.jfree.FLYSAnnotation; import de.intevation.flys.jfree.StyledTimeSeries; -import de.intevation.flys.jfree.FLYSAnnotation; -import de.intevation.flys.jfree.CollisionFreeXYTextAnnotation; -import de.intevation.flys.jfree.StyledSeries; +import de.intevation.flys.jfree.TimeBounds; import de.intevation.flys.utils.ThemeAccess; +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Font; +import java.awt.Paint; +import java.awt.Stroke; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.log4j.Logger; + +import org.jfree.chart.ChartFactory; +import org.jfree.chart.JFreeChart; +import org.jfree.chart.LegendItemCollection; + +import org.jfree.chart.annotations.XYTextAnnotation; + +import org.jfree.chart.axis.ValueAxis; + +import org.jfree.chart.plot.Marker; +import org.jfree.chart.plot.XYPlot; + +import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; + +import org.jfree.data.Range; + +import org.jfree.data.general.Series; + +import org.jfree.data.time.Day; +import org.jfree.data.time.TimeSeries; +import org.jfree.data.time.TimeSeriesCollection; + +import org.jfree.data.xy.XYDataset; + +import org.jfree.ui.Layer; + +import org.json.JSONArray; +import org.json.JSONException; + +import org.w3c.dom.Document; + /** * @author Ingo Weinzierl */ diff -r 9c147bbffc36 -r 5888c4685701 flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Thu Jun 21 15:18:46 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Thu Jun 21 15:23:26 2012 +0000 @@ -1,49 +1,49 @@ package de.intevation.flys.exports.fixings; -import java.util.Date; +import de.intevation.artifactdatabase.state.ArtifactAndFacet; +import de.intevation.artifacts.ArtifactNamespaceContext; +import de.intevation.artifacts.CallContext; + +import de.intevation.artifacts.common.utils.XMLUtils; + +import de.intevation.flys.artifacts.FLYSArtifact; + +import de.intevation.flys.artifacts.model.FacetTypes; + +import de.intevation.flys.artifacts.model.fixings.DateRange; +import de.intevation.flys.artifacts.model.fixings.QWD; + +import de.intevation.flys.exports.TimeseriesChartGenerator; + +import de.intevation.flys.jfree.StyledTimeSeries; + +import de.intevation.flys.utils.FLYSUtils; + +import java.awt.BasicStroke; import java.awt.Color; -import java.awt.BasicStroke; -import org.w3c.dom.Element; -import org.w3c.dom.Document; +import java.io.OutputStream; + +import javax.xml.xpath.XPathConstants; import org.apache.log4j.Logger; import org.jfree.chart.JFreeChart; + +import org.jfree.chart.plot.IntervalMarker; +import org.jfree.chart.plot.ValueMarker; + import org.jfree.chart.title.TextTitle; -import org.jfree.data.general.SeriesException; import org.jfree.data.time.Day; import org.jfree.data.time.Month; import org.jfree.data.time.RegularTimePeriod; import org.jfree.data.time.TimeSeries; import org.jfree.data.time.TimeSeriesCollection; -import org.jfree.chart.plot.Marker; -import org.jfree.chart.plot.ValueMarker; -import org.jfree.chart.plot.IntervalMarker; - -import java.io.OutputStream; - -import javax.xml.xpath.XPathConstants; - -import de.intevation.artifacts.ArtifactNamespaceContext; -import de.intevation.artifacts.common.utils.XMLUtils; -import de.intevation.artifacts.CallContext; - -import de.intevation.artifactdatabase.state.ArtifactAndFacet; - -import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.model.FacetTypes; -import de.intevation.flys.artifacts.model.HistoricalWQTimerange; -import de.intevation.flys.artifacts.model.Timerange; -import de.intevation.flys.artifacts.model.WQTimerange; -import de.intevation.flys.jfree.StyledTimeSeries; -import de.intevation.flys.utils.FLYSUtils; -import de.intevation.flys.exports.TimeseriesChartGenerator; -import de.intevation.flys.artifacts.model.fixings.QWD; -import de.intevation.flys.artifacts.model.fixings.DateRange; +import org.w3c.dom.Document; +import org.w3c.dom.Element; /** * @author Raimund Renkert