Revision 43521 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/DefaultFeatureStore.java

View differences:

DefaultFeatureStore.java
49 49
import org.gvsig.fmap.dal.DataStoreNotification;
50 50
import org.gvsig.fmap.dal.DataStoreParameters;
51 51
import org.gvsig.fmap.dal.DataStoreProviderFactory;
52
import org.gvsig.fmap.dal.ExpressionEvaluator;
52
import org.gvsig.fmap.dal.ExpressionBuilder;
53 53
import org.gvsig.fmap.dal.exception.CloneException;
54 54
import org.gvsig.fmap.dal.exception.CloseException;
55 55
import org.gvsig.fmap.dal.exception.CreateException;
......
74 74
import org.gvsig.fmap.dal.feature.FeatureSet;
75 75
import org.gvsig.fmap.dal.feature.FeatureStore;
76 76
import org.gvsig.fmap.dal.feature.FeatureStoreNotification;
77
import org.gvsig.fmap.dal.feature.FeatureStoreProviderFactory;
78 77
import org.gvsig.fmap.dal.feature.FeatureStoreTransforms;
79 78
import org.gvsig.fmap.dal.feature.FeatureType;
80 79
import org.gvsig.fmap.dal.feature.NewFeatureStoreParameters;
......
124 123
import org.gvsig.fmap.dal.spi.DataStoreInitializer2;
125 124
import org.gvsig.fmap.dal.spi.DataStoreProvider;
126 125
import org.gvsig.fmap.dal.spi.DataStoreProviderServices;
127
import org.gvsig.fmap.geom.GeometryLocator;
128
import org.gvsig.fmap.geom.GeometryManager;
129 126
import org.gvsig.fmap.geom.SpatialIndex;
130 127
import org.gvsig.fmap.geom.primitive.Envelope;
131 128
import org.gvsig.metadata.MetadataLocator;
......
2570 2567
    }
2571 2568

  
2572 2569
    @Override
2573
    public ExpressionEvaluator createExpression() {
2570
    public ExpressionBuilder createExpressionBuilder() {
2574 2571
        if( this.provider instanceof FeatureStoreProvider_v2 ) {
2575 2572
            return ((FeatureStoreProvider_v2)this.provider).createExpression();
2576 2573
        }
2577 2574
        return new SQLBuilderBase();
2578 2575
    }
2579 2576

  
2577
    @Override
2578
    public ExpressionBuilder createExpression() {
2579
        return createExpressionBuilder();
2580
    }
2580 2581

  
2581 2582
    public FeatureSet features() throws DataException {
2582 2583
        // This is to avoid jython to create a property with this name

Also available in: Unified diff