# HG changeset patch # User Sascha L. Teichmann # Date 1271582245 0 # Node ID 05bf8534a35a575109fc261b96c2a58936277772 # Parent 2423cefe7d392b2b211844a86adb62e71e0d21fc Using unix line endings only. gnv-artifacts/trunk@938 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/ChangeLog Sun Apr 18 09:17:25 2010 +0000 @@ -1,3 +1,8 @@ +2010-04-18 Sascha L. Teichmann + + * src/main/java/de/intevation/gnv/**/*.java: + Using unix line endings only. + 2010-04-17 Sascha L. Teichmann * src/main/java/de/intevation/gnv/**/*.java: @@ -39,7 +44,6 @@ Extract ODV-Generation into its own method that it is possible to override it in subclasses. - 2010-04-13 Tim Englich * src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java (getWMS): diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVDefaultArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVDefaultArtifact.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVDefaultArtifact.java Sun Apr 18 09:17:25 2010 +0000 @@ -100,4 +100,4 @@ staticNode.appendChild(selectNode); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java Sun Apr 18 09:17:25 2010 +0000 @@ -193,4 +193,4 @@ } } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/PreSettingArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/PreSettingArtifact.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/PreSettingArtifact.java Sun Apr 18 09:17:25 2010 +0000 @@ -26,4 +26,4 @@ */ void setPreSettings(Map preSettings); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContext.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContext.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContext.java Sun Apr 18 09:17:25 2010 +0000 @@ -105,4 +105,4 @@ log.debug("GNVArtifactContext.Constructor(config)"); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java Sun Apr 18 09:17:25 2010 +0000 @@ -787,4 +787,4 @@ } } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java Sun Apr 18 09:17:25 2010 +0000 @@ -63,4 +63,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/Product.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/Product.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/Product.java Sun Apr 18 09:17:25 2010 +0000 @@ -37,4 +37,4 @@ */ public String getArtifactFactory(); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/RessourceFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/RessourceFactory.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/RessourceFactory.java Sun Apr 18 09:17:25 2010 +0000 @@ -171,4 +171,4 @@ } } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataServiceException.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataServiceException.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataServiceException.java Sun Apr 18 09:17:25 2010 +0000 @@ -45,4 +45,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultFIS.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultFIS.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultFIS.java Sun Apr 18 09:17:25 2010 +0000 @@ -94,4 +94,4 @@ } } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultLayer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultLayer.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultLayer.java Sun Apr 18 09:17:25 2010 +0000 @@ -72,4 +72,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultMapService.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultMapService.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultMapService.java Sun Apr 18 09:17:25 2010 +0000 @@ -62,4 +62,4 @@ return this.url; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultParameter.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultParameter.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultParameter.java Sun Apr 18 09:17:25 2010 +0000 @@ -37,4 +37,4 @@ return this.name; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/FIS.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/FIS.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/FIS.java Sun Apr 18 09:17:25 2010 +0000 @@ -37,4 +37,4 @@ void addParameter(Collection parameter); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Layer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Layer.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Layer.java Sun Apr 18 09:17:25 2010 +0000 @@ -42,4 +42,4 @@ */ String parentID(); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/MapService.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/MapService.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/MapService.java Sun Apr 18 09:17:25 2010 +0000 @@ -44,4 +44,4 @@ Collection getLayer(); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Parameter.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Parameter.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Parameter.java Sun Apr 18 09:17:25 2010 +0000 @@ -24,4 +24,4 @@ String getID(); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/chart/Chart.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/Chart.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/Chart.java Sun Apr 18 09:17:25 2010 +0000 @@ -21,4 +21,4 @@ */ public JFreeChart generateChart(); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/chart/ChartLabels.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/ChartLabels.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/ChartLabels.java Sun Apr 18 09:17:25 2010 +0000 @@ -1,140 +1,140 @@ -/* Copyright (C) 2007 con terra GmbH (http://www.conterra.de) - * All rights reserved - * - * $Id: ChartLabels.java,v 1.1 2007/12/10 13:57:13 drewnak Exp $ - * - * created by: drewnak - * created at : 10.12.2007 - * created at : 11:48:39 - * - * modified by: $Author: drewnak $ - * modified at: $Date: 2007/12/10 13:57:13 $ - */ -package de.intevation.gnv.chart; - -/** - * This class stores some strings used for decorating charts (e.g. title, - * subtitle, etc). - * - * @author drewnak - * @author Tim Englich Changes and codecleanup - * @author Ingo Weinzierl - */ -public class ChartLabels { - /** - * - */ - private String title; - - /** - * - */ - private String subtitle; - - /** - * - */ - private String domainAxisLabel; - - /** - * - */ - private String rangeAxisLabel; - - /** - * - */ - private String parameterName; - - - /** - * Constructor - * - * @param title Title - * @param subtitle Subtitle - * @param domainAxisLabel X-axis label - */ - public ChartLabels(String title, String subtitle, String domainAxisLabel) { - this(title, subtitle, domainAxisLabel, null); - } - - /** - * Constructor - * - * @param title Title - * @param subtitle Subtitle - * @param domainAxisLabel X-axis label - * @param rangeAxisLabel Y-axis label - */ - public ChartLabels( - String title, - String subtitle, - String domainAxisLabel, - String rangeAxisLabel - ) { - this(title, subtitle, domainAxisLabel, rangeAxisLabel, null); - } - - - /** - * Constructor - * - * @param title Title - * @param subtitle Subtitle - * @param domainAxisLabel X-axis label - * @param rangeAxisLabel Y-axis label - * @param parameterName Name of a given parameter in the chart. - */ - public ChartLabels( - String title, - String subtitle, - String domainAxisLabel, - String rangeAxisLabel, - String parameterName - ) { - this.title = title; - this.subtitle = subtitle; - this.domainAxisLabel = domainAxisLabel; - this.rangeAxisLabel = rangeAxisLabel; - this.parameterName = parameterName; - } - - /** - * @return the title - */ - public String getTitle() { - return this.title; - } - - - /** - * @return the subtitle - */ - public String getSubtitle() { - return subtitle; - } - - /** - * @return the timeAxisLabel - */ - public String getDomainAxisLabel() { - return this.domainAxisLabel; - } - - - /** - * @return the y-axis label - */ - public String getRangeAxisLabel() { - return this.rangeAxisLabel; - } - - - /** - * @return the parameter name - */ - public String getParameterName() { - return this.parameterName; - } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : +/* Copyright (C) 2007 con terra GmbH (http://www.conterra.de) + * All rights reserved + * + * $Id: ChartLabels.java,v 1.1 2007/12/10 13:57:13 drewnak Exp $ + * + * created by: drewnak + * created at : 10.12.2007 + * created at : 11:48:39 + * + * modified by: $Author: drewnak $ + * modified at: $Date: 2007/12/10 13:57:13 $ + */ +package de.intevation.gnv.chart; + +/** + * This class stores some strings used for decorating charts (e.g. title, + * subtitle, etc). + * + * @author drewnak + * @author Tim Englich Changes and codecleanup + * @author Ingo Weinzierl + */ +public class ChartLabels { + /** + * + */ + private String title; + + /** + * + */ + private String subtitle; + + /** + * + */ + private String domainAxisLabel; + + /** + * + */ + private String rangeAxisLabel; + + /** + * + */ + private String parameterName; + + + /** + * Constructor + * + * @param title Title + * @param subtitle Subtitle + * @param domainAxisLabel X-axis label + */ + public ChartLabels(String title, String subtitle, String domainAxisLabel) { + this(title, subtitle, domainAxisLabel, null); + } + + /** + * Constructor + * + * @param title Title + * @param subtitle Subtitle + * @param domainAxisLabel X-axis label + * @param rangeAxisLabel Y-axis label + */ + public ChartLabels( + String title, + String subtitle, + String domainAxisLabel, + String rangeAxisLabel + ) { + this(title, subtitle, domainAxisLabel, rangeAxisLabel, null); + } + + + /** + * Constructor + * + * @param title Title + * @param subtitle Subtitle + * @param domainAxisLabel X-axis label + * @param rangeAxisLabel Y-axis label + * @param parameterName Name of a given parameter in the chart. + */ + public ChartLabels( + String title, + String subtitle, + String domainAxisLabel, + String rangeAxisLabel, + String parameterName + ) { + this.title = title; + this.subtitle = subtitle; + this.domainAxisLabel = domainAxisLabel; + this.rangeAxisLabel = rangeAxisLabel; + this.parameterName = parameterName; + } + + /** + * @return the title + */ + public String getTitle() { + return this.title; + } + + + /** + * @return the subtitle + */ + public String getSubtitle() { + return subtitle; + } + + /** + * @return the timeAxisLabel + */ + public String getDomainAxisLabel() { + return this.domainAxisLabel; + } + + + /** + * @return the y-axis label + */ + public String getRangeAxisLabel() { + return this.rangeAxisLabel; + } + + + /** + * @return the parameter name + */ + public String getParameterName() { + return this.parameterName; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/chart/XMLChartTheme.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/XMLChartTheme.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/XMLChartTheme.java Sun Apr 18 09:17:25 2010 +0000 @@ -522,4 +522,4 @@ renderer.setSeriesPaint(0, histogramBasePaint); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/chart/exception/TechnicalChartException.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/exception/TechnicalChartException.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/exception/TechnicalChartException.java Sun Apr 18 09:17:25 2010 +0000 @@ -46,4 +46,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/CompactXYItems.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/CompactXYItems.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/CompactXYItems.java Sun Apr 18 09:17:25 2010 +0000 @@ -196,4 +196,4 @@ return upper; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonDataset.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonDataset.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonDataset.java Sun Apr 18 09:17:25 2010 +0000 @@ -161,4 +161,4 @@ return (PolygonSeries)data.get(idx); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonPlot.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonPlot.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonPlot.java Sun Apr 18 09:17:25 2010 +0000 @@ -494,4 +494,4 @@ return true; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/math/AreaInterpolation.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/AreaInterpolation.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/AreaInterpolation.java Sun Apr 18 09:17:25 2010 +0000 @@ -199,4 +199,4 @@ return true; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/math/ConstantXYDepth.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/ConstantXYDepth.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/ConstantXYDepth.java Sun Apr 18 09:17:25 2010 +0000 @@ -33,4 +33,4 @@ return depth; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation2D.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation2D.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation2D.java Sun Apr 18 09:17:25 2010 +0000 @@ -334,4 +334,4 @@ return m*x + b; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearMetrics.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearMetrics.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearMetrics.java Sun Apr 18 09:17:25 2010 +0000 @@ -70,4 +70,4 @@ return new LinearInterpolator(p1, p2); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/math/QueriedXYDepth.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/QueriedXYDepth.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/QueriedXYDepth.java Sun Apr 18 09:17:25 2010 +0000 @@ -100,4 +100,4 @@ } return null; } -} \ No newline at end of file +} diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/math/XYColumn.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/XYColumn.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/XYColumn.java Sun Apr 18 09:17:25 2010 +0000 @@ -166,4 +166,4 @@ return new SplineInterpolator(); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontalcrosssection/HorizontalCrossSectionMeshArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontalcrosssection/HorizontalCrossSectionMeshArtifact.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontalcrosssection/HorizontalCrossSectionMeshArtifact.java Sun Apr 18 09:17:25 2010 +0000 @@ -61,4 +61,4 @@ super.cleanup(context); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileArtifact.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileArtifact.java Sun Apr 18 09:17:25 2010 +0000 @@ -45,4 +45,4 @@ super.setup(identifier, factory, context, data); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileInstantaneousPointArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileInstantaneousPointArtifact.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileInstantaneousPointArtifact.java Sun Apr 18 09:17:25 2010 +0000 @@ -28,4 +28,4 @@ super.name = super.name + "InstantaneousPoint"; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileMeshArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileMeshArtifact.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileMeshArtifact.java Sun Apr 18 09:17:25 2010 +0000 @@ -27,4 +27,4 @@ super.name = super.name + "Mesh"; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshArtifact.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshArtifact.java Sun Apr 18 09:17:25 2010 +0000 @@ -46,4 +46,4 @@ super.setup(identifier, factory, context, data); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/raster/Raster.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Raster.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Raster.java Sun Apr 18 09:17:25 2010 +0000 @@ -404,4 +404,4 @@ }; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/AutoResumeState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/AutoResumeState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/AutoResumeState.java Sun Apr 18 09:17:25 2010 +0000 @@ -11,4 +11,4 @@ public interface AutoResumeState extends State{ } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java Sun Apr 18 09:17:25 2010 +0000 @@ -172,4 +172,4 @@ } } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java Sun Apr 18 09:17:25 2010 +0000 @@ -38,4 +38,4 @@ return new String[0]; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputData.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputData.java Sun Apr 18 09:17:25 2010 +0000 @@ -162,4 +162,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputValue.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputValue.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputValue.java Sun Apr 18 09:17:25 2010 +0000 @@ -72,4 +72,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultState.java Sun Apr 18 09:17:25 2010 +0000 @@ -20,4 +20,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/InputData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputData.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputData.java Sun Apr 18 09:17:25 2010 +0000 @@ -77,4 +77,4 @@ */ String[] splitValue(); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java Sun Apr 18 09:17:25 2010 +0000 @@ -447,4 +447,4 @@ return extracted; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputMode.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputMode.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputMode.java Sun Apr 18 09:17:25 2010 +0000 @@ -51,4 +51,4 @@ */ public List getExportModes(); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputState.java Sun Apr 18 09:17:25 2010 +0000 @@ -49,4 +49,4 @@ */ public Collection getOutputModes(); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java Sun Apr 18 09:17:25 2010 +0000 @@ -78,4 +78,4 @@ super.setup(configuration); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java Sun Apr 18 09:17:25 2010 +0000 @@ -80,4 +80,4 @@ super.setup(configuration); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/SingleInputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/SingleInputState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/SingleInputState.java Sun Apr 18 09:17:25 2010 +0000 @@ -52,4 +52,4 @@ return describeData; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/State.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/State.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/State.java Sun Apr 18 09:17:25 2010 +0000 @@ -179,4 +179,4 @@ */ public void cleanup(Object context); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Sun Apr 18 09:17:25 2010 +0000 @@ -1022,4 +1022,4 @@ public void cleanup(Object context) { } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/StateFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateFactory.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateFactory.java Sun Apr 18 09:17:25 2010 +0000 @@ -62,4 +62,4 @@ return state; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultKeyValueDescribeData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultKeyValueDescribeData.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultKeyValueDescribeData.java Sun Apr 18 09:17:25 2010 +0000 @@ -64,4 +64,4 @@ return this.state; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultMinMaxDescribeData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultMinMaxDescribeData.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultMinMaxDescribeData.java Sun Apr 18 09:17:25 2010 +0000 @@ -83,4 +83,4 @@ return this.state; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultSingleValueDescribeData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultSingleValueDescribeData.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultSingleValueDescribeData.java Sun Apr 18 09:17:25 2010 +0000 @@ -60,4 +60,4 @@ return this.state; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DescribeData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DescribeData.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DescribeData.java Sun Apr 18 09:17:25 2010 +0000 @@ -11,4 +11,4 @@ public interface DescribeData extends Serializable { } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/KeyValueDescibeData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/KeyValueDescibeData.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/KeyValueDescibeData.java Sun Apr 18 09:17:25 2010 +0000 @@ -47,4 +47,4 @@ */ public void setSelected(boolean selected); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/MinMaxDescribeData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/MinMaxDescribeData.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/MinMaxDescribeData.java Sun Apr 18 09:17:25 2010 +0000 @@ -64,4 +64,4 @@ */ public String getState(); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedArrayList.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedArrayList.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedArrayList.java Sun Apr 18 09:17:25 2010 +0000 @@ -63,4 +63,4 @@ this.multiSelect = multiSelect; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedCollection.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedCollection.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedCollection.java Sun Apr 18 09:17:25 2010 +0000 @@ -35,4 +35,4 @@ */ public void setMultiSelect(boolean multiSelect); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/SingleValueDescribeData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/SingleValueDescribeData.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/SingleValueDescribeData.java Sun Apr 18 09:17:25 2010 +0000 @@ -35,4 +35,4 @@ */ public String getState(); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/exception/StateException.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/exception/StateException.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/exception/StateException.java Sun Apr 18 09:17:25 2010 +0000 @@ -47,4 +47,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Sun Apr 18 09:17:25 2010 +0000 @@ -702,4 +702,4 @@ return returnValue; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java Sun Apr 18 09:17:25 2010 +0000 @@ -443,4 +443,4 @@ } } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileOutputState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileOutputState.java Sun Apr 18 09:17:25 2010 +0000 @@ -396,4 +396,4 @@ return subTitle; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/NorthSouthEastWestState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/NorthSouthEastWestState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/NorthSouthEastWestState.java Sun Apr 18 09:17:25 2010 +0000 @@ -78,4 +78,4 @@ callMeta.getLanguages(), "jposition", "jposition"); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/vertical/VerticalProfileOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/vertical/VerticalProfileOutputState.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/vertical/VerticalProfileOutputState.java Sun Apr 18 09:17:25 2010 +0000 @@ -232,4 +232,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistic.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistic.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistic.java Sun Apr 18 09:17:25 2010 +0000 @@ -1,73 +1,73 @@ -/** - * Title: Statistic, $Header: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/Statistic.java,v 1.2 2007/12/21 12:31:15 blume Exp $ - * Source: $Source: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/Statistic.java,v $ - * created by: Stefan Blume (blume) - * erstellt am: 14.12.2007 - * Copyright: con terra GmbH, 2005 - * - * modified by: $Author: blume $ - * modified on: $Date: 2007/12/21 12:31:15 $ - * Version: $Revision: 1.2 $ - * TAG: $Name: $ - * locked from: $Locker: $ - * CVS State: $State: Exp $ - * Project: $ProjectName$ - */ -package de.intevation.gnv.statistics; - -import org.apache.log4j.Logger; - -/** - * This class stores a double value with a specific key. - * - * @author blume - */ -public class Statistic { - - /** - * Default Logging instance - */ - private static Logger sLogger = Logger.getLogger(Statistic.class); - private static boolean sDebug = sLogger.isDebugEnabled(); - - private double mValue; - private String mKey; - - /** - * Creates a new Statistic with a given key and a value. - * @param pKey The key. - * @param pValue The value. - */ - public Statistic(String pKey, double pValue) { - mKey = pKey; - mValue = pValue; - } - - /** - * Returns the value. - * @return the value. - */ - public double getValue() { - return mValue; - } - - /** - * Returns the key. - * @return the key. - */ - public String getKey() { - return mKey; - } - - /** - * Turns the value into string representation and returns it.
- * Attention: This method doesn't take a locale into account. - * - * @return the value as string. - */ - public String getStringValue() { - java.text.DecimalFormat df = new java.text.DecimalFormat("#.##"); - return df.format(mValue); - } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +/** + * Title: Statistic, $Header: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/Statistic.java,v 1.2 2007/12/21 12:31:15 blume Exp $ + * Source: $Source: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/Statistic.java,v $ + * created by: Stefan Blume (blume) + * erstellt am: 14.12.2007 + * Copyright: con terra GmbH, 2005 + * + * modified by: $Author: blume $ + * modified on: $Date: 2007/12/21 12:31:15 $ + * Version: $Revision: 1.2 $ + * TAG: $Name: $ + * locked from: $Locker: $ + * CVS State: $State: Exp $ + * Project: $ProjectName$ + */ +package de.intevation.gnv.statistics; + +import org.apache.log4j.Logger; + +/** + * This class stores a double value with a specific key. + * + * @author blume + */ +public class Statistic { + + /** + * Default Logging instance + */ + private static Logger sLogger = Logger.getLogger(Statistic.class); + private static boolean sDebug = sLogger.isDebugEnabled(); + + private double mValue; + private String mKey; + + /** + * Creates a new Statistic with a given key and a value. + * @param pKey The key. + * @param pValue The value. + */ + public Statistic(String pKey, double pValue) { + mKey = pKey; + mValue = pValue; + } + + /** + * Returns the value. + * @return the value. + */ + public double getValue() { + return mValue; + } + + /** + * Returns the key. + * @return the key. + */ + public String getKey() { + return mKey; + } + + /** + * Turns the value into string representation and returns it.
+ * Attention: This method doesn't take a locale into account. + * + * @return the value as string. + */ + public String getStringValue() { + java.text.DecimalFormat df = new java.text.DecimalFormat("#.##"); + return df.format(mValue); + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/statistics/StatisticSet.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/StatisticSet.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/StatisticSet.java Sun Apr 18 09:17:25 2010 +0000 @@ -49,4 +49,4 @@ return this.name; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistics.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistics.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistics.java Sun Apr 18 09:17:25 2010 +0000 @@ -1,51 +1,51 @@ -/** - * Title: Statistics, $Header: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/Statistics.java,v 1.2 2008/01/30 12:38:34 blume Exp $ - * Source: $Source: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/Statistics.java,v $ - * created by: Stefan Blume (blume) - * erstellt am: 14.12.2007 - * Copyright: con terra GmbH, 2005 - * - * modified by: $Author: blume $ - * modified on: $Date: 2008/01/30 12:38:34 $ - * Version: $Revision: 1.2 $ - * TAG: $Name: $ - * locked from: $Locker: $ - * CVS State: $State: Exp $ - * Project: $ProjectName$ - */ -package de.intevation.gnv.statistics; - -import de.intevation.gnv.state.describedata.KeyValueDescibeData; - -import de.intevation.gnv.statistics.exception.StatisticsException; - -import java.util.Collection; - -/** - * This interface defines one single method to calculate a statistic for a - * given data set. - * - * @author blume - */ -public interface Statistics { - - /** - * This method takes a data set and creates a statistic from it. - * - * @param resultSet The resulting statistic is about this data set. - * @param parameters A collection of parameters. - * @param measurements A collection of measurements. - * @param dates A collection of dates. - * @return a collection of statistics. - * @throws StatisticsException if an error occured while creating the - * statistic. - */ - public Collection calculateStatistics( - Object resultSet, - Collection parameters, - Collection measurements, - Collection dates - ) - throws StatisticsException; -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +/** + * Title: Statistics, $Header: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/Statistics.java,v 1.2 2008/01/30 12:38:34 blume Exp $ + * Source: $Source: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/Statistics.java,v $ + * created by: Stefan Blume (blume) + * erstellt am: 14.12.2007 + * Copyright: con terra GmbH, 2005 + * + * modified by: $Author: blume $ + * modified on: $Date: 2008/01/30 12:38:34 $ + * Version: $Revision: 1.2 $ + * TAG: $Name: $ + * locked from: $Locker: $ + * CVS State: $State: Exp $ + * Project: $ProjectName$ + */ +package de.intevation.gnv.statistics; + +import de.intevation.gnv.state.describedata.KeyValueDescibeData; + +import de.intevation.gnv.statistics.exception.StatisticsException; + +import java.util.Collection; + +/** + * This interface defines one single method to calculate a statistic for a + * given data set. + * + * @author blume + */ +public interface Statistics { + + /** + * This method takes a data set and creates a statistic from it. + * + * @param resultSet The resulting statistic is about this data set. + * @param parameters A collection of parameters. + * @param measurements A collection of measurements. + * @param dates A collection of dates. + * @return a collection of statistics. + * @throws StatisticsException if an error occured while creating the + * statistic. + */ + public Collection calculateStatistics( + Object resultSet, + Collection parameters, + Collection measurements, + Collection dates + ) + throws StatisticsException; +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java Sun Apr 18 09:17:25 2010 +0000 @@ -1,226 +1,226 @@ -/** - * Title: TimeseriesStatistics, $Header: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/TimeseriesStatistics.java,v 1.3 2008/08/18 14:50:33 drewnak Exp $ - * Source: $Source: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/TimeseriesStatistics.java,v $ - * created by: Stefan Blume (blume) - * erstellt am: 06.12.2007 - * Copyright: con terra GmbH, 2005 - * - * modified by: $Author: drewnak $ - * modified on: $Date: 2008/08/18 14:50:33 $ - * Version: $Revision: 1.3 $ - * TAG: $Name: $ - * locked from: $Locker: $ - * CVS State: $State: Exp $ - * Project: $ProjectName$ - */ -package de.intevation.gnv.statistics; - -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.geobackend.base.ResultDescriptor; - -import de.intevation.gnv.state.describedata.KeyValueDescibeData; - -import de.intevation.gnv.statistics.exception.StatisticsException; - -import java.sql.SQLException; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - -import org.apache.commons.math.stat.descriptive.DescriptiveStatistics; - -import org.apache.commons.math.stat.regression.SimpleRegression; - -import org.apache.log4j.Logger; - -/** - * This class is used to create a statistic in timeseries products. - * - * @author blume - */ -public class TimeseriesStatistics -extends AbstractStatistics -{ - - /** - * Default Logging instance - */ - private static Logger log = Logger.getLogger(TimeseriesStatistics.class); - - /** - * Constructor - */ - public TimeseriesStatistics() { - } - - - public Collection calculateStatistics( - Object result, - Collection parameters, - Collection measurements, - Collection dates - ) - throws StatisticsException { - - if (!(result instanceof Collection)) { - return new ArrayList(); - } - - Collection resultSet = (Collection)result; - - clearStatistics(); - - DescriptiveStatistics lStatistics = null; - SimpleRegression lRegression = null; - Collection statisticSets = new ArrayList(); - String break1, break2, break3; - int lSeries = 1; - - if (resultSet == null) { - return statisticSets; - } - - int b1Idx = -1; - int b2Idx = -1; - int b3Idx = -1; - int yIdx = -1; - try { - - Iterator resultIterator = resultSet.iterator(); - if (resultIterator.hasNext()) { - Result row = resultIterator.next(); - Result previousRow = row; - - if (b1Idx == -1) { - ResultDescriptor rd = row.getResultDescriptor(); - b1Idx = rd.getColumnIndex("GROUP1"); - b2Idx = rd.getColumnIndex("GROUP2"); - b3Idx = rd.getColumnIndex("GROUP3"); - yIdx = rd.getColumnIndex("YORDINATE"); - - if (b1Idx == -1 || b2Idx == -1 || b3Idx == -1 || yIdx == -1) { - return statisticSets; - } - } - break1 = row.getString(b1Idx); - break2 = row.getString(b2Idx); - break3 = row.getString(b3Idx); - lRegression = new SimpleRegression(); - lStatistics = new DescriptiveStatistics(); - while (resultIterator.hasNext()) { - - if (!break1.equals(row.getString(b1Idx)) - || !break2.equals(row.getString(b2Idx)) - || !break3.equals(row.getString(b3Idx)) - ) { - String statisticsName = generateStatisticsName( - break1, break2, - break3, parameters, - measurements, dates); - - statisticSets.add( - generateStatisticsValues( - lStatistics, - lRegression, - statisticsName)); - - lStatistics.clear(); - lRegression.clear(); - - clearStatistics(); - - Double yValue = row.getDouble(yIdx); - - if (yValue != null) { - lStatistics.addValue(yValue); - Double x = calculateXOrdinateValue(previousRow,row); - lRegression.addData(x, yValue); - } - - break1 = row.getString(b1Idx); - break2 = row.getString(b2Idx); - break3 = row.getString(b3Idx); - previousRow = row; - row = resultIterator.next(); - lSeries++; - } else { - - Double value = row.getDouble(yIdx); - if (value != null) { - lStatistics.addValue(value.doubleValue()); - Double x = calculateXOrdinateValue(previousRow,row); - lRegression.addData(x, value.doubleValue()); - } - previousRow = row; - row = resultIterator.next(); - } - - } - - Double yValue = row.getDouble(yIdx); - - if (yValue != null) { - lStatistics.addValue(yValue); - Double x = calculateXOrdinateValue(previousRow, row); - lRegression.addData(x, yValue); - } - - String statisticsName = generateStatisticsName( - break1, break2, - break3, parameters, - measurements, dates); - - statisticSets.add(generateStatisticsValues( - lStatistics, - lRegression, - statisticsName)); - lStatistics.clear(); - lRegression.clear(); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return statisticSets; - } - - /** - * Nothing is done here. - */ - protected void clearStatistics(){} - - - protected String generateStatisticsName(String break1, - String break2, - String break3, - Collection parameters, - Collection measurements, - Collection dates){ - log.debug("TimeseriesStatistics.generateStatisticsName"); - return this.findValueTitle(parameters,break1)+ " "+ - this.findValueTitle(measurements,break2) + "m"; - } - - - protected String findValueTitle(Collection values, - String id) { - log.debug("TimeseriesStatistics.findValueTitle "+ id); - if (values != null) { - Iterator it = values.iterator(); - while (it.hasNext()) { - KeyValueDescibeData data = it.next(); - if (id.equals(data.getKey())) { - return data.getValue(); - } - } - } - return ""; - } - - - protected double calculateXOrdinateValue(Result previousRow, Result row) throws SQLException { - return new Double((row.getDate("XORDINATE")).getTime() / 1000 / 3600); - } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +/** + * Title: TimeseriesStatistics, $Header: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/TimeseriesStatistics.java,v 1.3 2008/08/18 14:50:33 drewnak Exp $ + * Source: $Source: /share/gdi/SDI-Suite/Repository/projekte/BSH-GDI/genericViewer/src/main/java/de/conterra/bsh/gdi/gnviewer/output/statistics/TimeseriesStatistics.java,v $ + * created by: Stefan Blume (blume) + * erstellt am: 06.12.2007 + * Copyright: con terra GmbH, 2005 + * + * modified by: $Author: drewnak $ + * modified on: $Date: 2008/08/18 14:50:33 $ + * Version: $Revision: 1.3 $ + * TAG: $Name: $ + * locked from: $Locker: $ + * CVS State: $State: Exp $ + * Project: $ProjectName$ + */ +package de.intevation.gnv.statistics; + +import de.intevation.gnv.geobackend.base.Result; +import de.intevation.gnv.geobackend.base.ResultDescriptor; + +import de.intevation.gnv.state.describedata.KeyValueDescibeData; + +import de.intevation.gnv.statistics.exception.StatisticsException; + +import java.sql.SQLException; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +import org.apache.commons.math.stat.descriptive.DescriptiveStatistics; + +import org.apache.commons.math.stat.regression.SimpleRegression; + +import org.apache.log4j.Logger; + +/** + * This class is used to create a statistic in timeseries products. + * + * @author blume + */ +public class TimeseriesStatistics +extends AbstractStatistics +{ + + /** + * Default Logging instance + */ + private static Logger log = Logger.getLogger(TimeseriesStatistics.class); + + /** + * Constructor + */ + public TimeseriesStatistics() { + } + + + public Collection calculateStatistics( + Object result, + Collection parameters, + Collection measurements, + Collection dates + ) + throws StatisticsException { + + if (!(result instanceof Collection)) { + return new ArrayList(); + } + + Collection resultSet = (Collection)result; + + clearStatistics(); + + DescriptiveStatistics lStatistics = null; + SimpleRegression lRegression = null; + Collection statisticSets = new ArrayList(); + String break1, break2, break3; + int lSeries = 1; + + if (resultSet == null) { + return statisticSets; + } + + int b1Idx = -1; + int b2Idx = -1; + int b3Idx = -1; + int yIdx = -1; + try { + + Iterator resultIterator = resultSet.iterator(); + if (resultIterator.hasNext()) { + Result row = resultIterator.next(); + Result previousRow = row; + + if (b1Idx == -1) { + ResultDescriptor rd = row.getResultDescriptor(); + b1Idx = rd.getColumnIndex("GROUP1"); + b2Idx = rd.getColumnIndex("GROUP2"); + b3Idx = rd.getColumnIndex("GROUP3"); + yIdx = rd.getColumnIndex("YORDINATE"); + + if (b1Idx == -1 || b2Idx == -1 || b3Idx == -1 || yIdx == -1) { + return statisticSets; + } + } + break1 = row.getString(b1Idx); + break2 = row.getString(b2Idx); + break3 = row.getString(b3Idx); + lRegression = new SimpleRegression(); + lStatistics = new DescriptiveStatistics(); + while (resultIterator.hasNext()) { + + if (!break1.equals(row.getString(b1Idx)) + || !break2.equals(row.getString(b2Idx)) + || !break3.equals(row.getString(b3Idx)) + ) { + String statisticsName = generateStatisticsName( + break1, break2, + break3, parameters, + measurements, dates); + + statisticSets.add( + generateStatisticsValues( + lStatistics, + lRegression, + statisticsName)); + + lStatistics.clear(); + lRegression.clear(); + + clearStatistics(); + + Double yValue = row.getDouble(yIdx); + + if (yValue != null) { + lStatistics.addValue(yValue); + Double x = calculateXOrdinateValue(previousRow,row); + lRegression.addData(x, yValue); + } + + break1 = row.getString(b1Idx); + break2 = row.getString(b2Idx); + break3 = row.getString(b3Idx); + previousRow = row; + row = resultIterator.next(); + lSeries++; + } else { + + Double value = row.getDouble(yIdx); + if (value != null) { + lStatistics.addValue(value.doubleValue()); + Double x = calculateXOrdinateValue(previousRow,row); + lRegression.addData(x, value.doubleValue()); + } + previousRow = row; + row = resultIterator.next(); + } + + } + + Double yValue = row.getDouble(yIdx); + + if (yValue != null) { + lStatistics.addValue(yValue); + Double x = calculateXOrdinateValue(previousRow, row); + lRegression.addData(x, yValue); + } + + String statisticsName = generateStatisticsName( + break1, break2, + break3, parameters, + measurements, dates); + + statisticSets.add(generateStatisticsValues( + lStatistics, + lRegression, + statisticsName)); + lStatistics.clear(); + lRegression.clear(); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return statisticSets; + } + + /** + * Nothing is done here. + */ + protected void clearStatistics(){} + + + protected String generateStatisticsName(String break1, + String break2, + String break3, + Collection parameters, + Collection measurements, + Collection dates){ + log.debug("TimeseriesStatistics.generateStatisticsName"); + return this.findValueTitle(parameters,break1)+ " "+ + this.findValueTitle(measurements,break2) + "m"; + } + + + protected String findValueTitle(Collection values, + String id) { + log.debug("TimeseriesStatistics.findValueTitle "+ id); + if (values != null) { + Iterator it = values.iterator(); + while (it.hasNext()) { + KeyValueDescibeData data = it.next(); + if (id.equals(data.getKey())) { + return data.getValue(); + } + } + } + return ""; + } + + + protected double calculateXOrdinateValue(Result previousRow, Result row) throws SQLException { + return new Double((row.getDate("XORDINATE")).getTime() / 1000 / 3600); + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalProfileStatistics.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalProfileStatistics.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalProfileStatistics.java Sun Apr 18 09:17:25 2010 +0000 @@ -40,4 +40,4 @@ this.findValueTitle(measurements,break2)).trim(); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesMeshArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesMeshArtifact.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesMeshArtifact.java Sun Apr 18 09:17:25 2010 +0000 @@ -17,4 +17,4 @@ super.name = super.name + "Mesh"; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java Sun Apr 18 09:17:25 2010 +0000 @@ -56,4 +56,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/TimeGap.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/TimeGap.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/TimeGap.java Sun Apr 18 09:17:25 2010 +0000 @@ -46,4 +46,4 @@ String getUnit(); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/transition/DefaultTransition.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/DefaultTransition.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/DefaultTransition.java Sun Apr 18 09:17:25 2010 +0000 @@ -28,4 +28,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/transition/Transition.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/Transition.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/Transition.java Sun Apr 18 09:17:25 2010 +0000 @@ -41,4 +41,4 @@ public void setup(Node configuration); } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java Sun Apr 18 09:17:25 2010 +0000 @@ -42,4 +42,4 @@ this.to = Config.getStringXPath(configuration,"to/@state"); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionFactory.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionFactory.java Sun Apr 18 09:17:25 2010 +0000 @@ -64,4 +64,4 @@ return state; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java Sun Apr 18 09:17:25 2010 +0000 @@ -92,4 +92,4 @@ this.operator = Config.getStringXPath(configuration,"condition/@operator"); } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactXMLUtilities.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactXMLUtilities.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactXMLUtilities.java Sun Apr 18 09:17:25 2010 +0000 @@ -227,4 +227,4 @@ } } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/utils/DistanceCalculator.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/DistanceCalculator.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/DistanceCalculator.java Sun Apr 18 09:17:25 2010 +0000 @@ -103,4 +103,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Sun Apr 18 09:17:25 2010 +0000 @@ -234,4 +234,4 @@ return true; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 2423cefe7d39 -r 05bf8534a35a gnv-artifacts/src/main/java/de/intevation/gnv/utils/WKTUtils.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/WKTUtils.java Sat Apr 17 09:35:24 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/WKTUtils.java Sun Apr 18 09:17:25 2010 +0000 @@ -494,4 +494,4 @@ return null; } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : \ No newline at end of file +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :