Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/WithinGeometryEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/WithinGeometryEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/WithinGeometryEvaluator.java	(revision 44043)
@@ -24,7 +24,7 @@
 
 import org.cresques.cts.ICoordTrans;
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
 import org.gvsig.fmap.dal.feature.FeatureType;
@@ -42,28 +42,6 @@
     private final ExpressionBuilder builder;
     private final IProjection projection;
     private final FeatureAttributeDescriptor fad;
-
-    /**
-     * @param geometry
-     * @param projection
-     * @param featureType
-     * @param geomName
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     */
-    public WithinGeometryEvaluator(
-            Geometry geometry,
-            IProjection projection,
-            FeatureType featureType,
-            String geomName
-    ) {
-        this(
-                geometry, 
-                projection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }   
     
     WithinGeometryEvaluator(
             Geometry geometry,
@@ -126,7 +104,7 @@
         return this.builder.set(
                 builder.ST_Within(
                         builder.geometry(geometry, projection),
-                        builder.column(fad)
+                        builder.column(fad.getName())
                 )
         ).toString();
     }
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/IntersectsEnvelopeEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/IntersectsEnvelopeEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/IntersectsEnvelopeEvaluator.java	(revision 44043)
@@ -23,7 +23,7 @@
 package org.gvsig.fmap.mapcontext.layers.vectorial;
 
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
@@ -43,29 +43,7 @@
     private final IProjection projection;
     private final ExpressionBuilder builder;
     FeatureAttributeDescriptor fad;
-    
-    /**
-     * @param envelope
-     * @param envelopeProjection
-     * @param featureType
-     * @param geomName
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     */
-    public IntersectsEnvelopeEvaluator(
-            Envelope envelope,
-            IProjection envelopeProjection, 
-            FeatureType featureType,
-            String geomName
-    ) {
-        this(
-                envelope, 
-                envelopeProjection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }   
-    
+        
     IntersectsEnvelopeEvaluator(
             Envelope envelope,
             IProjection envelopeProjection, 
@@ -110,14 +88,10 @@
 
     @Override
     public String getSQL() {
-        // Los gestores de BBDD no usan indices si se envuelve la columna 
-        // geometria con la funcion ST_envelope.
-        
         return builder.set(
                 builder.ST_Intersects(
-                        builder.geometry(envelope.getGeometry(), this.projection), 
-                        // builder.ST_Envelope(builder.column(geomName))
-                        builder.column(fad)
+                        builder.ST_Envelope(builder.column(fad.getName())),
+                        builder.geometry(envelope.getGeometry(), this.projection)
                 )
         ).toString();
     }
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/OutGeometryEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/OutGeometryEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/OutGeometryEvaluator.java	(revision 44043)
@@ -24,7 +24,7 @@
 
 import org.cresques.cts.ICoordTrans;
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
 import org.gvsig.fmap.dal.feature.FeatureType;
@@ -42,28 +42,6 @@
     private final ExpressionBuilder builder;
     private final IProjection projection;
     private final FeatureAttributeDescriptor fad;
-
-    /**
-     * @param geometry
-     * @param envelopeProjection
-     * @param featureType
-     * @param geomName
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     */
-    public OutGeometryEvaluator(
-            Geometry geometry,
-            IProjection envelopeProjection, 
-            FeatureType featureType,
-            String geomName
-    ) {
-        this(
-                geometry, 
-                envelopeProjection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }   
     
     OutGeometryEvaluator(
             Geometry geometry,
@@ -127,7 +105,7 @@
                 builder.not(
                     builder.ST_Contains(
                             builder.geometry(geometry, projection),
-                            builder.column(fad)
+                            builder.column(fad.getName())
                     )
                 )
         ).toString();
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/TouchesGeometryEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/TouchesGeometryEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/TouchesGeometryEvaluator.java	(revision 44043)
@@ -24,7 +24,7 @@
 
 import org.cresques.cts.ICoordTrans;
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
 import org.gvsig.fmap.dal.feature.FeatureType;
@@ -42,27 +42,6 @@
     private final ExpressionBuilder builder;
     private final IProjection projection;
     private final FeatureAttributeDescriptor fad;
-
-    /**
-     * @param geometry
-     * @param projection
-     * @param featureType
-     * @param geomName
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     */
-    public TouchesGeometryEvaluator(Geometry geometry,
-            IProjection projection,
-            FeatureType featureType,
-            String geomName
-    ) {
-        this(
-                geometry, 
-                projection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }   
     
     TouchesGeometryEvaluator(Geometry geometry,
             IProjection projection,
@@ -124,7 +103,7 @@
         return this.builder.set(
                 builder.ST_Touches(
                         builder.geometry(geometry, projection),
-                        builder.column(fad)
+                        builder.column(fad.getName())
                 )
         ).toString();
     }
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/CrossEnvelopeEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/CrossEnvelopeEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/CrossEnvelopeEvaluator.java	(revision 44043)
@@ -23,7 +23,7 @@
 package org.gvsig.fmap.mapcontext.layers.vectorial;
 
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
@@ -43,28 +43,6 @@
     private final ExpressionBuilder builder;
     private final IProjection projection;
     private final FeatureAttributeDescriptor fad;
-
-    /**
-     * @param envelope
-     * @param envelopeProjection
-     * @param featureType
-     * @param geomName
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     */
-    public CrossEnvelopeEvaluator(
-            Envelope envelope,
-            IProjection envelopeProjection, 
-            FeatureType featureType,
-            String geomName
-    ) {
-        this(
-                envelope, 
-                envelopeProjection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }   
     
     CrossEnvelopeEvaluator(
             Envelope envelope,
@@ -79,22 +57,10 @@
         this.envelope = envelope;
         this.projection = envelopeProjection;
         this.builder = builder;
-        // this.srs = envelopeProjection.getAbrev();
-        // this.projection=CRSFactory.getCRS(fad.getSRS());
-        // this.envelopeProjection=envelopeProjection;
-//		ICoordTrans ct = null;
-//		if (!this.srs.equals(fad.getSRS())) { // FIXME comparaci�n
-//			ct = envelopeProjection.getCT(fad.getSRS());
-//		}
-//		if (ct != null) {
-//			this.envelopeTrans = envelope.convert(ct);
-//		} else {
         this.envelopeTrans = envelope;
-//		}
         this.geomName = geomName;
 
         this.getFieldsInfo().addMatchFieldValue(geomName, envelopeTrans);
-
     }
 
     @Override
@@ -128,7 +94,7 @@
         return this.builder.set(
                 builder.ST_Intersects(
                         builder.envelope(envelope, projection),
-                        builder.ST_Envelope(builder.column(fad))
+                        builder.ST_Envelope(builder.column(fad.getName()))
                 )
         ).toString();
     }
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/ContainsGeometryEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/ContainsGeometryEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/ContainsGeometryEvaluator.java	(revision 44043)
@@ -24,7 +24,7 @@
 
 import org.cresques.cts.ICoordTrans;
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
 import org.gvsig.fmap.dal.feature.FeatureType;
@@ -43,29 +43,7 @@
     private final ExpressionBuilder builder;
     private final IProjection projection;
     private final FeatureAttributeDescriptor fad;
-
-    /**
-     * @param geometry
-     * @param projection
-     * @param featureType
-     * @param geomName
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     */
-    public ContainsGeometryEvaluator(
-            Geometry geometry,
-            IProjection projection,
-            FeatureType featureType,
-            String geomName
-    ) {
-        this(
-                geometry, 
-                projection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }   
-    
+ 
     ContainsGeometryEvaluator(
             Geometry geometry,
             IProjection projection,
@@ -127,7 +105,7 @@
         return this.builder.set(
                 builder.ST_Contains(
                         builder.geometry(geometry, projection),
-                        builder.column(fad)
+                        builder.column(fad.getName())
                 )
         ).toString();
     }
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/CrossesGeometryEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/CrossesGeometryEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/CrossesGeometryEvaluator.java	(revision 44043)
@@ -24,7 +24,7 @@
 
 import org.cresques.cts.ICoordTrans;
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
 import org.gvsig.fmap.dal.feature.FeatureType;
@@ -43,28 +43,6 @@
     private final IProjection projection;
     private final FeatureAttributeDescriptor fad;
     
-    /**
-     * @param geometry
-     * @param projection
-     * @param featureType
-     * @param geomName
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     */
-    public CrossesGeometryEvaluator(
-            Geometry geometry,
-            IProjection projection, 
-            FeatureType featureType,
-            String geomName
-    ) {
-        this(
-                geometry, 
-                projection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }   
-    
     CrossesGeometryEvaluator(
             Geometry geometry,
             IProjection projection, 
@@ -126,7 +104,7 @@
         return this.builder.set(
                 builder.ST_Crosses(
                         builder.geometry(geometry, projection),
-                        builder.column(fad)
+                        builder.column(fad.getName())
                 )
         ).toString();
     }
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/DisjointGeometryEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/DisjointGeometryEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/DisjointGeometryEvaluator.java	(revision 44043)
@@ -24,7 +24,7 @@
 
 import org.cresques.cts.ICoordTrans;
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
 import org.gvsig.fmap.dal.feature.FeatureType;
@@ -43,29 +43,7 @@
     private final ExpressionBuilder builder;
     private final IProjection projection;
     private final FeatureAttributeDescriptor fad;
-    
-    /**
-     * @param geometry
-     * @param projection
-     * @param featureType
-     * @param geomName
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     */
-    public DisjointGeometryEvaluator(
-            Geometry geometry,
-            IProjection projection,
-            FeatureType featureType,
-            String geomName
-    ) {
-        this(
-                geometry, 
-                projection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }   
-    
+        
     DisjointGeometryEvaluator(
             Geometry geometry,
             IProjection projection,
@@ -127,7 +105,7 @@
         return this.builder.set(
                 builder.ST_Disjoint(
                         builder.geometry(geometry, projection),
-                        builder.column(fad)
+                        builder.column(fad.getName())
                 )
         ).toString();
     }
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/IntersectsGeometryEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/IntersectsGeometryEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/IntersectsGeometryEvaluator.java	(revision 44043)
@@ -24,7 +24,7 @@
 
 import org.cresques.cts.ICoordTrans;
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
 import org.gvsig.fmap.dal.feature.FeatureType;
@@ -42,29 +42,7 @@
     private final ExpressionBuilder builder;
     private final IProjection projection;
     private final FeatureAttributeDescriptor fad;
-    
-    /**
-     * @param geometry
-     * @param projection
-     * @param featureType
-     * @param geomName
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     */
-    public IntersectsGeometryEvaluator(
-            Geometry geometry,
-            IProjection projection,
-            FeatureType featureType,
-            String geomName
-        ) {
-        this(
-                geometry, 
-                projection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }   
-    
+       
     IntersectsGeometryEvaluator(
             Geometry geometry,
             IProjection projection,
@@ -123,8 +101,8 @@
     public String getSQL() {
         return builder.set(
                 builder.ST_Intersects(
-                        builder.geometry(geometry, this.projection),
-                        builder.column(this.fad)
+                        builder.column(this.fad.getName()),
+                        builder.geometry(geometry, this.projection)
                 )
         ).toString();
     }
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/EqualsGeometryEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/EqualsGeometryEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/EqualsGeometryEvaluator.java	(revision 44043)
@@ -24,7 +24,7 @@
 
 import org.cresques.cts.ICoordTrans;
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
 import org.gvsig.fmap.dal.feature.FeatureType;
@@ -43,28 +43,6 @@
     private final IProjection projection;
     private final FeatureAttributeDescriptor fad;
 
-    /**
-     * @param geometry
-     * @param projection
-     * @param featureType
-     * @param geomName
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     */
-    public EqualsGeometryEvaluator(
-            Geometry geometry,
-            IProjection projection,
-            FeatureType featureType,
-            String geomName
-    ) {
-        this(
-                geometry, 
-                projection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }   
-    
     EqualsGeometryEvaluator(
             Geometry geometry,
             IProjection projection,
@@ -126,7 +104,7 @@
         return this.builder.set(
                 builder.ST_Equals(
                         builder.geometry(geometry, projection),
-                        builder.column(fad)
+                        builder.column(fad.getName())
                 )
         ).toString();
     }
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/OverlapsGeometryEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/OverlapsGeometryEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/OverlapsGeometryEvaluator.java	(revision 44043)
@@ -24,7 +24,7 @@
 
 import org.cresques.cts.ICoordTrans;
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
 import org.gvsig.fmap.dal.feature.FeatureType;
@@ -48,28 +48,6 @@
     private final IProjection projection;
     private final FeatureAttributeDescriptor fad;
 
-    /**
-     * @param geometry
-     * @param projection
-     * @param featureType
-     * @param geomName
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     */
-    public OverlapsGeometryEvaluator(
-            Geometry geometry,
-            IProjection projection,
-            FeatureType featureType,
-            String geomName
-    ) {
-        this(
-                geometry, 
-                projection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }   
-    
     OverlapsGeometryEvaluator(
             Geometry geometry,
             IProjection projection,
@@ -132,7 +110,7 @@
         return this.builder.set(
                 builder.ST_Overlaps(
                         builder.geometry(geometry, projection),
-                        builder.column(fad)
+                        builder.column(fad.getName())
                 )
         ).toString();
     }
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/SpatialEvaluatorsFactory.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/SpatialEvaluatorsFactory.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/SpatialEvaluatorsFactory.java	(revision 44043)
@@ -1,12 +1,10 @@
 package org.gvsig.fmap.mapcontext.layers.vectorial;
 
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.DALLocator;
-import org.gvsig.fmap.dal.DataManager;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 import org.gvsig.fmap.dal.exception.DataException;
 import org.gvsig.fmap.dal.feature.FeatureStore;
 import org.gvsig.fmap.dal.feature.FeatureType;
-import org.gvsig.fmap.dal.ExpressionBuilder;
 import org.gvsig.fmap.geom.Geometry;
 import org.gvsig.fmap.geom.primitive.Envelope;
 import org.gvsig.tools.evaluator.Evaluator;
@@ -23,13 +21,13 @@
         
     }
     
-    public ExpressionBuilder createBuilder() {
-        DataManager manager = DALLocator.getDataManager();
-        ExpressionBuilder builder = manager.createExpressionBuilder();
-        return builder;
-    }
+//    public ExpressionBuilder createBuilder() {
+//        DataManager manager = DALLocator.getDataManager();
+//        ExpressionBuilder builder = manager.createSQLBuilder();
+//        return builder;
+//    }
     
-    public Evaluator intersects(
+    private Evaluator intersects(
             Geometry geometry,
             IProjection projection, 
             FeatureType featureType,
@@ -39,7 +37,7 @@
         return new IntersectsGeometryEvaluator(geometry, projection, featureType, geomName, builder);
     }
     
-    public Evaluator intersects(
+    private Evaluator intersects(
             Envelope envelope,
             IProjection projection, 
             FeatureType featureType,
@@ -57,7 +55,7 @@
         try {
             FeatureType featureType = store.getDefaultFeatureType();
             String geomName = featureType.getDefaultGeometryAttributeName();
-            ExpressionBuilder builder = store.createExpressionBuilder();
+            ExpressionBuilder builder = (ExpressionBuilder) store.createExpressionBuilder();
             return intersects(geometry, projection, featureType, geomName,builder);
         } catch (DataException ex) {
             throw new RuntimeException("Can't create intersects evaluator.",ex);
@@ -79,7 +77,7 @@
         }
     }
 
-    public Evaluator contains(
+    private Evaluator contains(
             Envelope envelope,
             IProjection projection, 
             FeatureType featureType,
@@ -89,7 +87,7 @@
         return new ContainsEnvelopeEvaluator(envelope, projection, featureType, geomName, builder);
     }
 
-    public Evaluator contains(
+    private Evaluator contains(
             Geometry geometry,
             IProjection projection, 
             FeatureType featureType,
@@ -129,7 +127,7 @@
         }
     }
 
-    public Evaluator not_contains(
+    private Evaluator not_contains(
             Geometry geometry,
             IProjection projection, 
             FeatureType featureType,
@@ -164,7 +162,7 @@
         return new CrossesGeometryEvaluator(geometry, projection, featureType, geomName, builder);
     }
 
-    public Evaluator crosses(
+    private Evaluator crosses(
             Envelope envelope,
             IProjection projection, 
             FeatureType featureType,
@@ -204,7 +202,7 @@
         }
     }
 
-    public Evaluator disjoint(
+    private Evaluator disjoint(
             Geometry geometry,
             IProjection projection, 
             FeatureType featureType,
@@ -229,7 +227,7 @@
         }
     }
     
-    public Evaluator overlaps(
+    private Evaluator overlaps(
             Geometry geometry,
             IProjection projection, 
             FeatureType featureType,
@@ -254,7 +252,7 @@
         }
     }
     
-    public Evaluator touches(
+    private Evaluator touches(
             Geometry geometry,
             IProjection projection, 
             FeatureType featureType,
@@ -279,7 +277,7 @@
         }
     }
     
-    public Evaluator within(
+    private Evaluator within(
             Geometry geometry,
             IProjection projection, 
             FeatureType featureType,
@@ -304,7 +302,7 @@
         }
     }
     
-    public Evaluator equals(
+    private Evaluator equals(
             Geometry geometry,
             IProjection projection, 
             FeatureType featureType,
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/ContainsEnvelopeEvaluator.java
===================================================================
--- trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/ContainsEnvelopeEvaluator.java	(revision 44042)
+++ trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/ContainsEnvelopeEvaluator.java	(revision 44043)
@@ -23,7 +23,7 @@
 package org.gvsig.fmap.mapcontext.layers.vectorial;
 
 import org.cresques.cts.IProjection;
-import org.gvsig.fmap.dal.ExpressionBuilder;
+import org.gvsig.expressionevaluator.ExpressionBuilder;
 
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
@@ -43,29 +43,7 @@
     private final ExpressionBuilder builder;
     private final IProjection projection;
     private final FeatureAttributeDescriptor fad;
-    
-    /**
-     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
-     * @param envelope
-     * @param envelopeProjection
-     * @param featureType
-     * @param geomName
-     */
-    public ContainsEnvelopeEvaluator(
-            Envelope envelope,
-            IProjection envelopeProjection,
-            FeatureType featureType,
-            String geomName
-        ) {
-        this(
-                envelope, 
-                envelopeProjection, 
-                featureType, 
-                geomName, 
-                SpatialEvaluatorsFactory.getInstance().createBuilder()
-        );
-    }
-    
+
     ContainsEnvelopeEvaluator(
             Envelope envelope,
             IProjection envelopeProjection,
@@ -78,21 +56,9 @@
         this.projection = envelopeProjection;
         this.builder = builder;
         this.envelope = envelope;
-        // this.srs = envelopeProjection.getAbrev();
-        // this.projection=CRSFactory.getCRS(fad.getSRS());
-        // this.envelopeProjection=envelopeProjection;
-//		ICoordTrans ct = null;
-//		if (!this.srs.equals(fad.getSRS())) { // FIXME comparaci�n
-//			ct = envelopeProjection.getCT(fad.getSRS());
-//		}
-//		if (ct != null) {
-//			this.envelopeTrans = envelope.convert(ct);
-//		} else {
         this.envelopeTrans = envelope;
-//		}
         this.geomName = geomName;
         this.getFieldsInfo().addMatchFieldValue(geomName, envelopeTrans);
-
     }
 
     @Override
@@ -122,7 +88,7 @@
         return this.builder.set(
                 builder.ST_Contains(
                         builder.envelope(envelope, projection),
-                        builder.column(fad)
+                        builder.column(fad.getName())
                 )
         ).toString();
     }
