--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java	Mon Jan 04 13:42:49 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java	Mon Jan 04 15:20:14 2010 +0000
@@ -42,7 +42,9 @@
  * @see
  * @since 06.12.2007 18:02:27
  */
-public class TimeseriesStatistics implements Statistics {
+public class TimeseriesStatistics 
+extends      AbstractStatistics
+{
 
     /**
      * Default Logging instance
@@ -53,21 +55,27 @@
      * Constructor
      */
     public TimeseriesStatistics() {
-        super();
     }
 
     /**
      * @see de.intevation.gnv.statistics.Statistics#calculateStatistics(java.util.Collection, java.util.Collection, java.util.Collection, java.util.Collection)
      */
     public Collection<StatisticSet> calculateStatistics(
-        Collection<Result>              resultSet,
+        Object                          result,
         Collection<KeyValueDescibeData> parameters,
         Collection<KeyValueDescibeData> measurements,
         Collection<KeyValueDescibeData> dates
     )
     throws StatisticsException {
 
+        if (!(result instanceof Collection)) {
+            return new ArrayList<StatisticSet>();
+        }
+
+        Collection<Result> resultSet = (Collection<Result>)result;
+
         clearStatistics();
+
         DescriptiveStatistics lStatistics = null;
         SimpleRegression lRegression = null;
         Collection<StatisticSet> statisticSets = new ArrayList<StatisticSet>();
@@ -224,52 +232,4 @@
         return new Double((row.getDate("XORDINATE")).getTime() / 1000 / 3600);
     }
 
-    /**
-     * @param lStatistics
-     * @param lRegression
-     * @param lStats
-     * @param lSeries
-     */
-    private StatisticSet generateStatisticsValues(DescriptiveStatistics lStatistics,
-                                     SimpleRegression lRegression, String  statisticName) {
-        
-        StatisticSet statisticSet = new StatisticSet(statisticName);
-        
-        statisticSet.addStatistic(new Statistic(
-                "gnviewer.statistics.descriptive.arithmeticMean", lStatistics
-                        .getMean()));
-        statisticSet.addStatistic(new Statistic(
-                "gnviewer.statistics.descriptive.kurtosis", lStatistics
-                        .getKurtosis()));
-        statisticSet.addStatistic(new Statistic("gnviewer.statistics.descriptive.max",
-                lStatistics.getMax()));
-        statisticSet.addStatistic(new Statistic("gnviewer.statistics.descriptive.min",
-                lStatistics.getMin()));
-        statisticSet.addStatistic(new Statistic("gnviewer.statistics.descriptive.n",
-                lStatistics.getN()));
-        statisticSet.addStatistic(new Statistic(
-                "gnviewer.statistics.descriptive.percentile.90", lStatistics
-                        .getPercentile(90)));
-        statisticSet.addStatistic(new Statistic(
-                "gnviewer.statistics.descriptive.percentile.75", lStatistics
-                        .getPercentile(75)));
-        statisticSet.addStatistic(new Statistic(
-                "gnviewer.statistics.descriptive.percentile.50", lStatistics
-                        .getPercentile(50)));
-        statisticSet.addStatistic(new Statistic(
-                "gnviewer.statistics.descriptive.percentile.10", lStatistics
-                        .getPercentile(10)));
-        statisticSet.addStatistic(new Statistic(
-                "gnviewer.statistics.descriptive.deviation", lStatistics
-                        .getStandardDeviation()));
-        statisticSet.addStatistic(new Statistic(
-                "gnviewer.statistics.descriptive.variance", lStatistics
-                        .getVariance()));
-        statisticSet.addStatistic(new Statistic(
-                "gnviewer.statistics.descriptive.intercept", lRegression
-                        .getIntercept()));
-        statisticSet.addStatistic(new Statistic("gnviewer.statistics.descriptive.slope",
-                lRegression.getSlope()));
-        return statisticSet;
-    }
 }