Mercurial > dive4elements > river

changeset 3257:2aca387333d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed superfluous imports. flys-artifacts/trunk@4893 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Sun, 08 Jul 2012 07:56:46 +0000
parents 17ca0a43027a
children 3c006a53e551
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/exports/ChartArea.java flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java
diffstat 4 files changed, 130 insertions(+), 157 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Sat Jul 07 09:23:33 2012 +0000
+++ b/flys-artifacts/ChangeLog	Sun Jul 08 07:56:46 2012 +0000
@@ -1,3 +1,10 @@
+2012-07-07	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/exports/XYChartGenerator.java,
+	  src/main/java/de/intevation/flys/exports/ChartArea.java,
+	  src/main/java/de/intevation/flys/exports/ChartGenerator.java:
+	  Removed superfluous imports.
+
 2012-07-07	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/jfree/StyledDomainMarker.java,
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartArea.java	Sat Jul 07 09:23:33 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartArea.java	Sun Jul 08 07:56:46 2012 +0000
@@ -1,108 +1,56 @@
 package de.intevation.flys.exports;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Paint;
-import java.awt.Stroke;
-
-import java.text.NumberFormat;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.Document;
-
-import org.apache.log4j.Logger;
-
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.LegendItem;
-import org.jfree.chart.LegendItemCollection;
-import org.jfree.chart.annotations.XYBoxAnnotation;
-import org.jfree.chart.annotations.XYLineAnnotation;
-import org.jfree.chart.annotations.XYTextAnnotation;
-import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.plot.Marker;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.data.Range;
-import org.jfree.data.general.Series;
-import org.jfree.data.xy.XYSeries;
-import org.jfree.data.xy.XYSeriesCollection;
-import org.jfree.data.xy.XYDataset;
-
-import org.jfree.ui.TextAnchor;
-
-import de.intevation.artifactdatabase.state.ArtifactAndFacet;
-import de.intevation.artifactdatabase.state.Facet;
-
-import de.intevation.flys.jfree.Bounds;
-import de.intevation.flys.jfree.DoubleBounds;
-import de.intevation.flys.jfree.FLYSAnnotation;
-import de.intevation.flys.jfree.StickyAxisAnnotation;
-import de.intevation.flys.jfree.CollisionFreeXYTextAnnotation;
-import de.intevation.flys.jfree.StyledAreaSeriesCollection;
-import de.intevation.flys.jfree.StyledXYSeries;
-
-import de.intevation.flys.themes.ThemeAccess;
-import de.intevation.flys.utils.ThemeUtil;
-
-import de.intevation.flys.artifacts.model.HYKFactory;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-
-    /** Two Ranges that span a rectangular area. */
-    public class ChartArea {
-        protected Range xRange;
-        protected Range yRange;
-
-        public ChartArea(Range rangeX, Range rangeY) {
-            this.xRange = rangeX;
-            this.yRange = rangeY;
-        }
-
-        public ChartArea(ValueAxis axisX, ValueAxis axisY) {
-            this.xRange = axisX.getRange();
-            this.yRange = axisY.getRange();
-        }
-
-        public double ofLeft(double percent) {
-            return xRange.getLowerBound()
-                + xRange.getLength() * percent;
-        }
+import org.jfree.data.Range;
 
-        public double ofRight(double percent) {
-            return xRange.getUpperBound()
-                - xRange.getLength() * percent;
-        }
-
-        public double ofGround(double percent) {
-            return yRange.getLowerBound()
-                + yRange.getLength() * percent;
-        }
-
-        public double atTop() {
-            return yRange.getUpperBound();
-        }
+/** Two Ranges that span a rectangular area. */
+public class ChartArea {
+    protected Range xRange;
+    protected Range yRange;
 
-        public double atGround() {
-            return yRange.getLowerBound();
-        }
-
-        public double atRight() {
-            return xRange.getUpperBound();
-        }
+    public ChartArea(Range rangeX, Range rangeY) {
+        this.xRange = rangeX;
+        this.yRange = rangeY;
+    }
 
-        public double atLeft() {
-            return xRange.getLowerBound();
-        }
+    public ChartArea(ValueAxis axisX, ValueAxis axisY) {
+        this.xRange = axisX.getRange();
+        this.yRange = axisY.getRange();
+    }
 
-        public double above(double percent, double base) {
-            return base + yRange.getLength() * percent;
-        }
+    public double ofLeft(double percent) {
+        return xRange.getLowerBound()
+            + xRange.getLength() * percent;
     }
+
+    public double ofRight(double percent) {
+        return xRange.getUpperBound()
+            - xRange.getLength() * percent;
+    }
+
+    public double ofGround(double percent) {
+        return yRange.getLowerBound()
+            + yRange.getLength() * percent;
+    }
+
+    public double atTop() {
+        return yRange.getUpperBound();
+    }
+
+    public double atGround() {
+        return yRange.getLowerBound();
+    }
+
+    public double atRight() {
+        return xRange.getUpperBound();
+    }
+
+    public double atLeft() {
+        return xRange.getLowerBound();
+    }
+
+    public double above(double percent, double base) {
+        return base + yRange.getLength() * percent;
+    }
+}
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Sat Jul 07 09:23:33 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Sun Jul 08 07:56:46 2012 +0000
@@ -1,45 +1,8 @@
 package de.intevation.flys.exports;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Paint;
-import java.awt.Stroke;
-import java.awt.TexturePaint;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.SortedMap;
-
-import javax.xml.xpath.XPathConstants;
-
-import org.apache.log4j.Logger;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.LegendItem;
-import org.jfree.chart.LegendItemCollection;
-import org.jfree.chart.annotations.XYBoxAnnotation;
-import org.jfree.chart.annotations.XYLineAnnotation;
-import org.jfree.chart.annotations.XYTextAnnotation;
-import org.jfree.chart.axis.NumberAxis;
-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.xy.XYDataset;
-import org.jfree.ui.RectangleInsets;
-import org.jfree.ui.TextAnchor;
+import de.intevation.artifactdatabase.state.ArtifactAndFacet;
+import de.intevation.artifactdatabase.state.Facet;
+import de.intevation.artifactdatabase.state.Settings;
 
 import de.intevation.artifacts.Artifact;
 import de.intevation.artifacts.ArtifactNamespaceContext;
@@ -49,12 +12,6 @@
 
 import de.intevation.artifacts.common.utils.XMLUtils;
 
-import de.intevation.artifactdatabase.state.ArtifactAndFacet;
-import de.intevation.artifactdatabase.state.Facet;
-import de.intevation.artifactdatabase.state.Settings;
-
-import de.intevation.flys.model.River;
-
 import de.intevation.flys.artifacts.FLYSArtifact;
 
 import de.intevation.flys.artifacts.resources.Resources;
@@ -66,14 +23,66 @@
 import de.intevation.flys.jfree.FLYSAnnotation;
 import de.intevation.flys.jfree.StableXYDifferenceRenderer;
 import de.intevation.flys.jfree.StickyAxisAnnotation;
+import de.intevation.flys.jfree.Style;
 import de.intevation.flys.jfree.StyledAreaSeriesCollection;
-import de.intevation.flys.jfree.Style;
 import de.intevation.flys.jfree.StyledSeries;
 
+import de.intevation.flys.model.River;
+
 import de.intevation.flys.themes.ThemeAccess;
+
+import de.intevation.flys.utils.FLYSUtils;
 import de.intevation.flys.utils.ThemeUtil;
 
-import de.intevation.flys.utils.FLYSUtils;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Paint;
+import java.awt.Stroke;
+import java.awt.TexturePaint;
+
+import java.awt.geom.Rectangle2D;
+
+import java.awt.image.BufferedImage;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import javax.xml.xpath.XPathConstants;
+
+import org.apache.log4j.Logger;
+
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.LegendItem;
+import org.jfree.chart.LegendItemCollection;
+
+import org.jfree.chart.annotations.XYLineAnnotation;
+import org.jfree.chart.annotations.XYTextAnnotation;
+
+import org.jfree.chart.axis.NumberAxis;
+
+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.xy.XYDataset;
+
+import org.jfree.ui.RectangleInsets;
+import org.jfree.ui.TextAnchor;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 
 /**
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Sat Jul 07 09:23:33 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Sun Jul 08 07:56:46 2012 +0000
@@ -1,42 +1,51 @@
 package de.intevation.flys.exports;
 
+import de.intevation.artifactdatabase.state.ArtifactAndFacet;
+
+import de.intevation.flys.jfree.Bounds;
+import de.intevation.flys.jfree.CollisionFreeXYTextAnnotation;
+import de.intevation.flys.jfree.DoubleBounds;
+import de.intevation.flys.jfree.FLYSAnnotation;
+import de.intevation.flys.jfree.StyledAreaSeriesCollection;
+import de.intevation.flys.jfree.StyledXYSeries;
+
 import java.awt.Color;
 import java.awt.Font;
+
 import java.text.NumberFormat;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
-import org.json.JSONArray;
-import org.json.JSONException;
 
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.LegendItem;
+
 import org.jfree.chart.annotations.XYTextAnnotation;
+
 import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.axis.ValueAxis;
+
 import org.jfree.chart.plot.Marker;
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.XYPlot;
+
 import org.jfree.data.Range;
+
 import org.jfree.data.general.Series;
+
 import org.jfree.data.xy.XYDataset;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
+
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.w3c.dom.Document;
 
-import de.intevation.artifactdatabase.state.ArtifactAndFacet;
-import de.intevation.flys.jfree.Bounds;
-import de.intevation.flys.jfree.CollisionFreeXYTextAnnotation;
-import de.intevation.flys.jfree.DoubleBounds;
-import de.intevation.flys.jfree.FLYSAnnotation;
-import de.intevation.flys.jfree.StyledAreaSeriesCollection;
-import de.intevation.flys.jfree.StyledXYSeries;
+import org.w3c.dom.Document;
 
 
 /**
http://dive4elements.wald.intevation.org