Mercurial > dive4elements > gnv-client
changeset 779:b1f5f2a8840f
Ordered imports. Removed needless imports. Removed empty headers.
gnv-artifacts/trunk@854 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/ChangeLog Mon Mar 29 08:51:20 2010 +0000 @@ -1,3 +1,9 @@ +2010-03-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/gnv/**/*.java, + src/main/java/de/intevation/gnv/**/*.java: + Ordered imports. Removed needless imports. Removed empty headers. + 2010-03-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/test/java/de/intevation/gnv/**/*.java,
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/APP.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/APP.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifacts; import de.intevation.artifactdatabase.App;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,7 +1,42 @@ package de.intevation.gnv.artifacts; +import de.intevation.artifactdatabase.Config; +import de.intevation.artifactdatabase.ProxyArtifact; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactDatabase; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.ArtifactNamespaceContext; +import de.intevation.artifacts.CallContext; +import de.intevation.artifacts.CallMeta; + +import de.intevation.gnv.artifacts.context.GNVArtifactContext; + +import de.intevation.gnv.artifacts.fis.product.Product; + +import de.intevation.gnv.artifacts.ressource.RessourceFactory; + +import de.intevation.gnv.state.AutoResumeState; +import de.intevation.gnv.state.DefaultInputData; +import de.intevation.gnv.state.ExportMode; +import de.intevation.gnv.state.InputData; +import de.intevation.gnv.state.InputValue; +import de.intevation.gnv.state.OutputMode; +import de.intevation.gnv.state.OutputState; +import de.intevation.gnv.state.State; +import de.intevation.gnv.state.StateFactory; + +import de.intevation.gnv.state.exception.StateException; + +import de.intevation.gnv.transition.Transition; +import de.intevation.gnv.transition.TransitionFactory; + +import de.intevation.gnv.utils.ArtifactXMLUtilities; + import java.io.IOException; import java.io.OutputStream; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -13,37 +48,12 @@ import javax.xml.xpath.XPathConstants; import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.ProxyArtifact; -import de.intevation.artifactdatabase.XMLUtils; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactDatabase; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.ArtifactNamespaceContext; -import de.intevation.artifacts.CallContext; -import de.intevation.artifacts.CallMeta; -import de.intevation.gnv.artifacts.context.GNVArtifactContext; -import de.intevation.gnv.artifacts.fis.product.Product; -import de.intevation.gnv.artifacts.ressource.RessourceFactory; -import de.intevation.gnv.state.AutoResumeState; -import de.intevation.gnv.state.DefaultInputData; -import de.intevation.gnv.state.ExportMode; -import de.intevation.gnv.state.InputData; -import de.intevation.gnv.state.InputValue; -import de.intevation.gnv.state.OutputMode; -import de.intevation.gnv.state.OutputState; -import de.intevation.gnv.state.State; -import de.intevation.gnv.state.StateFactory; -import de.intevation.gnv.state.exception.StateException; -import de.intevation.gnv.transition.Transition; -import de.intevation.gnv.transition.TransitionFactory; -import de.intevation.gnv.utils.ArtifactXMLUtilities; - /** * @author Tim Englich (tim.englich@intevation.de) * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactFactory.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactFactory.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,12 +1,12 @@ package de.intevation.gnv.artifacts; +import de.intevation.artifactdatabase.DefaultArtifactFactory; + +import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.apache.log4j.Logger; - -import de.intevation.artifactdatabase.DefaultArtifactFactory; - /** * @author Ingo Weinzierl <ingo.weinzierl@intevation.de>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,5 +1,18 @@ package de.intevation.gnv.artifacts; +import de.intevation.artifactdatabase.DefaultArtifactFactory; +import de.intevation.artifactdatabase.ProxyArtifact; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; + +import de.intevation.gnv.artifacts.fis.SelectProductArtifact; + +import de.intevation.gnv.artifacts.fis.product.DefaultProduct; + +import de.intevation.gnv.state.DefaultInputData; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -8,19 +21,11 @@ import javax.xml.xpath.XPathConstants; import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import de.intevation.artifactdatabase.DefaultArtifactFactory; -import de.intevation.artifactdatabase.ProxyArtifact; -import de.intevation.artifactdatabase.XMLUtils; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.gnv.artifacts.fis.SelectProductArtifact; -import de.intevation.gnv.artifacts.fis.product.DefaultProduct; -import de.intevation.gnv.state.DefaultInputData; - /** * @author Ingo Weinzierl <ingo.weinzierl@intevation.de> */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/PreSettingArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/PreSettingArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,12 +1,9 @@ -/** - * - */ package de.intevation.gnv.artifacts; +import de.intevation.gnv.state.InputData; + import java.util.Map; -import de.intevation.gnv.state.InputData; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/cache/CacheFactory.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/cache/CacheFactory.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifacts.cache; import net.sf.ehcache.Cache;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContext.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContext.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,11 +1,6 @@ -/** - * - */ package de.intevation.gnv.artifacts.context; -import org.apache.log4j.Logger; - -import org.w3c.dom.Document; +import de.intevation.artifactdatabase.DefaultArtifactContext; import java.awt.Color; import java.awt.Dimension; @@ -13,7 +8,9 @@ import java.io.File; -import de.intevation.artifactdatabase.DefaultArtifactContext; +import org.apache.log4j.Logger; + +import org.w3c.dom.Document; /** * @author Tim Englich (tim.englich@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,20 +1,38 @@ package de.intevation.gnv.artifacts.context; +import de.intevation.artifactdatabase.Config; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.ArtifactContextFactory; + +import de.intevation.gnv.artifacts.cache.CacheFactory; + +import de.intevation.gnv.chart.XMLChartTheme; + +import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPoolFactory; + +import de.intevation.gnv.geobackend.base.query.container.QueryContainerFactory; + +import de.intevation.gnv.geobackend.base.query.container.exception.QueryContainerException; + +import de.intevation.gnv.raster.Filter; +import de.intevation.gnv.raster.Palette; +import de.intevation.gnv.raster.PaletteManager; + import java.awt.Color; +import java.awt.Dimension; import java.awt.Paint; +import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.io.File; -import java.util.Properties; -import java.util.HashMap; import java.util.ArrayList; import java.util.Collections; - -import java.awt.Dimension; +import java.util.HashMap; +import java.util.Properties; import org.apache.log4j.Logger; @@ -22,24 +40,6 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPoolFactory; - -import de.intevation.gnv.geobackend.base.query.container.QueryContainerFactory; -import de.intevation.gnv.geobackend.base.query.container.exception.QueryContainerException; - -import de.intevation.gnv.chart.XMLChartTheme; - -import de.intevation.gnv.artifacts.cache.CacheFactory; - -import de.intevation.gnv.raster.Palette; -import de.intevation.gnv.raster.Filter; -import de.intevation.gnv.raster.PaletteManager; - -import de.intevation.artifacts.ArtifactContextFactory; - -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; - /** * @author Tim Englich (tim.englich@intevation.de) * @author Ingo Weinzierl (iweinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,7 +1,29 @@ package de.intevation.gnv.artifacts.fis; +import de.intevation.artifactdatabase.ProxyArtifact; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.ArtifactNamespaceContext; +import de.intevation.artifacts.CallContext; +import de.intevation.artifacts.CallMeta; + +import de.intevation.gnv.artifacts.GNVArtifactBase; +import de.intevation.gnv.artifacts.GNVDefaultArtifact; +import de.intevation.gnv.artifacts.GNVProductArtifactFactory; +import de.intevation.gnv.artifacts.PreSettingArtifact; + +import de.intevation.gnv.artifacts.fis.product.Product; + +import de.intevation.gnv.artifacts.ressource.RessourceFactory; + +import de.intevation.gnv.state.DefaultInputData; +import de.intevation.gnv.state.InputData; + import java.io.IOException; import java.io.OutputStream; + import java.util.Collection; import java.util.HashMap; import java.util.Iterator; @@ -10,28 +32,12 @@ import javax.xml.xpath.XPathConstants; import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import de.intevation.artifactdatabase.ProxyArtifact; -import de.intevation.artifactdatabase.XMLUtils; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.ArtifactNamespaceContext; -import de.intevation.artifacts.CallContext; -import de.intevation.artifacts.CallMeta; -import de.intevation.gnv.artifacts.GNVArtifactBase; -import de.intevation.gnv.artifacts.GNVDefaultArtifact; -import de.intevation.gnv.artifacts.GNVProductArtifactFactory; -import de.intevation.gnv.artifacts.PreSettingArtifact; -import de.intevation.gnv.artifacts.fis.product.Product; -import de.intevation.gnv.artifacts.ressource.RessourceFactory; -import de.intevation.gnv.state.DefaultInputData; -import de.intevation.gnv.state.InputData; - - /** * @author Ingo Weinzierl <ingo.weinzierl@intevation.de> */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifacts.fis.product; import de.intevation.gnv.state.InputData;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/Product.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/Product.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifacts.fis.product; import de.intevation.gnv.state.InputData;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/RessourceFactory.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/RessourceFactory.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,24 +1,22 @@ -/** - * - */ package de.intevation.gnv.artifacts.ressource; +import de.intevation.artifacts.PreferredLocale; + import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.IOException; + import java.util.ArrayList; +import java.util.List; import java.util.Locale; -import java.util.List; import java.util.MissingResourceException; import java.util.ResourceBundle; import org.apache.log4j.Logger; -import de.intevation.artifacts.PreferredLocale; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataService.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataService.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,8 +1,35 @@ -/** - * - */ package de.intevation.gnv.artifacts.services; +import com.vividsolutions.jts.geom.Geometry; + +import com.vividsolutions.jts.io.ParseException; +import com.vividsolutions.jts.io.WKTReader; + +import de.intevation.artifactdatabase.DefaultService; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.ArtifactNamespaceContext; +import de.intevation.artifacts.CallMeta; +import de.intevation.artifacts.ServiceFactory; + +import de.intevation.gnv.artifacts.services.requestobjects.DefaultFIS; +import de.intevation.gnv.artifacts.services.requestobjects.DefaultLayer; +import de.intevation.gnv.artifacts.services.requestobjects.DefaultMapService; +import de.intevation.gnv.artifacts.services.requestobjects.DefaultParameter; +import de.intevation.gnv.artifacts.services.requestobjects.FIS; +import de.intevation.gnv.artifacts.services.requestobjects.Layer; +import de.intevation.gnv.artifacts.services.requestobjects.MapService; +import de.intevation.gnv.artifacts.services.requestobjects.Parameter; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.geobackend.base.query.QueryExecutor; +import de.intevation.gnv.geobackend.base.query.QueryExecutorFactory; + +import de.intevation.gnv.geobackend.base.query.exception.QueryException; + +import de.intevation.gnv.utils.ArtifactXMLUtilities; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -10,34 +37,12 @@ import javax.xml.xpath.XPathConstants; import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.io.ParseException; -import com.vividsolutions.jts.io.WKTReader; - -import de.intevation.artifactdatabase.DefaultService; -import de.intevation.artifactdatabase.XMLUtils; -import de.intevation.artifacts.ArtifactNamespaceContext; -import de.intevation.artifacts.CallMeta; -import de.intevation.artifacts.ServiceFactory; -import de.intevation.gnv.artifacts.services.requestobjects.DefaultFIS; -import de.intevation.gnv.artifacts.services.requestobjects.DefaultLayer; -import de.intevation.gnv.artifacts.services.requestobjects.DefaultMapService; -import de.intevation.gnv.artifacts.services.requestobjects.DefaultParameter; -import de.intevation.gnv.artifacts.services.requestobjects.FIS; -import de.intevation.gnv.artifacts.services.requestobjects.Layer; -import de.intevation.gnv.artifacts.services.requestobjects.MapService; -import de.intevation.gnv.artifacts.services.requestobjects.Parameter; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.geobackend.base.query.QueryExecutor; -import de.intevation.gnv.geobackend.base.query.QueryExecutorFactory; -import de.intevation.gnv.geobackend.base.query.exception.QueryException; -import de.intevation.gnv.utils.ArtifactXMLUtilities; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataServiceException.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataServiceException.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.artifacts.services; + /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultFIS.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultFIS.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifacts.services.requestobjects; import java.util.Collection;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultLayer.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultLayer.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.artifacts.services.requestobjects; + /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultMapService.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultMapService.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifacts.services.requestobjects; import java.util.Collection;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultParameter.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultParameter.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.artifacts.services.requestobjects; + /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/FIS.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/FIS.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifacts.services.requestobjects; import java.util.Collection;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Layer.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Layer.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.artifacts.services.requestobjects; + /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/MapService.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/MapService.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifacts.services.requestobjects; import java.util.Collection;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Parameter.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Parameter.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.artifacts.services.requestobjects; + /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/AbstractChart.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/AbstractChart.java Mon Mar 29 08:51:20 2010 +0000 @@ -3,8 +3,8 @@ import java.util.Collection; import java.util.Locale; +import org.jfree.chart.ChartTheme; import org.jfree.chart.JFreeChart; -import org.jfree.chart.ChartTheme; /** * Abstract chart class to define the basic fields used for chart creation.
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/AbstractXYLineChart.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/AbstractXYLineChart.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,8 +1,15 @@ package de.intevation.gnv.chart; +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.describedata.KeyValueDescibeData; + import java.awt.Color; + import java.awt.geom.Ellipse2D; + import java.text.NumberFormat; + import java.util.Collection; import java.util.Iterator; import java.util.Locale; @@ -10,23 +17,26 @@ import org.apache.log4j.Logger; +import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; -import org.jfree.chart.ChartFactory; + import org.jfree.chart.axis.Axis; +import org.jfree.chart.axis.AxisLocation; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.axis.NumberTickUnit; -import org.jfree.chart.axis.AxisLocation; + import org.jfree.chart.plot.PlotOrientation; import org.jfree.chart.plot.XYPlot; + import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; + import org.jfree.chart.title.TextTitle; -import org.jfree.data.xy.XYDataset; + import org.jfree.data.Range; + import org.jfree.data.general.Series; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.describedata.KeyValueDescibeData; - +import org.jfree.data.xy.XYDataset; /** * This abstract class defines some methods to adjust chart settings after its
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/Chart.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/Chart.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,9 +1,8 @@ package de.intevation.gnv.chart; -import org.jfree.chart.JFreeChart; - import java.io.Serializable; +import org.jfree.chart.JFreeChart; /** * The <code>Chart</code> interface should be implemented by each type of chart.
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/DefaultHistogram.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/DefaultHistogram.java Mon Mar 29 08:51:20 2010 +0000 @@ -2,6 +2,7 @@ import java.text.NumberFormat; import java.text.ParseException; + import java.util.Locale; import java.util.Map;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalCrossProfileChart.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalCrossProfileChart.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,14 +1,16 @@ package de.intevation.gnv.chart; +import de.intevation.gnv.chart.ChartLabels; + +import de.intevation.gnv.geobackend.base.Result; + import java.util.Collection; import java.util.Locale; -import de.intevation.gnv.chart.ChartLabels; -import de.intevation.gnv.geobackend.base.Result; - import org.apache.log4j.Logger; import org.jfree.chart.ChartTheme; + import org.jfree.data.general.Series; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalProfileChart.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalProfileChart.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,24 +1,28 @@ package de.intevation.gnv.chart; +import com.vividsolutions.jts.geom.Point; + +import com.vividsolutions.jts.io.ParseException; +import com.vividsolutions.jts.io.WKTReader; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.utils.DistanceCalculator; + import java.util.Collection; import java.util.Locale; import java.util.Map; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.io.WKTReader; -import com.vividsolutions.jts.io.ParseException; - import org.apache.log4j.Logger; import org.jfree.chart.ChartTheme; + import org.jfree.chart.plot.PlotOrientation; + import org.jfree.data.general.Series; + import org.jfree.data.xy.XYSeries; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.utils.DistanceCalculator; - - /** * This class is used to create xy-charts of horizontal profiles. *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/TimeSeriesChart.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/TimeSeriesChart.java Mon Mar 29 08:51:20 2010 +0000 @@ -27,8 +27,8 @@ import org.jfree.chart.axis.DateAxis; import org.jfree.chart.axis.DateTickUnit; import org.jfree.chart.axis.DateTickUnitType; +import org.jfree.chart.axis.TickUnitSource; import org.jfree.chart.axis.TickUnits; -import org.jfree.chart.axis.TickUnitSource; import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.plot.PlotOrientation;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,27 +1,32 @@ package de.intevation.gnv.chart; +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.describedata.KeyValueDescibeData; + import java.util.Collection; import java.util.HashMap; -import java.util.Map; import java.util.Iterator; import java.util.Locale; +import java.util.Map; import org.apache.log4j.Logger; import org.jfree.chart.ChartTheme; + import org.jfree.chart.axis.Axis; import org.jfree.chart.axis.NumberAxis; -import org.jfree.chart.plot.XYPlot; + 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 de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.describedata.KeyValueDescibeData; - - /** * This class is used to create xy charts of vertical profiles. *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/XMLChartTheme.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/XMLChartTheme.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,26 +1,31 @@ package de.intevation.gnv.chart; -import java.awt.Font; +import de.intevation.artifactdatabase.Config; + import java.awt.Color; +import java.awt.Font; import java.awt.Paint; + import java.awt.geom.Ellipse2D; + import java.lang.NumberFormatException; import org.apache.log4j.Logger; import org.jfree.chart.StandardChartTheme; + import org.jfree.chart.plot.XYPlot; + import org.jfree.chart.renderer.xy.AbstractXYItemRenderer; import org.jfree.chart.renderer.xy.XYBarRenderer; import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; + import org.jfree.ui.RectangleInsets; + import org.jfree.util.UnitType; - import org.w3c.dom.Document; -import de.intevation.artifactdatabase.Config; - /** * Implementation of JFreeChart's default implementation * <code>StandardChartTheme</code>. This class takes an xml document with a
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/DefaultDataCollector.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/DefaultDataCollector.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,14 +1,14 @@ package de.intevation.gnv.exports; -import java.util.List; -import java.util.ArrayList; - -import org.apache.log4j.Logger; - import de.intevation.gnv.geobackend.base.Result; import de.intevation.gnv.geobackend.base.ResultDescriptor; + import de.intevation.gnv.state.exception.StateException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.log4j.Logger; /** * This is the default implementation of {@link Export.DataCollector}. This
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/DefaultExport.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/DefaultExport.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,18 +1,21 @@ package de.intevation.gnv.exports; +import au.com.bytecode.opencsv.CSVWriter; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.exception.StateException; + import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; + import java.util.Collection; import java.util.Iterator; import org.apache.log4j.Logger; -import au.com.bytecode.opencsv.CSVWriter; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.exception.StateException; - /** * This class is the default implementation of {@link Export}. *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/Export.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/Export.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,14 +1,15 @@ package de.intevation.gnv.exports; +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.exception.StateException; + +import java.io.IOException; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; + import java.util.Collection; -import java.io.OutputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; - -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.exception.StateException; - /** * This interface should be implemented by a class whose instances are intended * to export a <code>Collection</code> of <code>Result</code>s into a specific
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ODVExport.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ODVExport.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,5 +1,13 @@ package de.intevation.gnv.exports; +import au.com.bytecode.opencsv.CSVWriter; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.describedata.KeyValueDescibeData; + +import de.intevation.gnv.state.exception.StateException; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -8,12 +16,6 @@ import org.apache.log4j.Logger; -import au.com.bytecode.opencsv.CSVWriter; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.describedata.KeyValueDescibeData; -import de.intevation.gnv.state.exception.StateException; - - /** * This class is used to create a specific export document which is similar to * an CSV document.
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ShapeDataCollector.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ShapeDataCollector.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,15 +1,16 @@ package de.intevation.gnv.exports; +import com.vividsolutions.jts.geom.Point; + +import com.vividsolutions.jts.io.ParseException; +import com.vividsolutions.jts.io.WKTReader; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.exception.StateException; + import org.apache.log4j.Logger; -import com.vividsolutions.jts.io.WKTReader; -import com.vividsolutions.jts.io.ParseException; -import com.vividsolutions.jts.geom.Point; - -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.exception.StateException; - - /** * This class is a specialization of {@link #DefaultDataCollector}. The * difference between these classes is, that this class extracts points served
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/SimpleOdvDataCollector.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/SimpleOdvDataCollector.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,16 +1,19 @@ package de.intevation.gnv.exports; -import java.util.Date; +import com.vividsolutions.jts.geom.Point; + +import com.vividsolutions.jts.io.ParseException; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.exception.StateException; + import java.text.DateFormat; import java.text.SimpleDateFormat; -import org.apache.log4j.Logger; +import java.util.Date; -import com.vividsolutions.jts.io.ParseException; -import com.vividsolutions.jts.geom.Point; - -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.exception.StateException; +import org.apache.log4j.Logger; /** * This class is a specialization of {@link ShapeDataCollector} and turns
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/histogram/HistogramHelper.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/histogram/HistogramHelper.java Mon Mar 29 08:51:20 2010 +0000 @@ -12,7 +12,6 @@ import org.apache.log4j.Logger; - /** * This class supports some helper methods for histogram charts. *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonDataset.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonDataset.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,10 +1,11 @@ package de.intevation.gnv.jfreechart; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; -import java.util.Collection; -import java.util.ArrayList; import org.jfree.data.Range; + import org.jfree.data.general.AbstractSeriesDataset; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonPlot.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonPlot.java Mon Mar 29 08:51:20 2010 +0000 @@ -20,9 +20,9 @@ import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.plot.Plot; +import org.jfree.chart.plot.PlotOrientation; import org.jfree.chart.plot.PlotRenderingInfo; import org.jfree.chart.plot.PlotState; -import org.jfree.chart.plot.PlotOrientation; import org.jfree.data.Range;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonRenderer.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonRenderer.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,30 +1,31 @@ package de.intevation.gnv.jfreechart; -import java.util.ArrayList; - +import java.awt.BasicStroke; import java.awt.Color; +import java.awt.Font; +import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.Paint; import java.awt.Shape; -import java.awt.BasicStroke; -import java.awt.FontMetrics; -import java.awt.Font; import java.awt.geom.GeneralPath; + +import java.awt.geom.Rectangle2D.Double; + import java.awt.geom.Rectangle2D; -import java.awt.geom.Rectangle2D.Double; + +import java.util.ArrayList; + +import org.apache.log4j.Logger; + +import org.jfree.chart.axis.ValueAxis; import org.jfree.data.Range; -import org.jfree.chart.axis.ValueAxis; +import org.jfree.text.TextUtilities; import org.jfree.ui.RectangleEdge; -import org.apache.log4j.Logger; - -import org.jfree.text.TextUtilities; - - /** * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) * @author Sascha L. Teichmann (sascha.teichmann@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonSeries.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonSeries.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,9 +1,10 @@ package de.intevation.gnv.jfreechart; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; import org.jfree.data.Range; + import org.jfree.data.general.Series; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/layer/LayerArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/layer/LayerArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,10 +1,12 @@ package de.intevation.gnv.layer; +import de.intevation.artifacts.ArtifactFactory; + +import de.intevation.gnv.artifacts.GNVArtifactBase; + import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.gnv.artifacts.GNVArtifactBase; +import org.w3c.dom.Document; /** * @author <a href="mailto:tim.englich@intevation.de">Tim Englich</a>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/AttributedXYColumns.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/AttributedXYColumns.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,12 +1,12 @@ package de.intevation.gnv.math; -import java.util.Map; -import java.util.HashMap; -import java.util.List; +import de.intevation.gnv.jfreechart.PolygonDataset; import java.io.Serializable; -import de.intevation.gnv.jfreechart.PolygonDataset; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/L1Comparator.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/L1Comparator.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,9 +1,9 @@ package de.intevation.gnv.math; +import com.vividsolutions.jts.geom.Coordinate; + import java.util.Comparator; -import com.vividsolutions.jts.geom.Coordinate; - /** * @author Sascha L. Teichmann */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearFunction.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearFunction.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,11 +1,11 @@ package de.intevation.gnv.math; -import org.apache.commons.math.optimization.fitting.ParametricRealFunction; - import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.analysis.UnivariateRealFunction; +import org.apache.commons.math.optimization.fitting.ParametricRealFunction; + /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearToMap.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearToMap.java Mon Mar 29 08:51:20 2010 +0000 @@ -2,8 +2,8 @@ import com.vividsolutions.jts.geom.Coordinate; +import java.util.Iterator; import java.util.List; -import java.util.Iterator; import java.util.NoSuchElementException; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/QueriedXYDepth.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/QueriedXYDepth.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,25 +1,25 @@ -/** - * - */ package de.intevation.gnv.math; +import com.vividsolutions.jts.geom.Coordinate; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.geobackend.base.query.QueryExecutor; +import de.intevation.gnv.geobackend.base.query.QueryExecutorFactory; + +import de.intevation.gnv.geobackend.base.query.exception.QueryException; + +import de.intevation.gnv.geobackend.sde.datasources.RasterObject; + +import de.intevation.gnv.utils.WKTUtils; + +import java.lang.ref.SoftReference; + import java.util.ArrayList; import java.util.Collection; -import java.lang.ref.SoftReference; - import org.apache.log4j.Logger; -import com.vividsolutions.jts.geom.Coordinate; - -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.geobackend.base.query.QueryExecutor; -import de.intevation.gnv.geobackend.base.query.QueryExecutorFactory; -import de.intevation.gnv.geobackend.base.query.exception.QueryException; -import de.intevation.gnv.geobackend.sde.datasources.RasterObject; - -import de.intevation.gnv.utils.WKTUtils; - /** * @author Tim Englich (tim.englich@intevation.de) * @author Sascha L. Teichmann (sascha.teichmann@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/XYColumn.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/XYColumn.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,17 +1,17 @@ package de.intevation.gnv.math; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import java.util.Collections; + +import org.apache.commons.math.FunctionEvaluationException; +import org.apache.commons.math.MathException; + +import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.analysis.interpolation.SplineInterpolator; import org.apache.commons.math.analysis.interpolation.UnivariateRealInterpolator; -import org.apache.commons.math.analysis.UnivariateRealFunction; - -import org.apache.commons.math.MathException; -import org.apache.commons.math.FunctionEvaluationException; - import org.apache.log4j.Logger; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,14 +1,13 @@ -/** - * - */ package de.intevation.gnv.profile.horizontal; +import de.intevation.artifacts.ArtifactFactory; + +import de.intevation.gnv.artifacts.GNVArtifactBase; + import org.apache.log4j.Logger; + import org.w3c.dom.Document; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.gnv.artifacts.GNVArtifactBase; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileInstantaneousPointArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileInstantaneousPointArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.profile.horizontal; import org.apache.log4j.Logger;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileMeshArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileMeshArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.profile.horizontal; import org.apache.log4j.Logger;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileMeshCrossArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileMeshCrossArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.profile.horizontal; import org.apache.log4j.Logger;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontalcrosssection/HorizontalCrossSectionMeshArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontalcrosssection/HorizontalCrossSectionMeshArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,14 +1,13 @@ -/** - * - */ package de.intevation.gnv.profile.horizontalcrosssection; +import de.intevation.artifacts.ArtifactFactory; + +import de.intevation.gnv.artifacts.GNVArtifactBase; + import org.apache.log4j.Logger; + import org.w3c.dom.Document; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.gnv.artifacts.GNVArtifactBase; - /** * @author Tim Englich (tim.englich@intevation.de) * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,14 +1,13 @@ -/** - * - */ package de.intevation.gnv.profile.vertical; +import de.intevation.artifacts.ArtifactFactory; + +import de.intevation.gnv.artifacts.GNVArtifactBase; + import org.apache.log4j.Logger; + import org.w3c.dom.Document; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.gnv.artifacts.GNVArtifactBase; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileInstantaneousPointArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileInstantaneousPointArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.profile.vertical; import org.apache.log4j.Logger;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileMeshArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileMeshArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.profile.vertical; import org.apache.log4j.Logger;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,14 +1,13 @@ -/** - * - */ package de.intevation.gnv.profile.verticalcrosssection; +import de.intevation.artifacts.ArtifactFactory; + +import de.intevation.gnv.artifacts.GNVArtifactBase; + import org.apache.log4j.Logger; + import org.w3c.dom.Document; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.gnv.artifacts.GNVArtifactBase; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/DemuxRingsHandler.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/DemuxRingsHandler.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,11 +1,11 @@ package de.intevation.gnv.raster; +import de.intevation.gnv.raster.Vectorizer.Edge; +import de.intevation.gnv.raster.Vectorizer.RingsHandler; + import java.util.ArrayList; import java.util.List; -import de.intevation.gnv.raster.Vectorizer.RingsHandler; -import de.intevation.gnv.raster.Vectorizer.Edge; - /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoPolygonSeriesProducer.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoPolygonSeriesProducer.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,20 +1,20 @@ package de.intevation.gnv.raster; +import de.intevation.gnv.jfreechart.CompactXYItems; +import de.intevation.gnv.jfreechart.PolygonSeries; + +import de.intevation.gnv.math.IJKey; + +import de.intevation.gnv.raster.Vectorizer.Edge; + +import gnu.trove.TDoubleArrayList; +import gnu.trove.TIntObjectHashMap; + import java.util.ArrayList; import java.util.Collection; import org.apache.log4j.Logger; -import gnu.trove.TIntObjectHashMap; -import gnu.trove.TDoubleArrayList; - -import de.intevation.gnv.raster.Vectorizer.Edge; - -import de.intevation.gnv.math.IJKey; - -import de.intevation.gnv.jfreechart.PolygonSeries; -import de.intevation.gnv.jfreechart.CompactXYItems; - /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoProducer.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoProducer.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,18 +1,18 @@ package de.intevation.gnv.raster; -import java.util.List; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; - -import gnu.trove.TIntObjectHashMap; -import gnu.trove.TIntHashSet; -import gnu.trove.TObjectProcedure; - import de.intevation.gnv.math.IJKey; import de.intevation.gnv.raster.Vectorizer.Edge; +import gnu.trove.TIntHashSet; +import gnu.trove.TIntObjectHashMap; +import gnu.trove.TObjectProcedure; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; + /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/JTSMultiLineStringProducer.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/JTSMultiLineStringProducer.java Mon Mar 29 08:51:20 2010 +0000 @@ -20,6 +20,7 @@ import java.util.List; import org.apache.log4j.Logger; + /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/KernelFilter.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/KernelFilter.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,9 +1,9 @@ package de.intevation.gnv.raster; +import org.apache.log4j.Logger; + import org.w3c.dom.Element; -import org.apache.log4j.Logger; - /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Palette.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Palette.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,17 +1,17 @@ package de.intevation.gnv.raster; +import de.intevation.gnv.raster.Raster.ValueToIndex; + +import java.awt.Color; + +import java.util.Arrays; + +import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import java.util.Arrays; - -import java.awt.Color; - -import org.apache.log4j.Logger; - -import de.intevation.gnv.raster.Raster.ValueToIndex; - /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PaletteManager.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PaletteManager.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,9 +1,9 @@ package de.intevation.gnv.raster; +import java.lang.ref.SoftReference; + import java.util.HashMap; -import java.lang.ref.SoftReference; - /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PolygonDatasetProducer.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PolygonDatasetProducer.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,15 +1,15 @@ package de.intevation.gnv.raster; -import java.util.List; -import java.util.HashMap; +import de.intevation.gnv.jfreechart.CompactXYItems; +import de.intevation.gnv.jfreechart.PolygonDataset; +import de.intevation.gnv.jfreechart.PolygonSeries; + +import de.intevation.gnv.raster.Vectorizer.Edge; import gnu.trove.TDoubleArrayList; -import de.intevation.gnv.raster.Vectorizer.Edge; - -import de.intevation.gnv.jfreechart.PolygonSeries; -import de.intevation.gnv.jfreechart.PolygonDataset; -import de.intevation.gnv.jfreechart.CompactXYItems; +import java.util.HashMap; +import java.util.List; /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/RasterToPPM.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/RasterToPPM.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,10 +1,10 @@ package de.intevation.gnv.raster; +import java.awt.Color; + import java.io.IOException; import java.io.OutputStream; -import java.awt.Color; - /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Vectorizer.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Vectorizer.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,11 +1,11 @@ package de.intevation.gnv.raster; +import gnu.trove.TIntObjectHashMap; +import gnu.trove.TIntStack; + +import java.util.ArrayList; import java.util.BitSet; import java.util.List; -import java.util.ArrayList; - -import gnu.trove.TIntStack; -import gnu.trove.TIntObjectHashMap; import org.apache.log4j.Logger;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/AutoResumeState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/AutoResumeState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.state; + /** * * Markerinterface for States which should be used for
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,8 +1,22 @@ -/** - * - */ package de.intevation.gnv.state; +import com.vividsolutions.jts.geom.Point; + +import de.intevation.artifactdatabase.Config; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.describedata.DefaultKeyValueDescribeData; +import de.intevation.gnv.state.describedata.KeyValueDescibeData; +import de.intevation.gnv.state.describedata.NamedArrayList; +import de.intevation.gnv.state.describedata.NamedCollection; + +import de.intevation.gnv.utils.ArtifactXMLUtilities; +import de.intevation.gnv.utils.InputValidator; +import de.intevation.gnv.utils.WKTUtils; + +import de.intevation.gnv.utils.exception.ValidationException; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -10,23 +24,11 @@ import java.util.List; import org.apache.log4j.Logger; + import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import com.vividsolutions.jts.geom.Point; - -import de.intevation.artifactdatabase.Config; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.describedata.DefaultKeyValueDescribeData; -import de.intevation.gnv.state.describedata.KeyValueDescibeData; -import de.intevation.gnv.state.describedata.NamedArrayList; -import de.intevation.gnv.state.describedata.NamedCollection; -import de.intevation.gnv.utils.ArtifactXMLUtilities; -import de.intevation.gnv.utils.InputValidator; -import de.intevation.gnv.utils.WKTUtils; -import de.intevation.gnv.utils.exception.ValidationException; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,14 +1,11 @@ -/** - * - */ package de.intevation.gnv.state; +import de.intevation.gnv.geobackend.base.Result; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import de.intevation.gnv.geobackend.base.Result; - /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputValue.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputValue.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputData.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputData.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state; import java.io.Serializable;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputValue.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputValue.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state; import java.io.Serializable;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxDateState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxDateState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,37 +1,23 @@ package de.intevation.gnv.state; -import de.intevation.artifactdatabase.XMLUtils; - import de.intevation.artifacts.CallContext; -import de.intevation.artifacts.CallMeta; import de.intevation.gnv.artifacts.ressource.RessourceFactory; -import de.intevation.gnv.geobackend.base.Result; - -import de.intevation.gnv.geobackend.util.DateUtils; - import de.intevation.gnv.state.describedata.DefaultMinMaxDescribeData; import de.intevation.gnv.state.describedata.DescribeData; -import de.intevation.gnv.state.describedata.MinMaxDescribeData; import de.intevation.gnv.state.exception.StateException; import de.intevation.gnv.utils.InputValidator; -import java.util.ArrayList; import java.util.Collection; -import java.util.Date; -import java.util.GregorianCalendar; import java.util.Iterator; -import java.util.List; import java.util.Locale; import org.apache.log4j.Logger; import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; /** * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputMode.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputMode.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,9 +1,7 @@ -/** - * - */ package de.intevation.gnv.state; import java.io.Serializable; + import java.util.Collection; import java.util.List;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state; import de.intevation.artifacts.CallContext;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputStateBase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputStateBase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,30 @@ package de.intevation.gnv.state; +import de.intevation.artifactdatabase.Config; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.CallContext; +import de.intevation.artifacts.CallMeta; + +import de.intevation.gnv.artifacts.cache.CacheFactory; + +import de.intevation.gnv.artifacts.ressource.RessourceFactory; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.geobackend.base.query.QueryExecutor; +import de.intevation.gnv.geobackend.base.query.QueryExecutorFactory; + +import de.intevation.gnv.geobackend.base.query.exception.QueryException; + +import de.intevation.gnv.state.describedata.MinMaxDescribeData; + +import de.intevation.gnv.state.exception.StateException; + +import de.intevation.gnv.utils.InputValidator; + import java.io.OutputStream; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -13,25 +37,12 @@ import net.sf.ehcache.Cache; import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; -import de.intevation.artifacts.CallContext; -import de.intevation.artifacts.CallMeta; -import de.intevation.gnv.artifacts.cache.CacheFactory; -import de.intevation.gnv.artifacts.ressource.RessourceFactory; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.geobackend.base.query.QueryExecutor; -import de.intevation.gnv.geobackend.base.query.QueryExecutorFactory; -import de.intevation.gnv.geobackend.base.query.exception.QueryException; -import de.intevation.gnv.state.describedata.MinMaxDescribeData; -import de.intevation.gnv.state.exception.StateException; -import de.intevation.gnv.utils.InputValidator; - /** * @author Tim Englich (tim.englich@intevation.de) * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,8 +1,11 @@ -/** - * - */ package de.intevation.gnv.state; +import de.intevation.artifactdatabase.Config; + +import de.intevation.artifacts.CallContext; + +import de.intevation.gnv.state.exception.StateException; + import java.util.ArrayList; import java.util.Collection; import java.util.Map; @@ -10,10 +13,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifacts.CallContext; -import de.intevation.gnv.state.exception.StateException; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,8 +1,11 @@ -/** - * - */ package de.intevation.gnv.state; +import de.intevation.artifactdatabase.Config; + +import de.intevation.artifacts.CallContext; + +import de.intevation.gnv.state.exception.StateException; + import java.util.ArrayList; import java.util.Collection; import java.util.Map; @@ -10,10 +13,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifacts.CallContext; -import de.intevation.gnv.state.exception.StateException; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/SingleInputState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/SingleInputState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,17 +1,15 @@ -/** - * - */ package de.intevation.gnv.state; +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.describedata.DefaultSingleValueDescribeData; + import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.apache.log4j.Logger; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.describedata.DefaultSingleValueDescribeData; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/State.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/State.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,18 +1,17 @@ -/** - * - */ package de.intevation.gnv.state; +import de.intevation.artifacts.CallContext; + +import de.intevation.gnv.state.exception.StateException; + import java.io.Serializable; + import java.util.Collection; import java.util.Map; import org.w3c.dom.Document; import org.w3c.dom.Node; -import de.intevation.artifacts.CallContext; -import de.intevation.gnv.state.exception.StateException; - /** * @author Tim Englich (tim.englich@intevation.de) * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,5 +1,37 @@ package de.intevation.gnv.state; +import de.intevation.artifactdatabase.Config; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.ArtifactNamespaceContext; +import de.intevation.artifacts.CallContext; +import de.intevation.artifacts.CallMeta; + +import de.intevation.gnv.artifacts.cache.CacheFactory; + +import de.intevation.gnv.artifacts.ressource.RessourceFactory; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.geobackend.base.query.QueryExecutor; +import de.intevation.gnv.geobackend.base.query.QueryExecutorFactory; + +import de.intevation.gnv.geobackend.base.query.exception.QueryException; + +import de.intevation.gnv.geobackend.util.DateUtils; + +import de.intevation.gnv.state.describedata.DefaultKeyValueDescribeData; +import de.intevation.gnv.state.describedata.KeyValueDescibeData; +import de.intevation.gnv.state.describedata.MinMaxDescribeData; +import de.intevation.gnv.state.describedata.NamedArrayList; +import de.intevation.gnv.state.describedata.NamedCollection; +import de.intevation.gnv.state.describedata.SingleValueDescribeData; + +import de.intevation.gnv.state.exception.StateException; + +import de.intevation.gnv.utils.ArtifactXMLUtilities; +import de.intevation.gnv.utils.InputValidator; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -16,33 +48,12 @@ import net.sf.ehcache.Cache; import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; -import de.intevation.artifacts.ArtifactNamespaceContext; -import de.intevation.artifacts.CallContext; -import de.intevation.artifacts.CallMeta; -import de.intevation.gnv.artifacts.cache.CacheFactory; -import de.intevation.gnv.artifacts.ressource.RessourceFactory; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.geobackend.base.query.QueryExecutor; -import de.intevation.gnv.geobackend.base.query.QueryExecutorFactory; -import de.intevation.gnv.geobackend.base.query.exception.QueryException; -import de.intevation.gnv.geobackend.util.DateUtils; -import de.intevation.gnv.state.describedata.DefaultKeyValueDescribeData; -import de.intevation.gnv.state.describedata.KeyValueDescibeData; -import de.intevation.gnv.state.describedata.MinMaxDescribeData; -import de.intevation.gnv.state.describedata.NamedArrayList; -import de.intevation.gnv.state.describedata.NamedCollection; -import de.intevation.gnv.state.describedata.SingleValueDescribeData; -import de.intevation.gnv.state.exception.StateException; -import de.intevation.gnv.utils.ArtifactXMLUtilities; -import de.intevation.gnv.utils.InputValidator; - /** * @author Tim Englich (tim.englich@intevation.de) * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateFactory.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateFactory.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,13 +1,11 @@ -/** - * - */ package de.intevation.gnv.state; +import de.intevation.gnv.artifacts.GNVArtifactBase; + import org.apache.log4j.Logger; + import org.w3c.dom.Node; -import de.intevation.gnv.artifacts.GNVArtifactBase; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultKeyValueDescribeData.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultKeyValueDescribeData.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.describedata; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultMinMaxDescribeData.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultMinMaxDescribeData.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.describedata; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultSingleValueDescribeData.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultSingleValueDescribeData.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.describedata; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DescribeData.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DescribeData.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.describedata; import java.io.Serializable;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/KeyValueDescibeData.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/KeyValueDescibeData.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.describedata; import java.io.Serializable;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/MinMaxDescribeData.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/MinMaxDescribeData.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.describedata; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedArrayList.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedArrayList.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.describedata; import java.util.ArrayList;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedCollection.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedCollection.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.describedata; import java.util.Collection;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/SingleValueDescribeData.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/SingleValueDescribeData.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.describedata; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/exception/StateException.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/exception/StateException.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.exception; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,41 +1,49 @@ -/** - * - */ package de.intevation.gnv.state.layer; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Collection; -import java.util.Iterator; +import com.vividsolutions.jts.geom.Geometry; -import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.io.ParseException; import com.vividsolutions.jts.io.WKTReader; import de.intevation.artifactdatabase.Config; import de.intevation.artifactdatabase.XMLUtils; + import de.intevation.artifacts.ArtifactNamespaceContext; import de.intevation.artifacts.CallContext; + import de.intevation.gnv.artifacts.context.GNVArtifactContext; + import de.intevation.gnv.geobackend.base.Result; + import de.intevation.gnv.geobackend.base.query.QueryExecutor; import de.intevation.gnv.geobackend.base.query.QueryExecutorFactory; + import de.intevation.gnv.geobackend.base.query.exception.QueryException; + import de.intevation.gnv.state.InputData; import de.intevation.gnv.state.OutputStateBase; + import de.intevation.gnv.state.exception.StateException; + import de.intevation.gnv.utils.ArtifactXMLUtilities; import de.intevation.gnv.utils.FileUtils; import de.intevation.gnv.utils.MapfileGenerator; import de.intevation.gnv.utils.MetaWriter; import de.intevation.gnv.utils.ShapeFileWriter; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; + +import java.util.Collection; +import java.util.Iterator; + +import org.apache.log4j.Logger; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileOutputState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileOutputState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,35 +1,49 @@ package de.intevation.gnv.state.profile.horizontal; +import de.intevation.artifacts.CallContext; + +import de.intevation.gnv.chart.Chart; +import de.intevation.gnv.chart.ChartLabels; +import de.intevation.gnv.chart.HorizontalProfileChart; + +import de.intevation.gnv.exports.DefaultExport; +import de.intevation.gnv.exports.DefaultProfile; + +import de.intevation.gnv.exports.Export.Profile; + +import de.intevation.gnv.exports.ShapeDataCollector; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.InputData; + +import de.intevation.gnv.state.describedata.KeyValueDescibeData; + +import de.intevation.gnv.state.exception.StateException; + +import de.intevation.gnv.state.timeseries.TimeSeriesOutputState; + +import de.intevation.gnv.statistics.HorizontalProfileStatistics; +import de.intevation.gnv.statistics.Statistics; + +import de.intevation.gnv.utils.InputValidator; +import de.intevation.gnv.utils.WKTUtils; + import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; + import java.text.ParseException; import java.text.SimpleDateFormat; + import java.util.Collection; import java.util.Date; import java.util.Iterator; import java.util.Locale; import org.apache.log4j.Logger; -import org.jfree.chart.ChartTheme; -import de.intevation.artifacts.CallContext; -import de.intevation.gnv.chart.Chart; -import de.intevation.gnv.chart.ChartLabels; -import de.intevation.gnv.chart.HorizontalProfileChart; -import de.intevation.gnv.exports.DefaultExport; -import de.intevation.gnv.exports.DefaultProfile; -import de.intevation.gnv.exports.ShapeDataCollector; -import de.intevation.gnv.exports.Export.Profile; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.InputData; -import de.intevation.gnv.state.describedata.KeyValueDescibeData; -import de.intevation.gnv.state.exception.StateException; -import de.intevation.gnv.state.timeseries.TimeSeriesOutputState; -import de.intevation.gnv.statistics.HorizontalProfileStatistics; -import de.intevation.gnv.statistics.Statistics; -import de.intevation.gnv.utils.InputValidator; -import de.intevation.gnv.utils.WKTUtils; +import org.jfree.chart.ChartTheme; /** * @author Tim Englich (tim.englich@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/NorthSouthEastWestState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/NorthSouthEastWestState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.profile.horizontal; import de.intevation.artifacts.CallContext;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/vertical/VerticalProfileOutputState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/vertical/VerticalProfileOutputState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,31 +1,37 @@ -/** - * - */ package de.intevation.gnv.state.profile.vertical; +import de.intevation.artifacts.CallContext; + +import de.intevation.gnv.chart.Chart; +import de.intevation.gnv.chart.ChartLabels; +import de.intevation.gnv.chart.VerticalProfileChart; + +import de.intevation.gnv.exports.DefaultDataCollector; +import de.intevation.gnv.exports.DefaultExport; +import de.intevation.gnv.exports.DefaultProfile; + +import de.intevation.gnv.exports.Export.Profile; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.exception.StateException; + +import de.intevation.gnv.state.timeseries.TimeSeriesOutputState; + +import de.intevation.gnv.statistics.Statistics; +import de.intevation.gnv.statistics.VerticalProfileStatistics; + import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; + import java.util.Collection; import java.util.Iterator; import java.util.Locale; import org.apache.log4j.Logger; -import org.jfree.chart.ChartTheme; -import de.intevation.artifacts.CallContext; -import de.intevation.gnv.chart.Chart; -import de.intevation.gnv.chart.ChartLabels; -import de.intevation.gnv.chart.VerticalProfileChart; -import de.intevation.gnv.exports.DefaultDataCollector; -import de.intevation.gnv.exports.DefaultExport; -import de.intevation.gnv.exports.DefaultProfile; -import de.intevation.gnv.exports.Export.Profile; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.exception.StateException; -import de.intevation.gnv.state.timeseries.TimeSeriesOutputState; -import de.intevation.gnv.statistics.Statistics; -import de.intevation.gnv.statistics.VerticalProfileStatistics; +import org.jfree.chart.ChartTheme; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,8 +1,67 @@ package de.intevation.gnv.state.timeseries; +import au.com.bytecode.opencsv.CSVWriter; + +import de.intevation.artifactdatabase.Config; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.ArtifactNamespaceContext; +import de.intevation.artifacts.CallContext; +import de.intevation.artifacts.CallMeta; + +import de.intevation.gnv.artifacts.context.GNVArtifactContext; + +import de.intevation.gnv.artifacts.ressource.RessourceFactory; + +import de.intevation.gnv.chart.Chart; +import de.intevation.gnv.chart.ChartLabels; +import de.intevation.gnv.chart.DefaultHistogram; +import de.intevation.gnv.chart.TimeSeriesChart; +import de.intevation.gnv.chart.XMLChartTheme; + +import de.intevation.gnv.chart.exception.TechnicalChartException; + +import de.intevation.gnv.exports.ChartExportHelper; +import de.intevation.gnv.exports.DefaultDataCollector; +import de.intevation.gnv.exports.DefaultExport; +import de.intevation.gnv.exports.DefaultProfile; + +import de.intevation.gnv.exports.Export.Profile; + +import de.intevation.gnv.exports.Export; +import de.intevation.gnv.exports.ODVExport; +import de.intevation.gnv.exports.SimpleOdvDataCollector; + +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.histogram.HistogramHelper; + +import de.intevation.gnv.state.InputData; +import de.intevation.gnv.state.OutputStateBase; + +import de.intevation.gnv.state.describedata.DefaultKeyValueDescribeData; +import de.intevation.gnv.state.describedata.KeyValueDescibeData; +import de.intevation.gnv.state.describedata.NamedArrayList; +import de.intevation.gnv.state.describedata.NamedCollection; + +import de.intevation.gnv.state.exception.StateException; + +import de.intevation.gnv.statistics.Statistic; +import de.intevation.gnv.statistics.StatisticSet; +import de.intevation.gnv.statistics.Statistics; +import de.intevation.gnv.statistics.TimeseriesStatistics; + +import de.intevation.gnv.statistics.exception.StatisticsException; + +import de.intevation.gnv.timeseries.gap.DefaultTimeGap; +import de.intevation.gnv.timeseries.gap.TimeGap; + +import de.intevation.gnv.utils.ArtifactXMLUtilities; + import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -13,52 +72,14 @@ import java.util.Vector; import org.apache.log4j.Logger; + import org.jfree.chart.ChartTheme; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import au.com.bytecode.opencsv.CSVWriter; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; -import de.intevation.artifacts.ArtifactNamespaceContext; -import de.intevation.artifacts.CallContext; -import de.intevation.artifacts.CallMeta; -import de.intevation.gnv.artifacts.context.GNVArtifactContext; -import de.intevation.gnv.artifacts.ressource.RessourceFactory; -import de.intevation.gnv.chart.Chart; -import de.intevation.gnv.chart.ChartLabels; -import de.intevation.gnv.chart.DefaultHistogram; -import de.intevation.gnv.chart.TimeSeriesChart; -import de.intevation.gnv.chart.XMLChartTheme; -import de.intevation.gnv.chart.exception.TechnicalChartException; -import de.intevation.gnv.exports.ChartExportHelper; -import de.intevation.gnv.exports.DefaultDataCollector; -import de.intevation.gnv.exports.DefaultExport; -import de.intevation.gnv.exports.DefaultProfile; -import de.intevation.gnv.exports.Export; -import de.intevation.gnv.exports.ODVExport; -import de.intevation.gnv.exports.SimpleOdvDataCollector; -import de.intevation.gnv.exports.Export.Profile; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.histogram.HistogramHelper; -import de.intevation.gnv.state.InputData; -import de.intevation.gnv.state.OutputStateBase; -import de.intevation.gnv.state.describedata.DefaultKeyValueDescribeData; -import de.intevation.gnv.state.describedata.KeyValueDescibeData; -import de.intevation.gnv.state.describedata.NamedArrayList; -import de.intevation.gnv.state.describedata.NamedCollection; -import de.intevation.gnv.state.exception.StateException; -import de.intevation.gnv.statistics.Statistic; -import de.intevation.gnv.statistics.StatisticSet; -import de.intevation.gnv.statistics.Statistics; -import de.intevation.gnv.statistics.TimeseriesStatistics; -import de.intevation.gnv.statistics.exception.StatisticsException; -import de.intevation.gnv.timeseries.gap.DefaultTimeGap; -import de.intevation.gnv.timeseries.gap.TimeGap; -import de.intevation.gnv.utils.ArtifactXMLUtilities; - /** * @author Tim Englich (tim.englich@intevation.de) * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/HorizontalProfileStatistics.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/HorizontalProfileStatistics.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,21 +1,22 @@ -/** - * - */ package de.intevation.gnv.statistics; -import java.sql.SQLException; -import java.util.Collection; +import com.vividsolutions.jts.geom.Point; -import org.apache.log4j.Logger; - -import com.vividsolutions.jts.geom.Point; import com.vividsolutions.jts.io.ParseException; import com.vividsolutions.jts.io.WKTReader; import de.intevation.gnv.geobackend.base.Result; + import de.intevation.gnv.state.describedata.KeyValueDescibeData; + import de.intevation.gnv.utils.DistanceCalculator; +import java.sql.SQLException; + +import java.util.Collection; + +import org.apache.log4j.Logger; + /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/StatisticSet.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/StatisticSet.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.statistics; import java.util.ArrayList;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistics.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistics.java Mon Mar 29 08:51:20 2010 +0000 @@ -15,12 +15,12 @@ */ package de.intevation.gnv.statistics; -import java.util.Collection; - import de.intevation.gnv.state.describedata.KeyValueDescibeData; import de.intevation.gnv.statistics.exception.StatisticsException; +import java.util.Collection; + /** * The interface <code>Statistics</code> fulfills the following purposes: * <ol>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java Mon Mar 29 08:51:20 2010 +0000 @@ -15,19 +15,24 @@ */ 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; -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 org.apache.commons.math.stat.regression.SimpleRegression; + +import org.apache.log4j.Logger; /** * The class <code>TimeseriesStatistics</code> fulfills the following purposes:
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalCrossSectionStatistics.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalCrossSectionStatistics.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,15 +1,15 @@ package de.intevation.gnv.statistics; -import java.util.Collection; -import java.util.ArrayList; - -import org.apache.log4j.Logger; +import de.intevation.gnv.math.AttributedXYColumns; import de.intevation.gnv.state.describedata.KeyValueDescibeData; import de.intevation.gnv.statistics.exception.StatisticsException; -import de.intevation.gnv.math.AttributedXYColumns; +import java.util.ArrayList; +import java.util.Collection; + +import org.apache.log4j.Logger; /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalProfileStatistics.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalProfileStatistics.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,14 +1,13 @@ -/** - * - */ package de.intevation.gnv.statistics; +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.state.describedata.KeyValueDescibeData; + import java.sql.SQLException; + import java.util.Collection; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.state.describedata.KeyValueDescibeData; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/exception/StatisticsException.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/exception/StatisticsException.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.statistics.exception; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,14 +1,13 @@ -/** - * - */ package de.intevation.gnv.timeseries; +import de.intevation.artifacts.ArtifactFactory; + +import de.intevation.gnv.artifacts.GNVArtifactBase; + import org.apache.log4j.Logger; + import org.w3c.dom.Document; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.gnv.artifacts.GNVArtifactBase; - /** * @author Tim Englich <tim.englich@intevation.de> * @author Ingo Weinzierl <ingo.weinzierl@intevation.de>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesMeshArtifact.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesMeshArtifact.java Mon Mar 29 08:51:20 2010 +0000 @@ -2,9 +2,6 @@ public class TimeSeriesMeshArtifact extends TimeSeriesArtifact { - /** - * - */ private static final long serialVersionUID = 5680432486700275986L; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.timeseries.gap; + /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/TimeGap.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/TimeGap.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,4 +1,5 @@ package de.intevation.gnv.timeseries.gap; + public interface TimeGap { public final static String TIME_UNIT_MINUTE = "m";
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/DefaultTransition.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/DefaultTransition.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.transition; import de.intevation.gnv.state.State;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/PresettingsValueCompareTransition.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/PresettingsValueCompareTransition.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,16 +1,15 @@ -/** - * - */ package de.intevation.gnv.transition; +import de.intevation.artifactdatabase.Config; + +import de.intevation.gnv.state.InputData; +import de.intevation.gnv.state.State; + import java.util.Map; import org.apache.log4j.Logger; -import org.w3c.dom.Node; -import de.intevation.artifactdatabase.Config; -import de.intevation.gnv.state.InputData; -import de.intevation.gnv.state.State; +import org.w3c.dom.Node; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/Transition.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/Transition.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,11 +1,11 @@ package de.intevation.gnv.transition; +import de.intevation.gnv.state.State; + import java.io.Serializable; import org.w3c.dom.Node; -import de.intevation.gnv.state.State; - /** * * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,12 +1,9 @@ -/** - * - */ package de.intevation.gnv.transition; +import de.intevation.artifactdatabase.Config; + import org.w3c.dom.Node; -import de.intevation.artifactdatabase.Config; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionFactory.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionFactory.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,13 +1,11 @@ -/** - * - */ package de.intevation.gnv.transition; +import de.intevation.gnv.artifacts.GNVArtifactBase; + import org.apache.log4j.Logger; + import org.w3c.dom.Node; -import de.intevation.gnv.artifacts.GNVArtifactBase; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,17 +1,17 @@ -/** - * - */ package de.intevation.gnv.transition; +import de.intevation.artifactdatabase.Config; + +import de.intevation.gnv.state.InputData; +import de.intevation.gnv.state.State; + +import de.intevation.gnv.state.exception.StateException; + import java.util.Iterator; import org.apache.log4j.Logger; -import org.w3c.dom.Node; -import de.intevation.artifactdatabase.Config; -import de.intevation.gnv.state.InputData; -import de.intevation.gnv.state.State; -import de.intevation.gnv.state.exception.StateException; +import org.w3c.dom.Node; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactFactoryUtilities.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactFactoryUtilities.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,14 +1,12 @@ -/** - * - */ package de.intevation.gnv.utils; +import de.intevation.artifacts.ArtifactFactory; + import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Node; -import de.intevation.artifacts.ArtifactFactory; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactXMLUtilities.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactXMLUtilities.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,5 +1,7 @@ package de.intevation.gnv.utils; +import de.intevation.artifacts.ArtifactNamespaceContext; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -10,22 +12,25 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; + import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactoryConfigurationError; + import javax.xml.transform.dom.DOMSource; + import javax.xml.transform.stream.StreamResult; import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; + import org.xml.sax.SAXException; -import de.intevation.artifacts.ArtifactNamespaceContext; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/DistanceCalculator.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/DistanceCalculator.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,10 +1,7 @@ -/** - * - */ package de.intevation.gnv.utils; +import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.geom.Coordinate; import java.util.List;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/IndexBuffer.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/IndexBuffer.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,9 +1,9 @@ package de.intevation.gnv.utils; +import java.awt.Point; + import java.awt.geom.Point2D; -import java.awt.Point; - import java.util.List; /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,21 +1,21 @@ -/** - * - */ package de.intevation.gnv.utils; +import com.vividsolutions.jts.geom.Coordinate; +import com.vividsolutions.jts.geom.GeometryFactory; +import com.vividsolutions.jts.geom.Point; + +import com.vividsolutions.jts.io.ParseException; +import com.vividsolutions.jts.io.WKTReader; + +import de.intevation.gnv.geobackend.util.DateUtils; + +import de.intevation.gnv.utils.exception.ValidationException; + import java.util.Date; import org.apache.commons.validator.GenericValidator; -import org.apache.log4j.Logger; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.GeometryFactory; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.io.ParseException; -import com.vividsolutions.jts.io.WKTReader; - -import de.intevation.gnv.geobackend.util.DateUtils; -import de.intevation.gnv.utils.exception.ValidationException; +import org.apache.log4j.Logger; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MapfileGenerator.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MapfileGenerator.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,11 +1,19 @@ package de.intevation.gnv.utils; +import de.intevation.artifactdatabase.Config; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.ArtifactNamespaceContext; + +import de.intevation.gnv.wms.LayerInfo; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; + import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -13,18 +21,16 @@ import javax.xml.xpath.XPathConstants; import org.apache.log4j.Logger; + import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; + import org.apache.velocity.app.VelocityEngine; + import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; -import de.intevation.artifacts.ArtifactNamespaceContext; -import de.intevation.gnv.wms.LayerInfo; - /** * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MetaWriter.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MetaWriter.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,22 +1,27 @@ package de.intevation.gnv.utils; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.ArtifactNamespaceContext; +import de.intevation.artifacts.CallContext; + +import de.intevation.gnv.artifacts.context.GNVArtifactContext; + +import de.intevation.gnv.wms.LayerInfo; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; + import java.util.Date; import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Element; -import de.intevation.artifactdatabase.XMLUtils; -import de.intevation.artifacts.ArtifactNamespaceContext; -import de.intevation.artifacts.CallContext; -import de.intevation.gnv.artifacts.context.GNVArtifactContext; -import de.intevation.gnv.wms.LayerInfo; - /** * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ShapeFileWriter.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ShapeFileWriter.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,10 +1,23 @@ package de.intevation.gnv.utils; +import com.vividsolutions.jts.geom.Geometry; +import com.vividsolutions.jts.geom.MultiLineString; +import com.vividsolutions.jts.geom.MultiPolygon; + +import com.vividsolutions.jts.io.ParseException; +import com.vividsolutions.jts.io.WKTReader; + +import de.intevation.gnv.geobackend.base.Result; +import de.intevation.gnv.geobackend.base.ResultDescriptor; + import java.io.File; import java.io.IOException; import java.io.Serializable; + import java.net.MalformedURLException; + import java.text.NumberFormat; + import java.util.Collection; import java.util.Date; import java.util.HashMap; @@ -12,30 +25,27 @@ import java.util.Map; import org.apache.log4j.Logger; + import org.geotools.data.DataStoreFactorySpi; import org.geotools.data.DataUtilities; import org.geotools.data.DefaultTransaction; import org.geotools.data.FeatureStore; import org.geotools.data.Transaction; + import org.geotools.data.shapefile.ShapefileDataStore; import org.geotools.data.shapefile.ShapefileDataStoreFactory; + import org.geotools.feature.FeatureCollection; import org.geotools.feature.FeatureCollections; import org.geotools.feature.SchemaException; + import org.geotools.feature.simple.SimpleFeatureBuilder; + import org.geotools.referencing.crs.DefaultGeographicCRS; + import org.opengis.feature.simple.SimpleFeature; import org.opengis.feature.simple.SimpleFeatureType; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.MultiLineString; -import com.vividsolutions.jts.geom.MultiPolygon; -import com.vividsolutions.jts.io.ParseException; -import com.vividsolutions.jts.io.WKTReader; - -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.geobackend.base.ResultDescriptor; - /** * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/exception/ValidationException.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/exception/ValidationException.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.utils.exception; + /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCaseBase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCaseBase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,8 +1,18 @@ -/** - * - */ package de.intevation.gnv.artifacts; +import de.intevation.artifactdatabase.Config; +import de.intevation.artifactdatabase.DefaultCallMeta; +import de.intevation.artifactdatabase.DefaultPreferredLocale; +import de.intevation.artifactdatabase.FactoryBootstrap; + +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.CallContext; +import de.intevation.artifacts.CallMeta; +import de.intevation.artifacts.PreferredLocale; + +import de.intevation.gnv.utils.ArtifactXMLUtilities; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileNotFoundException; @@ -17,19 +27,10 @@ import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.xml.sax.SAXException; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.DefaultCallMeta; -import de.intevation.artifactdatabase.DefaultPreferredLocale; -import de.intevation.artifactdatabase.FactoryBootstrap; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.CallContext; -import de.intevation.artifacts.CallMeta; -import de.intevation.artifacts.PreferredLocale; -import de.intevation.gnv.utils.ArtifactXMLUtilities; +import org.w3c.dom.Document; + +import org.xml.sax.SAXException; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/InstantaneousPointHorizontalProfileTestCase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/InstantaneousPointHorizontalProfileTestCase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,16 +1,14 @@ -/** - * - */ package de.intevation.gnv.artifacts; +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.CallContext; + import java.io.FileOutputStream; import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.CallContext; +import org.w3c.dom.Document; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/InstantaneousPointVerticalProfileTestCase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/InstantaneousPointVerticalProfileTestCase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,16 +1,14 @@ -/** - * - */ package de.intevation.gnv.artifacts; +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.CallContext; + import java.io.FileOutputStream; import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.CallContext; +import org.w3c.dom.Document; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshHorizontalCrossSectionTestCase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshHorizontalCrossSectionTestCase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,16 +1,14 @@ -/** - * - */ package de.intevation.gnv.artifacts; +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.CallContext; + import java.io.FileOutputStream; import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.CallContext; +import org.w3c.dom.Document; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshHorizontalProfileTestCase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshHorizontalProfileTestCase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,16 +1,14 @@ -/** - * - */ package de.intevation.gnv.artifacts; +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.CallContext; + import java.io.FileOutputStream; import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.CallContext; +import org.w3c.dom.Document; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshTimeSeriesTestCase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshTimeSeriesTestCase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,16 +1,14 @@ -/** - * - */ package de.intevation.gnv.artifacts; +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.CallContext; + import java.io.FileOutputStream; import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.CallContext; +import org.w3c.dom.Document; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshVerticalCrossSectionTestCase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshVerticalCrossSectionTestCase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,16 +1,14 @@ -/** - * - */ package de.intevation.gnv.artifacts; +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.CallContext; + import java.io.FileOutputStream; import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.CallContext; +import org.w3c.dom.Document; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshVerticalProfileTestCase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshVerticalProfileTestCase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,16 +1,14 @@ -/** - * - */ package de.intevation.gnv.artifacts; +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.CallContext; + import java.io.FileOutputStream; import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.CallContext; +import org.w3c.dom.Document; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestArtifactDatabase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestArtifactDatabase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,15 +1,12 @@ -/** - * - */ package de.intevation.gnv.artifacts; -import org.w3c.dom.Document; - import de.intevation.artifacts.ArtifactDatabase; import de.intevation.artifacts.ArtifactDatabaseException; import de.intevation.artifacts.ArtifactFactory; import de.intevation.artifacts.CallMeta; +import org.w3c.dom.Document; + /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestCallContext.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestCallContext.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifacts; import de.intevation.artifacts.ArtifactDatabase;
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointTimeSeriesTestCase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointTimeSeriesTestCase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,16 +1,14 @@ -/** - * - */ package de.intevation.gnv.artifacts; +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.CallContext; + import java.io.FileOutputStream; import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.CallContext; +import org.w3c.dom.Document; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointVerticalProfileTestCase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointVerticalProfileTestCase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,16 +1,14 @@ -/** - * - */ package de.intevation.gnv.artifacts; +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.CallContext; + import java.io.FileOutputStream; import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.CallContext; +import org.w3c.dom.Document; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/ressource/RessourceFactoryTestCase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/ressource/RessourceFactoryTestCase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,13 +1,14 @@ package de.intevation.gnv.artifacts.ressource; +import de.intevation.artifactdatabase.DefaultPreferredLocale; + +import de.intevation.artifacts.PreferredLocale; + import junit.framework.TestCase; import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; -import de.intevation.artifactdatabase.DefaultPreferredLocale; -import de.intevation.artifacts.PreferredLocale; - /** * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/util/ShapeFileWriterTestCase.java Mon Mar 29 07:58:51 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/util/ShapeFileWriterTestCase.java Mon Mar 29 08:51:20 2010 +0000 @@ -1,10 +1,15 @@ -/** - * - */ package de.intevation.gnv.artifacts.util; +import com.vividsolutions.jts.geom.MultiLineString; + +import com.vividsolutions.jts.io.WKTReader; + +import de.intevation.gnv.utils.Pair; +import de.intevation.gnv.utils.ShapeFileWriter; + import java.io.File; import java.io.FileReader; + import java.util.ArrayList; import java.util.Date; @@ -13,12 +18,6 @@ import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; -import com.vividsolutions.jts.geom.MultiLineString; -import com.vividsolutions.jts.io.WKTReader; - -import de.intevation.gnv.utils.Pair; -import de.intevation.gnv.utils.ShapeFileWriter; - /** * @author Tim Englich <tim.englich@intevation.de> *