changeset 256:008709f79611

Removed Statisticsupport for VerticalCrossSection and HorizontalCrossSection according to Requirement TG_0030.061 gnv-artifacts/trunk@332 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Fri, 13 Nov 2009 09:57:25 +0000 (2009-11-13)
parents 5403452c06fc
children b198ca47f363
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml gnv-artifacts/src/main/java/de/intevation/gnv/statistics/HorizontalCrossSectionStatistics.java gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputTransition.java gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java gnv-artifacts/src/test/ressources/horizontalcrosssection_mesh/horizontalcrosssection_step_06_out_statistics.xml gnv-artifacts/src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_08_out_statistics.xml
diffstat 8 files changed, 28 insertions(+), 74 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Thu Nov 12 14:47:20 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Fri Nov 13 09:57:25 2009 +0000
@@ -1,3 +1,21 @@
+2009-11-13  Tim Englich  <tim.englich@intevation.de>
+
+	* doc/conf/products/verticalcrosssection/conf_mesh.xml,
+	  doc/conf/products/horizontalcrosssection/conf_mesh.xml:
+	  Removed statistics as possible out-Variant from Configuration
+	  according to TG_0030.061
+	
+	* src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_08_out_statistics.xml, 
+	  src/test/ressources/horizontalcrosssection_mesh/horizontalcrosssection_step_06_out_statistics.xml, 
+	  src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java (testHorizontalCrossSectionMeshArtifact), 
+	  (testVerticalCrossSectionMeshArtifact): 
+	  Removed Statistics-Test on This Artifact-Test because no Statistic is required
+	  for this Producttyp.
+	* src/main/java/de/intevation/gnv/transition/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputTransition.java (createCSV): 
+	  No Statistics for this Output is required.
+	* src/main/java/de/intevation/gnv/statistics/HorizontalCrossSectionStatistics.java: 
+	  Removed becaus the Statistics for ths product is not required.
+
 2009-11-12  Tim Englich  <tim.englich@intevation.de>
 
 	* src/main/java/de/intevation/gnv/statistics/HorizontalCrossSectionStatistics.java (calculateXOrdinateValue), 
--- a/gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml	Thu Nov 12 14:47:20 2009 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml	Fri Nov 13 09:57:25 2009 +0000
@@ -122,7 +122,6 @@
                 </outputsMode>
                 <outputsMode name="csv" description="CSV-Export der Daten" mime-type="text/plain"/>
                 <outputsMode name="odv" description="ODV-Export der Daten" mime-type="text/plain"/>
-                <outputsMode name="statistics" description="Statistik zu den Daten" mime-type="text/xml"/>
             </outputsModes>
         </transition>
         
--- a/gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml	Thu Nov 12 14:47:20 2009 +0000
+++ b/gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml	Fri Nov 13 09:57:25 2009 +0000
@@ -148,7 +148,6 @@
                      </parameters>
                  </outputsMode>
                  <outputsMode name="csv" description="CSV-Export der Daten" mime-type="text/plain"/>
-                 <outputsMode name="statistics" description="Statistik zu den Daten" mime-type="text/xml"/>
              </outputsModes>
          </transition>
      </transitions>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/HorizontalCrossSectionStatistics.java	Thu Nov 12 14:47:20 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/**
- *
- */
-package de.intevation.gnv.statistics;
-
-import java.sql.SQLException;
-
-import de.intevation.gnv.geobackend.base.Result;
-
-/**
- * @author Tim Englich <tim.englich@intevation.de>
- * 
- */
-public class HorizontalCrossSectionStatistics extends TimeseriesStatistics {
-
-    /**
-     * Constructor
-     */
-    public HorizontalCrossSectionStatistics() {
-        super();
-    }
-
-    @Override
-    protected double calculateXOrdinateValue(Result previousRow,Result row) throws SQLException {
-        return 0; // TODO: Select propper Value
-    }
-}
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputTransition.java	Thu Nov 12 14:47:20 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputTransition.java	Fri Nov 13 09:57:25 2009 +0000
@@ -18,7 +18,6 @@
 import de.intevation.gnv.chart.HorizontalCrossSectionChartFactory;
 import de.intevation.gnv.chart.exception.TechnicalChartException;
 import de.intevation.gnv.geobackend.base.Result;
-import de.intevation.gnv.statistics.HorizontalCrossSectionStatistics;
 import de.intevation.gnv.statistics.Statistics;
 import de.intevation.gnv.transition.describedata.KeyValueDescibeData;
 import de.intevation.gnv.transition.exception.TransitionException;
@@ -73,7 +72,7 @@
      */
     @Override
     protected Statistics getStatisticsGenerator() {
-        return new HorizontalCrossSectionStatistics();
+        return null; //Statistiken werden nicht f�r diesen Out-Typ unterst�tzt.
     }
     
     /**
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java	Thu Nov 12 14:47:20 2009 +0000
+++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java	Fri Nov 13 09:57:25 2009 +0000
@@ -768,19 +768,16 @@
             FileOutputStream fos = null;
             FileOutputStream fos2 = null;
             FileOutputStream fos3 = null;
-            FileOutputStream fos4 = null;
             try {
                 fos = new FileOutputStream(
                         "src/test/results/horizontalcrosssection_mesh"
                                 + System.currentTimeMillis() + ".png");
+                
                 fos2 = new FileOutputStream(
                         "src/test/results/horizontalcrosssection_mesh"
-                                + System.currentTimeMillis() + ".xml");
+                                + System.currentTimeMillis() + ".csv");
                 fos3 = new FileOutputStream(
                         "src/test/results/horizontalcrosssection_mesh"
-                                + System.currentTimeMillis() + ".csv");
-                fos4 = new FileOutputStream(
-                        "src/test/results/horizontalcrosssection_mesh"
                                 + System.currentTimeMillis() + ".odv");
                 artifact.feed(this.readDocument("src/test/ressources/" +
                                                 "horizontalcrosssection_mesh/" +
@@ -788,20 +785,16 @@
                               cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "horizontalcrosssection_mesh/" +
-                                               "horizontalcrosssection_step_06_out_statistics.xml"),
-                              fos2, cc);
-                artifact.out(this.readDocument("src/test/ressources/" +
-                                               "horizontalcrosssection_mesh/" +
                                                "horizontalcrosssection_step_06_out_chart.xml"),
                               fos, cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "horizontalcrosssection_mesh/" +
                                                "horizontalcrosssection_step_06_out_csv.xml"),
-                             fos3,cc);
+                             fos2,cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "horizontalcrosssection_mesh/" +
                                                "horizontalcrosssection_step_06_out_odv.xml"),
-                              fos4,cc);
+                              fos3,cc);
             } catch (Exception e) {
                 log.error(e, e);
                 fail();
@@ -858,40 +851,33 @@
             FileOutputStream fos = null;
             FileOutputStream fos2 = null;
             FileOutputStream fos3 = null;
-            FileOutputStream fos4 = null;
             try {
                 fos = new FileOutputStream(
                         "src/test/results/verticalcrosssection_mesh"
                                 + System.currentTimeMillis() + ".png");
+                
                 fos2 = new FileOutputStream(
                         "src/test/results/verticalcrosssection_mesh"
-                                + System.currentTimeMillis() + ".xml");
+                                + System.currentTimeMillis() + ".csv");
                 fos3 = new FileOutputStream(
                         "src/test/results/verticalcrosssection_mesh"
-                                + System.currentTimeMillis() + ".csv");
-                fos4 = new FileOutputStream(
-                        "src/test/results/verticalcrosssection_mesh"
                                 + System.currentTimeMillis() + ".odv");
                 artifact.feed(this.readDocument("src/test/ressources/" +
                                                 "verticalcrosssection_mesh/" +
                                                 "verticalcrosssection_step_08_feed.xml"),
                               cc);
-                artifact.out(this.readDocument("src/test/ressources/" +
-                                               "verticalcrosssection_mesh/" +
-                                               "verticalcrosssection_step_08_out_statistics.xml"),
-                             fos2, cc);
-                artifact.out(this.readDocument("src/test/ressources/" +
+               artifact.out(this.readDocument("src/test/ressources/" +
                                                "verticalcrosssection_mesh/" +
                                                "verticalcrosssection_step_08_out_chart.xml"),
                              fos, cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "verticalcrosssection_mesh/" +
                                                "verticalcrosssection_step_08_out_csv.xml"),
-                             fos3,cc);
+                             fos2,cc);
                 artifact.out(this.readDocument("src/test/ressources/" +
                                                "verticalcrosssection_mesh/" +
                                                "verticalcrosssection_step_08_out_odv.xml"),
-                             fos4,cc);
+                             fos3,cc);
                 
             } catch (Exception e) {
                 log.error(e, e);
--- a/gnv-artifacts/src/test/ressources/horizontalcrosssection_mesh/horizontalcrosssection_step_06_out_statistics.xml	Thu Nov 12 14:47:20 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
-	<art:type name="out" />
-    <art:uuid value="74baff94-b172-4667-b6d8-db21abeb1b81" />
-    <art:hash value="6292125" />
-	<art:out name="statistics">
-		<art:out value="text/xml" />
-		<art:params />
-	</art:out>
-</art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_step_08_out_statistics.xml	Thu Nov 12 14:47:20 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
-	<art:type name="out" />
-	<art:uuid value="07807bb4-572b-4a46-a71d-7c1c8c9ab50c" />
-	<art:hash value="2969645" />
-	<art:out name="statistics">
-		<art:out value="text/xml" />
-		<art:params />
-	</art:out>
-</art:action>
\ No newline at end of file

http://dive4elements.wald.intevation.org