Revision 43088 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

View differences:

SpatialEvaluatorsFactory.java
57 57 
        try {
58 58 
            FeatureType featureType = store.getDefaultFeatureType();
59 59 
            String geomName = featureType.getDefaultGeometryAttributeName();
60 
            ExpressionBuilder builder = store.createExpressionBuilder();
60 
            ExpressionBuilder builder = store.createExpression();
61 61 
            return intersects(geometry, projection, featureType, geomName,builder);
62 62 
        } catch (DataException ex) {
63 63 
            throw new RuntimeException("Can't create intersects evaluator.",ex);
......
72 72 
        try {
73 73 
            FeatureType featureType = store.getDefaultFeatureType();
74 74 
            String geomName = featureType.getDefaultGeometryAttributeName();
75 
            ExpressionBuilder builder = store.createExpressionBuilder();
75 
            ExpressionBuilder builder = store.createExpression();
76 76 
            return intersects(envelope, projection, featureType, geomName,builder);
77 77 
        } catch (DataException ex) {
78 78 
            throw new RuntimeException("Can't create intersects evaluator.",ex);
......
107 107 
        try {
108 108 
            FeatureType featureType = store.getDefaultFeatureType();
109 109 
            String geomName = featureType.getDefaultGeometryAttributeName();
110 
            ExpressionBuilder builder = store.createExpressionBuilder();
110 
            ExpressionBuilder builder = store.createExpression();
111 111 
            return this.contains(geometry, projection, featureType, geomName,builder);
112 112 
        } catch (DataException ex) {
113 113 
            throw new RuntimeException("Can't create contains evaluator.",ex);
......
122 122 
        try {
123 123 
            FeatureType featureType = store.getDefaultFeatureType();
124 124 
            String geomName = featureType.getDefaultGeometryAttributeName();
125 
            ExpressionBuilder builder = store.createExpressionBuilder();
125 
            ExpressionBuilder builder = store.createExpression();
126 126 
            return this.contains(envelope, projection, featureType, geomName,builder);
127 127 
        } catch (DataException ex) {
128 128 
            throw new RuntimeException("Can't create contains evaluator.",ex);
......
147 147 
        try {
148 148 
            FeatureType featureType = store.getDefaultFeatureType();
149 149 
            String geomName = featureType.getDefaultGeometryAttributeName();
150 
            ExpressionBuilder builder = store.createExpressionBuilder();
150 
            ExpressionBuilder builder = store.createExpression();
151 151 
            return this.not_contains(geometry, projection, featureType, geomName,builder);
152 152 
        } catch (DataException ex) {
153 153 
            throw new RuntimeException("Can't create not_contains evaluator.",ex);
......
182 182 
        try {
183 183 
            FeatureType featureType = store.getDefaultFeatureType();
184 184 
            String geomName = featureType.getDefaultGeometryAttributeName();
185 
            ExpressionBuilder builder = store.createExpressionBuilder();
185 
            ExpressionBuilder builder = store.createExpression();
186 186 
            return this.crosses(geometry, projection, featureType, geomName,builder);
187 187 
        } catch (DataException ex) {
188 188 
            throw new RuntimeException("Can't create crosses evaluator.",ex);
......
197 197 
        try {
198 198 
            FeatureType featureType = store.getDefaultFeatureType();
199 199 
            String geomName = featureType.getDefaultGeometryAttributeName();
200 
            ExpressionBuilder builder = store.createExpressionBuilder();
200 
            ExpressionBuilder builder = store.createExpression();
201 201 
            return this.crosses(envelope, projection, featureType, geomName,builder);
202 202 
        } catch (DataException ex) {
203 203 
            throw new RuntimeException("Can't create crosses evaluator.",ex);
......
222 222 
        try {
223 223 
            FeatureType featureType = store.getDefaultFeatureType();
224 224 
            String geomName = featureType.getDefaultGeometryAttributeName();
225 
            ExpressionBuilder builder = store.createExpressionBuilder();
225 
            ExpressionBuilder builder = store.createExpression();
226 226 
            return this.disjoint(geometry, projection, featureType, geomName,builder);
227 227 
        } catch (DataException ex) {
228 228 
            throw new RuntimeException("Can't create disjoint evaluator.",ex);
......
247 247 
        try {
248 248 
            FeatureType featureType = store.getDefaultFeatureType();
249 249 
            String geomName = featureType.getDefaultGeometryAttributeName();
250 
            ExpressionBuilder builder = store.createExpressionBuilder();
250 
            ExpressionBuilder builder = store.createExpression();
251 251 
            return this.overlaps(geometry, projection, featureType, geomName,builder);
252 252 
        } catch (DataException ex) {
253 253 
            throw new RuntimeException("Can't create overlaps evaluator.",ex);
......
272 272 
        try {
273 273 
            FeatureType featureType = store.getDefaultFeatureType();
274 274 
            String geomName = featureType.getDefaultGeometryAttributeName();
275 
            ExpressionBuilder builder = store.createExpressionBuilder();
275 
            ExpressionBuilder builder = store.createExpression();
276 276 
            return this.touches(geometry, projection, featureType, geomName,builder);
277 277 
        } catch (DataException ex) {
278 278 
            throw new RuntimeException("Can't create touches evaluator.",ex);
......
297 297 
        try {
298 298 
            FeatureType featureType = store.getDefaultFeatureType();
299 299 
            String geomName = featureType.getDefaultGeometryAttributeName();
300 
            ExpressionBuilder builder = store.createExpressionBuilder();
300 
            ExpressionBuilder builder = store.createExpression();
301 301 
            return this.within(geometry, projection, featureType, geomName,builder);
302 302 
        } catch (DataException ex) {
303 303 
            throw new RuntimeException("Can't create within evaluator.",ex);
......
322 322 
        try {
323 323 
            FeatureType featureType = store.getDefaultFeatureType();
324 324 
            String geomName = featureType.getDefaultGeometryAttributeName();
325 
            ExpressionBuilder builder = store.createExpressionBuilder();
325 
            ExpressionBuilder builder = store.createExpression();
326 326 
            return this.equals(geometry, projection, featureType, geomName,builder);
327 327 
        } catch (DataException ex) {
328 328 
            throw new RuntimeException("Can't create equals evaluator.",ex);

Also available in: Unified diff