[Geotools-commits] svn - r27257 - in geotools/trunk/gt/modules: library/jdbc/src/test/java/org/geotools/data/jdbc library/jdbc/src/test/java/org/geotools/filter plugin/postgis/src/main/java/org/geotools/data/postgis plugin/postgis/src/test/java/org/geotools/filter

[<aa...@sv...>]

Author: aaime
Date: 2007-09-30 11:54:13 -0700 (Sun, 30 Sep 2007)
New Revision: 27257

Modified:
   geotools/trunk/gt/modules/library/jdbc/src/test/java/org/geotools/data/jdbc/SQLFilterTestSupport.java
   geotools/trunk/gt/modules/library/jdbc/src/test/java/org/geotools/filter/SQLFilterTestSupport.java
   geotools/trunk/gt/modules/plugin/postgis/src/main/java/org/geotools/data/postgis/PostgisDataStore.java
   geotools/trunk/gt/modules/plugin/postgis/src/test/java/org/geotools/filter/SQLEncoderPostgisGeosTest.java
   geotools/trunk/gt/modules/plugin/postgis/src/test/java/org/geotools/filter/SQLEncoderPostgisTest.java
Log:
More AttributeTypeFactory removal fixes

Modified: geotools/trunk/gt/modules/library/jdbc/src/test/java/org/geotools/data/jdbc/SQLFilterTestSupport.java
===================================================================
--- geotools/trunk/gt/modules/library/jdbc/src/test/java/org/geotools/data/jdbc/SQLFilterTestSupport.java	2007-09-30 18:51:27 UTC (rev 27256)
+++ geotools/trunk/gt/modules/library/jdbc/src/test/java/org/geotools/data/jdbc/SQLFilterTestSupport.java	2007-09-30 18:54:13 UTC (rev 27257)
@@ -19,7 +19,6 @@
 
 import junit.framework.TestCase;
 
-import org.geotools.feature.AttributeTypeFactory;
 import org.geotools.feature.IllegalAttributeException;
 import org.geotools.feature.SchemaException;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
@@ -42,7 +41,6 @@
     /** Standard logging instance */
     protected static final Logger LOGGER = Logger.getLogger(
             "org.geotools.filter");
-    protected static AttributeTypeFactory attFactory = AttributeTypeFactory.defaultInstance();
 
     /** Schema on which to preform tests */
     protected static SimpleFeatureType testSchema = null;

Modified: geotools/trunk/gt/modules/library/jdbc/src/test/java/org/geotools/filter/SQLFilterTestSupport.java
===================================================================
--- geotools/trunk/gt/modules/library/jdbc/src/test/java/org/geotools/filter/SQLFilterTestSupport.java	2007-09-30 18:51:27 UTC (rev 27256)
+++ geotools/trunk/gt/modules/library/jdbc/src/test/java/org/geotools/filter/SQLFilterTestSupport.java	2007-09-30 18:54:13 UTC (rev 27257)
@@ -19,8 +19,6 @@
 
 import junit.framework.TestCase;
 
-import org.geotools.feature.AttributeTypeFactory;
-import org.geotools.feature.FeatureTypeFactory;
 import org.geotools.feature.IllegalAttributeException;
 import org.geotools.feature.SchemaException;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
@@ -43,7 +41,6 @@
     /** Standard logging instance */
     protected static final Logger LOGGER = Logger.getLogger(
             "org.geotools.filter");
-    protected static AttributeTypeFactory attFactory = AttributeTypeFactory.defaultInstance();
 
     /** Schema on which to preform tests */
     protected static SimpleFeatureType testSchema = null;

Modified: geotools/trunk/gt/modules/plugin/postgis/src/main/java/org/geotools/data/postgis/PostgisDataStore.java
===================================================================
--- geotools/trunk/gt/modules/plugin/postgis/src/main/java/org/geotools/data/postgis/PostgisDataStore.java	2007-09-30 18:51:27 UTC (rev 27256)
+++ geotools/trunk/gt/modules/plugin/postgis/src/main/java/org/geotools/data/postgis/PostgisDataStore.java	2007-09-30 18:54:13 UTC (rev 27257)
@@ -24,7 +24,6 @@
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -49,7 +48,6 @@
 import org.geotools.data.Query;
 import org.geotools.data.ReTypeFeatureReader;
 import org.geotools.data.Transaction;
-import org.geotools.data.jdbc.ConnectionPool;
 import org.geotools.data.jdbc.FeatureTypeInfo;
 import org.geotools.data.jdbc.JDBCDataStore;
 import org.geotools.data.jdbc.JDBCDataStoreConfig;
@@ -70,21 +68,14 @@
 import org.geotools.factory.GeoTools;
 import org.geotools.factory.Hints;
 import org.geotools.feature.AttributeTypeBuilder;
-import org.geotools.feature.AttributeTypeFactory;
 import org.geotools.feature.FeatureTypes;
-import org.geotools.filter.CompareFilter;
+import org.geotools.filter.SQLEncoderPostgis;
+import org.geotools.referencing.NamedIdentifier;
+import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.opengis.feature.type.AttributeDescriptor;
 import org.opengis.feature.type.GeometryDescriptor;
 import org.opengis.filter.Filter;
-import org.opengis.filter.PropertyIsLessThan;
-import org.opengis.filter.PropertyIsLessThanOrEqualTo;
-import org.geotools.filter.FilterType;
-import org.geotools.filter.LengthFunction;
-import org.geotools.filter.LiteralExpression;
-import org.geotools.filter.SQLEncoderPostgis;
-import org.geotools.referencing.NamedIdentifier;
-import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.opengis.referencing.FactoryException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 

Modified: geotools/trunk/gt/modules/plugin/postgis/src/test/java/org/geotools/filter/SQLEncoderPostgisGeosTest.java
===================================================================
--- geotools/trunk/gt/modules/plugin/postgis/src/test/java/org/geotools/filter/SQLEncoderPostgisGeosTest.java	2007-09-30 18:51:27 UTC (rev 27256)
+++ geotools/trunk/gt/modules/plugin/postgis/src/test/java/org/geotools/filter/SQLEncoderPostgisGeosTest.java	2007-09-30 18:54:13 UTC (rev 27257)
@@ -21,7 +21,6 @@
 
 import org.geotools.data.jdbc.fidmapper.BasicFIDMapper;
 import org.geotools.data.jdbc.fidmapper.TypedFIDMapper;
-import org.geotools.feature.AttributeTypeFactory;
 import org.geotools.feature.FeatureTypeFactory;
 import org.geotools.feature.IllegalAttributeException;
 import org.geotools.feature.SchemaException;
@@ -49,9 +48,6 @@
 	   /** Standard logging instance */
     protected static final Logger LOGGER = Logger.getLogger(
             "org.geotools.filter");
-    protected static AttributeTypeFactory attFactory = AttributeTypeFactory
-        .defaultInstance();
-
     /** Schema on which to preform tests */
     protected static SimpleFeatureType testSchema = null;
 

Modified: geotools/trunk/gt/modules/plugin/postgis/src/test/java/org/geotools/filter/SQLEncoderPostgisTest.java
===================================================================
--- geotools/trunk/gt/modules/plugin/postgis/src/test/java/org/geotools/filter/SQLEncoderPostgisTest.java	2007-09-30 18:51:27 UTC (rev 27256)
+++ geotools/trunk/gt/modules/plugin/postgis/src/test/java/org/geotools/filter/SQLEncoderPostgisTest.java	2007-09-30 18:54:13 UTC (rev 27257)
@@ -23,7 +23,6 @@
 
 import org.geotools.data.jdbc.fidmapper.BasicFIDMapper;
 import org.geotools.data.jdbc.fidmapper.TypedFIDMapper;
-import org.geotools.feature.AttributeTypeFactory;
 import org.geotools.feature.IllegalAttributeException;
 import org.geotools.feature.SchemaException;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
@@ -48,8 +47,6 @@
     /** Standard logging instance */
     protected static final Logger LOGGER = Logger.getLogger(
             "org.geotools.filter");
-    protected static AttributeTypeFactory attFactory = AttributeTypeFactory
-        .defaultInstance();
 
     /** Schema on which to preform tests */
     protected static SimpleFeatureType testSchema = null;