Mercurial > dive4elements > river
changeset 7088:41567bf1e131 generator-refactoring
Removed obsolete imports.
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -13,7 +13,6 @@ import java.io.IOException; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.apache.log4j.Logger;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/AbstractExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/AbstractExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -15,7 +15,6 @@ import java.text.NumberFormat; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.apache.log4j.Logger;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java Sun Sep 22 21:29:35 2013 +0200 @@ -68,8 +68,6 @@ import org.dive4elements.river.model.River; -import org.dive4elements.river.themes.LineStyle; -import org.dive4elements.river.themes.TextStyle; import org.dive4elements.river.themes.ThemeDocument; import org.dive4elements.river.utils.Formatter; @@ -95,7 +93,6 @@ import org.jfree.data.xy.XYDataset; import org.jfree.ui.RectangleInsets; -import org.jfree.ui.TextAnchor; import org.w3c.dom.Document; import org.w3c.dom.Element;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartInfoGenerator.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartInfoGenerator.java Sun Sep 22 21:29:35 2013 +0200 @@ -23,7 +23,6 @@ import java.awt.image.BufferedImage; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.apache.log4j.Logger;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ComputedDischargeCurveExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ComputedDischargeCurveExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -19,8 +19,6 @@ import java.text.DateFormat; import java.util.Locale; -import org.w3c.dom.Document; - import org.apache.log4j.Logger; import au.com.bytecode.opencsv.CSVWriter; @@ -32,7 +30,6 @@ import org.dive4elements.artifacts.common.utils.Config; -import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.river.artifacts.D4EArtifact;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Sun Sep 22 21:29:35 2013 +0200 @@ -42,7 +42,6 @@ import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.river.artifacts.D4EArtifact; -import org.dive4elements.river.artifacts.model.WKms; import org.dive4elements.river.exports.process.Processor; import org.dive4elements.river.jfree.AxisDataset; import org.dive4elements.river.jfree.AnnotationHelper; @@ -53,7 +52,6 @@ import org.dive4elements.river.jfree.StyledAreaSeriesCollection; import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.utils.DataUtil; import org.w3c.dom.Element;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DurationCurveExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DurationCurveExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -18,8 +18,6 @@ import java.text.DateFormat; import java.util.Locale; -import org.w3c.dom.Document; - import org.apache.log4j.Logger; import au.com.bytecode.opencsv.CSVWriter; @@ -29,7 +27,6 @@ import net.sf.jasperreports.engine.JasperPrint; import net.sf.jasperreports.engine.JRException; -import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.artifacts.common.utils.Config;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/FlowVelocityExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/FlowVelocityExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -13,14 +13,10 @@ import java.util.ArrayList; import java.util.List; -import org.w3c.dom.Document; - import org.apache.log4j.Logger; import au.com.bytecode.opencsv.CSVWriter; -import org.dive4elements.artifacts.CallContext; - import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.model.CalculationResult; import org.dive4elements.river.artifacts.model.FlowVelocityData;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeCurveExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeCurveExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -18,8 +18,6 @@ import java.util.HashMap; import java.util.Locale; -import org.w3c.dom.Document; - import org.apache.log4j.Logger; import au.com.bytecode.opencsv.CSVWriter; @@ -31,7 +29,6 @@ import org.dive4elements.artifacts.common.utils.Config; -import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.river.artifacts.D4EArtifact;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java Sun Sep 22 21:29:35 2013 +0200 @@ -25,11 +25,9 @@ import org.dive4elements.river.exports.process.WOutProcessor; import org.dive4elements.river.exports.process.AnnotationProcessor; -import org.dive4elements.river.jfree.RiverAnnotation; import org.dive4elements.river.jfree.StyledAreaSeriesCollection; import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.utils.DataUtil; import org.dive4elements.river.utils.RiverUtils; import org.apache.log4j.Logger; import org.jfree.chart.axis.NumberAxis;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -13,14 +13,10 @@ import java.util.ArrayList; import java.util.List; -import org.w3c.dom.Document; - import org.apache.log4j.Logger; import au.com.bytecode.opencsv.CSVWriter; -import org.dive4elements.artifacts.CallContext; - import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.model.CalculationResult; import org.dive4elements.river.artifacts.model.MiddleBedHeightData;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/OutGenerator.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/OutGenerator.java Sun Sep 22 21:29:35 2013 +0200 @@ -12,7 +12,6 @@ import java.io.OutputStream; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifactdatabase.state.Settings;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ReferenceCurveExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ReferenceCurveExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -10,7 +10,6 @@ import au.com.bytecode.opencsv.CSVWriter; -import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.artifacts.common.utils.Config; @@ -46,8 +45,6 @@ import org.apache.log4j.Logger; -import org.w3c.dom.Document; - /** * (CSV)Exporter for Reference Curves. */
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ReportGenerator.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ReportGenerator.java Sun Sep 22 21:29:35 2013 +0200 @@ -27,7 +27,6 @@ import org.dive4elements.river.themes.ThemeDocument; import org.w3c.dom.Document; -import org.w3c.dom.Element; public class ReportGenerator implements OutGenerator
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ShapeExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ShapeExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -16,7 +16,6 @@ import org.dive4elements.river.collections.D4EArtifactCollection; import org.dive4elements.river.themes.ThemeDocument; import org.w3c.dom.Document; -import org.w3c.dom.Element; public class ShapeExporter implements OutGenerator
--- a/artifacts/src/main/java/org/dive4elements/river/exports/WDifferencesExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/WDifferencesExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -19,8 +19,6 @@ import java.text.DateFormat; import java.util.Locale; -import org.w3c.dom.Document; - import org.apache.log4j.Logger; import au.com.bytecode.opencsv.CSVWriter; @@ -30,7 +28,6 @@ import net.sf.jasperreports.engine.JasperPrint; import net.sf.jasperreports.engine.JRException; -import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.artifacts.common.utils.Config;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -21,8 +21,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.w3c.dom.Document; - import org.apache.log4j.Logger; import au.com.bytecode.opencsv.CSVWriter; @@ -35,7 +33,6 @@ import net.sf.jasperreports.engine.JRException; import org.dive4elements.artifacts.Artifact; -import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.artifacts.common.utils.Config;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/DeltaWtExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/DeltaWtExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -10,7 +10,6 @@ import au.com.bytecode.opencsv.CSVWriter; -import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.river.artifacts.model.CalculationResult; @@ -39,8 +38,6 @@ import org.apache.log4j.Logger; -import org.w3c.dom.Document; - /** Exports fixation analysis deltaw(t) computation results to csv. */ public class DeltaWtExporter extends AbstractExporter
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixLongitudinalSectionGenerator.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixLongitudinalSectionGenerator.java Sun Sep 22 21:29:35 2013 +0200 @@ -15,7 +15,6 @@ import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.artifacts.model.WKms; import org.dive4elements.river.artifacts.model.WQKms; import org.dive4elements.river.artifacts.model.fixings.AnalysisPeriod; import org.dive4elements.river.artifacts.model.fixings.QWD; @@ -28,7 +27,6 @@ import org.dive4elements.river.jfree.StyledAreaSeriesCollection; import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.utils.DataUtil; import org.dive4elements.river.utils.KMIndex; import org.dive4elements.river.utils.RiverUtils; import org.jfree.chart.plot.Marker;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/ParametersExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/ParametersExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -10,8 +10,6 @@ import au.com.bytecode.opencsv.CSVWriter; -import org.dive4elements.artifacts.CallContext; - import org.dive4elements.river.artifacts.model.CalculationResult; import org.dive4elements.river.artifacts.model.Parameters; @@ -31,8 +29,6 @@ import org.apache.log4j.Logger; -import org.w3c.dom.Document; - public class ParametersExporter extends AbstractExporter {
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceEpochGenerator.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceEpochGenerator.java Sun Sep 22 21:29:35 2013 +0200 @@ -28,7 +28,6 @@ import org.dive4elements.river.jfree.RiverAnnotation; import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.utils.DataUtil; import org.dive4elements.river.utils.RiverUtils;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -27,7 +27,6 @@ import net.sf.jasperreports.engine.JasperPrint; import net.sf.jasperreports.engine.JRException; -import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.access.BedDifferencesAccess; @@ -40,11 +39,8 @@ import org.dive4elements.river.utils.Formatter; import org.dive4elements.river.utils.RiverUtils; -import org.w3c.dom.Document; - import au.com.bytecode.opencsv.CSVWriter; - public class BedDifferenceExporter extends AbstractExporter {
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java Sun Sep 22 21:29:35 2013 +0200 @@ -28,7 +28,6 @@ import org.dive4elements.river.jfree.RiverAnnotation; import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.utils.DataUtil; import org.dive4elements.river.utils.RiverUtils;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -19,10 +19,8 @@ import java.util.List; import org.apache.log4j.Logger; -import org.w3c.dom.Document; import au.com.bytecode.opencsv.CSVWriter; -import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.model.CalculationResult; import org.dive4elements.river.artifacts.model.minfo.BedDiameterResult; import org.dive4elements.river.artifacts.model.minfo.BedParametersResult;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -17,12 +17,8 @@ import java.text.NumberFormat; -import org.w3c.dom.Document; - import org.apache.log4j.Logger; -import org.dive4elements.artifacts.CallContext; - import org.dive4elements.river.artifacts.model.CalculationResult; import org.dive4elements.river.artifacts.model.minfo.SedimentLoad; import org.dive4elements.river.artifacts.model.minfo.SedimentLoadFraction;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadLSGenerator.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadLSGenerator.java Sun Sep 22 21:29:35 2013 +0200 @@ -33,7 +33,6 @@ import org.dive4elements.river.jfree.RiverAnnotation; import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.utils.DataUtil; /** Generator for Longitudinal Sections of SedimentLoad-Calculations. */
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/AnnotationProcessor.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/AnnotationProcessor.java Sun Sep 22 21:29:35 2013 +0200 @@ -9,7 +9,6 @@ package org.dive4elements.river.exports.process; import org.apache.log4j.Logger; -import org.jfree.data.xy.XYSeries; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/Processor.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/Processor.java Sun Sep 22 21:29:35 2013 +0200 @@ -12,8 +12,6 @@ import org.dive4elements.river.exports.XYChartGenerator; import org.dive4elements.river.themes.ThemeDocument; import org.dive4elements.river.exports.DiagramGenerator; -import org.dive4elements.river.artifacts.D4EArtifact; -import org.dive4elements.artifacts.CallContext; /** * A processor is intended to generate an output e.g. curve in a chart diagramm from
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/QOutProcessor.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/QOutProcessor.java Sun Sep 22 21:29:35 2013 +0200 @@ -14,7 +14,6 @@ import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.artifacts.model.WKms; import org.dive4elements.river.artifacts.model.WQKms; import org.dive4elements.river.exports.StyledSeriesBuilder; @@ -22,7 +21,6 @@ import org.dive4elements.river.exports.DiagramGenerator; import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.utils.DataUtil; /** * Add data to chart/generator.
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/WOutProcessor.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/WOutProcessor.java Sun Sep 22 21:29:35 2013 +0200 @@ -22,7 +22,6 @@ import org.dive4elements.river.jfree.StyledAreaSeriesCollection; import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.utils.DataUtil; import org.dive4elements.river.utils.RiverUtils; /**
--- a/artifacts/src/main/java/org/dive4elements/river/exports/sq/SQRelationExporter.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/sq/SQRelationExporter.java Sun Sep 22 21:29:35 2013 +0200 @@ -18,8 +18,6 @@ import java.text.DateFormat; import java.text.NumberFormat; -import org.w3c.dom.Document; - import net.sf.jasperreports.engine.JasperExportManager; import net.sf.jasperreports.engine.JasperFillManager; import net.sf.jasperreports.engine.JasperPrint; @@ -27,7 +25,6 @@ import au.com.bytecode.opencsv.CSVWriter; -import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.river.artifacts.model.CalculationResult;
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/AnnotationHelper.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/AnnotationHelper.java Sun Sep 22 21:29:35 2013 +0200 @@ -7,10 +7,8 @@ */ package org.dive4elements.river.jfree; -import org.dive4elements.river.artifacts.model.HYKFactory; import org.dive4elements.river.themes.ThemeDocument; -import java.util.Collections; import java.util.List; import java.util.Map;
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/AxisDataset.java Sun Sep 22 21:05:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/AxisDataset.java Sun Sep 22 21:29:35 2013 +0200 @@ -10,7 +10,6 @@ import java.util.List; import java.util.ArrayList; -import java.lang.Math; import org.jfree.data.Range; import org.jfree.data.RangeInfo;