diff flys-artifacts/src/main/java/de/intevation/flys/exports/ChartHelper.java @ 2587:bece6f604899

Removed references to Range and replaced those with references to Bounds in ChartGenerators. flys-artifacts/trunk@4143 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Thu, 15 Mar 2012 10:30:03 +0000
parents 02ac373b6d69
children 638b1da85450
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartHelper.java	Wed Mar 14 15:12:45 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartHelper.java	Thu Mar 15 10:30:03 2012 +0000
@@ -2,6 +2,7 @@
 
 import org.jfree.data.Range;
 import org.jfree.data.xy.XYDataset;
+import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.data.time.RegularTimePeriod;
 import org.jfree.data.time.TimeSeriesCollection;
 import org.jfree.data.time.TimeSeries;
@@ -29,7 +30,7 @@
      *
      * @return an array with x and y ranges.
      */
-    public static Range[] getRanges(XYDataset dataset) {
+    public static Bounds[] getBounds(XYSeriesCollection dataset) {
         int seriesCount = dataset != null ? dataset.getSeriesCount() : 0;
 
         if (seriesCount == 0) {
@@ -75,11 +76,27 @@
         }
 
         return foundValue
-            ? new Range[] { new Range(minX, maxX), new Range(minY, maxY) }
+            ? new Bounds[] {
+                    new DoubleBounds(minX, maxX),
+                    new DoubleBounds(minY, maxY) }
             : null;
     }
 
 
+    public static Bounds[] getBounds(XYDataset dataset) {
+        if (dataset instanceof XYSeriesCollection) {
+            return getBounds((XYSeriesCollection) dataset);
+        }
+        else if(dataset instanceof TimeSeriesCollection) {
+            return getBounds((TimeSeriesCollection) dataset);
+        }
+        else {
+            logger.warn("Unknown XYDataset instance: " + dataset.getClass());
+            return null;
+        }
+    }
+
+
     public static Bounds[] getBounds(TimeSeriesCollection collection) {
         int seriesCount = collection != null ? collection.getSeriesCount() : 0;
 

http://dive4elements.wald.intevation.org