# HG changeset patch # User Sascha L. Teichmann # Date 1269854527 0 # Node ID 8b442223741ccc44b293dbe690182fe168928361 # Parent 1c3efbd2fc5adb7312c81c454db5a97fd21c25b1 Ordered imports. Removed empty headers. geo-backend/trunk@856 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/ChangeLog --- a/geo-backend/ChangeLog Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/ChangeLog Mon Mar 29 09:22:07 2010 +0000 @@ -1,4 +1,10 @@ 2009-03-29 Sascha L. Teichmann + + * src/main/java/de/intevation/gnv/geobackend/**/*.java: + Ordered imports. Removed empty headers. + +2009-03-29 Sascha L. Teichmann + * src/test/java/de/intevation/gnv/geobackend/base/query/QueryExecutorTestCase.java, src/test/java/de/intevation/gnv/geobackend/base/query/ToCharSample.java, src/test/java/de/intevation/gnv/geobackend/base/query/GroupBySample.java, diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/DefaultResult.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/DefaultResult.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/DefaultResult.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,13 +1,10 @@ -/** - * - */ package de.intevation.gnv.geobackend.base; +import de.intevation.gnv.geobackend.util.DateUtils; + import java.util.Date; import java.util.GregorianCalendar; -import de.intevation.gnv.geobackend.util.DateUtils; - /** * Defaultimplementation of the Interface Result. * This Class stores the Attributevalues of one Result. diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/DefaultResultDescriptor.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/DefaultResultDescriptor.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/DefaultResultDescriptor.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.geobackend.base; import java.util.ArrayList; diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/Result.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/Result.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/Result.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,12 +1,9 @@ -/** - * - */ package de.intevation.gnv.geobackend.base; import java.io.Serializable; + import java.util.Date; - /** * Interface which provides the Methods for Accessing * the Data of an ResultEntry diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/ResultDescriptor.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/ResultDescriptor.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/ResultDescriptor.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.geobackend.base; import java.io.Serializable; diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/ConnectionPool.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/ConnectionPool.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/ConnectionPool.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,10 +1,11 @@ package de.intevation.gnv.geobackend.base.connectionpool; +import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; + import java.sql.Connection; + import java.util.Properties; -import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; - /** * Interfacedefinition for an Generic ConnectionPool * @author Tim Englich diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/ConnectionPoolFactory.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/ConnectionPoolFactory.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/ConnectionPoolFactory.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,14 +1,11 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.connectionpool; +import de.intevation.gnv.geobackend.sde.connectionpool.ArcSDEConnectionPool; + import java.util.Properties; import org.apache.log4j.Logger; -import de.intevation.gnv.geobackend.sde.connectionpool.ArcSDEConnectionPool; - /** * Factoryimplementation for the Interface ConnectionPool. * This factory delivers Instances of the Interface ConnectionPool. diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/exception/ConnectionException.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/exception/ConnectionException.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/exception/ConnectionException.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,15 +1,12 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.connectionpool.exception; -import org.apache.log4j.Logger; - import com.esri.sde.sdk.client.SeError; import com.esri.sde.sdk.client.SeException; import de.intevation.gnv.geobackend.sde.datasources.exception.TechnicalException; +import org.apache.log4j.Logger; + /** * The class lConnectionException fulfills the following purposes: * diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/CachingQueryExecutorFactory.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/CachingQueryExecutorFactory.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/CachingQueryExecutorFactory.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,18 +1,17 @@ package de.intevation.gnv.geobackend.base.query; +import de.intevation.gnv.geobackend.base.Result; + import java.util.Collection; import net.sf.ehcache.Cache; +import net.sf.ehcache.CacheManager; import net.sf.ehcache.Element; -import net.sf.ehcache.CacheManager; import org.apache.log4j.Logger; -import de.intevation.gnv.geobackend.base.Result; - /** * @author Sascha L. Teichmann - * */ public class CachingQueryExecutorFactory extends QueryExecutorFactory diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/DefaultQueryExceutor.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/DefaultQueryExceutor.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/DefaultQueryExceutor.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,24 +1,27 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.query; +import de.intevation.gnv.geobackend.base.Result; + +import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPool; +import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPoolFactory; + +import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; + +import de.intevation.gnv.geobackend.base.query.container.QueryContainerFactory; + +import de.intevation.gnv.geobackend.base.query.container.exception.QueryContainerException; + +import de.intevation.gnv.geobackend.base.query.exception.QueryException; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; + import java.util.Collection; import org.apache.log4j.Logger; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPool; -import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPoolFactory; -import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; -import de.intevation.gnv.geobackend.base.query.container.QueryContainerFactory; -import de.intevation.gnv.geobackend.base.query.container.exception.QueryContainerException; -import de.intevation.gnv.geobackend.base.query.exception.QueryException; - /** * This is an Standard Implementation of the Interface QueryExecutor. * It fetchs the Query from the Querycontainer an put the Filtervalues into the Query. diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/QueryExecutor.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/QueryExecutor.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/QueryExecutor.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,13 +1,11 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.query; -import java.util.Collection; +import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.geobackend.base.Result; import de.intevation.gnv.geobackend.base.query.exception.QueryException; +import java.util.Collection; + /** * This Interface provides the Method to execute Queries * against a Datastore eg. Databases diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/QueryExecutorBase.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/QueryExecutorBase.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/QueryExecutorBase.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,20 +1,18 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.query; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import de.intevation.gnv.geobackend.base.DefaultResult; import de.intevation.gnv.geobackend.base.DefaultResultDescriptor; import de.intevation.gnv.geobackend.base.Result; import de.intevation.gnv.geobackend.base.ResultDescriptor; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + /** * This is an abstract Basicimplementation of the Interface * QueryExecutor providing several Helpermethods. diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/QueryExecutorFactory.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/QueryExecutorFactory.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/QueryExecutorFactory.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.query; import org.apache.log4j.Logger; diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/DefaultQueryContainer.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/DefaultQueryContainer.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/DefaultQueryContainer.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,12 +1,9 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.query.container; +import de.intevation.gnv.geobackend.base.query.container.exception.QueryContainerException; + import java.util.Properties; -import de.intevation.gnv.geobackend.base.query.container.exception.QueryContainerException; - /** * Defaultimplementation of an QueryContainer. * All Queries are provided using a Propertiescontainer. diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/QueryContainer.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/QueryContainer.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/QueryContainer.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,12 +1,9 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.query.container; +import de.intevation.gnv.geobackend.base.query.container.exception.QueryContainerException; + import java.util.Properties; -import de.intevation.gnv.geobackend.base.query.container.exception.QueryContainerException; - /** * @author Tim Englich * diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/QueryContainerFactory.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/QueryContainerFactory.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/QueryContainerFactory.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,14 +1,11 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.query.container; +import de.intevation.gnv.geobackend.base.query.container.exception.QueryContainerException; + import java.util.Properties; import org.apache.log4j.Logger; -import de.intevation.gnv.geobackend.base.query.container.exception.QueryContainerException; - /** * @author Tim Englich * diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/exception/QueryContainerException.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/exception/QueryContainerException.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/exception/QueryContainerException.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.query.container.exception; + /** * Exceptioncalls which will be used to retun Exception in * the QuerContainer-Package. diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/exception/QueryException.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/exception/QueryException.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/exception/QueryException.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.query.exception; + /** * This is a specialized Exceptionclass for Exceptions that occurse during * querying Data from the Database- diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEConnectionPool.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEConnectionPool.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEConnectionPool.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,15 +1,19 @@ package de.intevation.gnv.geobackend.sde.connectionpool; +import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPool; + +import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; + import java.sql.Connection; + import java.util.Properties; import org.apache.commons.pool.PoolableObjectFactory; + import org.apache.commons.pool.impl.GenericObjectPool; + import org.apache.log4j.Logger; -import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPool; -import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; - /** *This is the ArcSDE specific implementation of the Interface ConnectionPool * diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEPoolableObjectFactory.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEPoolableObjectFactory.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEPoolableObjectFactory.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,14 +1,17 @@ package de.intevation.gnv.geobackend.sde.connectionpool; +import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; + +import de.intevation.gnv.geobackend.sde.datasources.ArcSDEConnection; + import java.sql.Connection; import java.sql.SQLException; + import java.util.Properties; import org.apache.commons.pool.PoolableObjectFactory; -import org.apache.log4j.Logger; -import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; -import de.intevation.gnv.geobackend.sde.datasources.ArcSDEConnection; +import org.apache.log4j.Logger; /** * ArcSDE specific Implementation of an PoolableObjectFactory. diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnection.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnection.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnection.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,8 +1,12 @@ -/** - * - */ package de.intevation.gnv.geobackend.sde.datasources; +import com.esri.sde.sdk.client.SeConnection; +import com.esri.sde.sdk.client.SeException; + +import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; + +import de.intevation.gnv.geobackend.sde.connectionpool.ArcSDEPoolableObjectFactory; + import java.sql.Array; import java.sql.Blob; import java.sql.CallableStatement; @@ -18,17 +22,12 @@ import java.sql.Savepoint; import java.sql.Statement; import java.sql.Struct; + import java.util.Map; import java.util.Properties; import org.apache.log4j.Logger; -import com.esri.sde.sdk.client.SeConnection; -import com.esri.sde.sdk.client.SeException; - -import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; -import de.intevation.gnv.geobackend.sde.connectionpool.ArcSDEPoolableObjectFactory; - /** * Wrapperclass between an @see java.sql.Connection and an * @see com.esri.sde.sdk.client.SeConnection diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEResultSetMetaData.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEResultSetMetaData.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEResultSetMetaData.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,10 +1,8 @@ -/** - * - */ package de.intevation.gnv.geobackend.sde.datasources; import java.sql.ResultSetMetaData; import java.sql.SQLException; + import java.util.List; /** diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEStatement.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEStatement.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEStatement.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,13 +1,5 @@ package de.intevation.gnv.geobackend.sde.datasources; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.Statement; - -import org.apache.log4j.Logger; - import com.esri.sde.sdk.client.SDEPoint; import com.esri.sde.sdk.client.SeColumnDefinition; import com.esri.sde.sdk.client.SeConnection; @@ -26,14 +18,24 @@ import com.esri.sde.sdk.client.SeShape; import com.esri.sde.sdk.client.SeShapeFilter; import com.esri.sde.sdk.client.SeSqlConstruct; + import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.Point; import com.vividsolutions.jts.geom.Polygon; + import com.vividsolutions.jts.io.WKTReader; import de.intevation.gnv.geobackend.util.RedundancyRemover; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.SQLWarning; +import java.sql.Statement; + +import org.apache.log4j.Logger; + /** * This Class wrapps an SDE-Statment to an java.sql.Statement. * This Class also handles the SDE-Specific -Spatial-Queries and diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEUtils.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEUtils.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEUtils.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,19 +1,17 @@ -/** - * - */ package de.intevation.gnv.geobackend.sde.datasources; -import org.apache.log4j.Logger; - import com.esri.sde.sdk.client.SDEPoint; import com.esri.sde.sdk.client.SeError; import com.esri.sde.sdk.client.SeException; + import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.Point; import com.vividsolutions.jts.geom.Polygon; +import org.apache.log4j.Logger; + /** * The class ArcSDEUtils fulfills the following purposes: * diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ColDefinition.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ColDefinition.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ColDefinition.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.geobackend.sde.datasources; import org.apache.log4j.Logger; diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/RasterObject.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/RasterObject.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/RasterObject.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.geobackend.sde.datasources; import com.vividsolutions.jts.geom.Coordinate; diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ResultSet.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ResultSet.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ResultSet.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.geobackend.sde.datasources; import org.apache.log4j.Logger; diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/Row.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/Row.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/Row.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,21 +1,19 @@ -/** - * - */ package de.intevation.gnv.geobackend.sde.datasources; +import com.esri.sde.sdk.client.SDEPoint; +import com.esri.sde.sdk.client.SeException; +import com.esri.sde.sdk.client.SeShape; + +import de.intevation.gnv.geobackend.sde.datasources.exception.TechnicalException; + +import de.intevation.gnv.geobackend.util.DateUtils; + import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import org.apache.log4j.Logger; -import com.esri.sde.sdk.client.SDEPoint; -import com.esri.sde.sdk.client.SeException; -import com.esri.sde.sdk.client.SeShape; - -import de.intevation.gnv.geobackend.sde.datasources.exception.TechnicalException; -import de.intevation.gnv.geobackend.util.DateUtils; - /** * A Row represents a set of values. * In a technical manner (e.g. database manner) a row contains all attributes of a single "hit". diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/SDEResultSet.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/SDEResultSet.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/SDEResultSet.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,12 +1,14 @@ -/** - * - */ package de.intevation.gnv.geobackend.sde.datasources; +import de.intevation.gnv.geobackend.sde.datasources.exception.TechnicalException; + import java.io.InputStream; import java.io.Reader; + import java.math.BigDecimal; + import java.net.URL; + import java.sql.Array; import java.sql.Blob; import java.sql.Clob; @@ -21,6 +23,7 @@ import java.sql.Statement; import java.sql.Time; import java.sql.Timestamp; + import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; @@ -29,8 +32,6 @@ import org.apache.log4j.Logger; -import de.intevation.gnv.geobackend.sde.datasources.exception.TechnicalException; - /** * SDEResultSet is an Implementation of the Interface @see java.sql.resultSet * It is an Wrapper between the resultsets whcih are produced using the ArcSDE diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/exception/DatasourceException.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/exception/DatasourceException.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/exception/DatasourceException.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.geobackend.sde.datasources.exception; /** @@ -51,4 +48,4 @@ super(pCause); } -} \ No newline at end of file +} diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/exception/TechnicalException.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/exception/TechnicalException.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/exception/TechnicalException.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.geobackend.sde.datasources.exception; import org.apache.log4j.Logger; diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/main/java/de/intevation/gnv/geobackend/util/DateUtils.java --- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/util/DateUtils.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/util/DateUtils.java Mon Mar 29 09:22:07 2010 +0000 @@ -16,11 +16,11 @@ package de.intevation.gnv.geobackend.util; import java.text.SimpleDateFormat; + import java.util.Date; import org.apache.log4j.Logger; - /** * The class DateUtils fulfills the following purposes: * @author blume diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/test/java/de/intevation/gnv/geobackend/base/query/QueryExecutorTestCase.java --- a/geo-backend/src/test/java/de/intevation/gnv/geobackend/base/query/QueryExecutorTestCase.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/test/java/de/intevation/gnv/geobackend/base/query/QueryExecutorTestCase.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,24 +1,26 @@ -/** - * - */ package de.intevation.gnv.geobackend.base.query; +import de.intevation.gnv.geobackend.base.Result; +import de.intevation.gnv.geobackend.base.ResultDescriptor; + +import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPoolFactory; + +import de.intevation.gnv.geobackend.base.query.container.QueryContainerFactory; + +import de.intevation.gnv.geobackend.base.query.exception.QueryException; + import java.io.FileInputStream; import java.io.InputStream; + import java.util.Collection; import java.util.Iterator; import java.util.Properties; +import junit.framework.TestCase; + import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; -import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.geobackend.base.ResultDescriptor; -import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPoolFactory; -import de.intevation.gnv.geobackend.base.query.container.QueryContainerFactory; -import de.intevation.gnv.geobackend.base.query.exception.QueryException; -import junit.framework.TestCase; - /** * TestCase for the QueryExecutor interface * @author Tim Englich diff -r 1c3efbd2fc5a -r 8b442223741c geo-backend/src/test/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnectionPoolTestCase.java --- a/geo-backend/src/test/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnectionPoolTestCase.java Mon Mar 29 07:49:16 2010 +0000 +++ b/geo-backend/src/test/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnectionPoolTestCase.java Mon Mar 29 09:22:07 2010 +0000 @@ -1,25 +1,29 @@ package de.intevation.gnv.geobackend.sde.datasources; +import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPool; +import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPoolFactory; + +import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; + +import de.intevation.gnv.geobackend.sde.connectionpool.ArcSDEPoolableObjectFactory; + import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; + import java.sql.Connection; +import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; + import java.util.Properties; -import java.sql.ResultSet; import junit.framework.TestCase; import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; -import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPool; -import de.intevation.gnv.geobackend.base.connectionpool.ConnectionPoolFactory; -import de.intevation.gnv.geobackend.base.connectionpool.exception.ConnectionException; -import de.intevation.gnv.geobackend.sde.connectionpool.ArcSDEPoolableObjectFactory; - /** * TestCase for the usage of the ArcSDEConnectionPool. * @author Tim Englich