[Schmitzm-commits] r339 - branches/1.0-gt2-2.6/src/schmitzm/geotools

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-08-28 12:45:01 +0200 (Fri, 28 Aug 2009)
New Revision: 339

Modified:
   branches/1.0-gt2-2.6/src/schmitzm/geotools/FilterUtil.java
Log:
Further bashing down migration bugs...

Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/FilterUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/FilterUtil.java	2009-08-28 10:18:29 UTC (rev 338)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/FilterUtil.java	2009-08-28 10:45:01 UTC (rev 339)
@@ -30,10 +30,10 @@
 package schmitzm.geotools;
 
 import org.geotools.factory.CommonFactoryFinder;
-import org.geotools.filter.FilterFactoryFinder;
 import org.geotools.filter.FilterFactoryImpl;
 import org.geotools.filter.visitor.DuplicatingFilterVisitor;
 import org.opengis.filter.Filter;
+import org.opengis.filter.FilterFactory;
 import org.opengis.filter.FilterFactory2;
 
 import com.vividsolutions.jts.geom.GeometryFactory;
@@ -45,10 +45,11 @@
  * @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
  * 
  * @version 1.01
+ * 
  */
 public class FilterUtil {
-  /** Instanz von {@link FilterFactoryImpl}. */
-  public static final FilterFactoryImpl FILTER_FAC   = (FilterFactoryImpl)FilterFactoryFinder.createFilterFactory();
+  /** Instanz von {@link FilterFactory}. */
+  public static final FilterFactory FILTER_FAC  = CommonFactoryFinder.getFilterFactory(null);
   /** Globale Instanz von {@link FilterFactory2} **/
   public static final FilterFactory2 FILTER_FAC2 = CommonFactoryFinder.getFilterFactory2(null);
   /** Instanz von {@link GeometryFactory}. */
@@ -60,7 +61,7 @@
    */
   public static Filter cloneFilter(Filter filter) {
 	DuplicatingFilterVisitor dfv = new DuplicatingFilterVisitor(FILTER_FAC2);
-    Filter newFilter = (Filter) dfv.visit( filter , (Object)null);
+    Filter newFilter = (Filter) dfv.visit( filter , (Object)null );
     return newFilter;
   }
 }