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/impl/DefaultDataManager.java

View differences:

DefaultDataManager.java
21 21
import org.gvsig.fmap.dal.DataStoreParameters;
22 22
import org.gvsig.fmap.dal.DataStoreProviderFactory;
23 23
import org.gvsig.fmap.dal.DataTypes;
24
import org.gvsig.fmap.dal.EvaluatorFactory;
24 25
import org.gvsig.fmap.dal.ExpressionBuilder;
25
import org.gvsig.fmap.dal.ExpressionEvaluator;
26

  
26 27
import org.gvsig.fmap.dal.NewDataStoreParameters;
27 28
import org.gvsig.fmap.dal.OpenErrorHandler;
28 29
import org.gvsig.fmap.dal.Register;
......
43 44
import org.gvsig.fmap.dal.feature.paging.FeaturePagingHelper;
44 45
import org.gvsig.fmap.dal.feature.paging.impl.FeaturePagingHelperImpl;
45 46
import org.gvsig.fmap.dal.feature.spi.ExpressionBuilderBase;
46
import org.gvsig.fmap.dal.feature.spi.ExpressionEvaluatorBase;
47 47
import org.gvsig.fmap.dal.feature.spi.FeatureStoreProvider;
48 48
import org.gvsig.fmap.dal.feature.spi.FeatureStoreProviderServices;
49 49
import org.gvsig.fmap.dal.feature.spi.cache.FeatureCacheProvider;
50 50
import org.gvsig.fmap.dal.feature.spi.cache.FeatureCacheProviderFactory;
51 51
import org.gvsig.fmap.dal.feature.spi.index.FeatureIndexProvider;
52 52
import org.gvsig.fmap.dal.feature.spi.index.FeatureIndexProviderServices;
53
import org.gvsig.fmap.dal.raster.NewRasterStoreParameters;
54 53
import org.gvsig.fmap.dal.raster.impl.RasterStoreFactory;
55 54
import org.gvsig.fmap.dal.raster.impl.RasterStoreOldFactory;
56 55
import org.gvsig.fmap.dal.raster.spi.CoverageStoreProvider;
......
123 122

  
124 123
    private final Map<Integer, String> defaultDataIndexProviders;
125 124

  
126
    private Class defaultEvaluatorClass = null;
125
    private EvaluatorFactory defaultEvaluatorFactory = null;
127 126

  
128 127
    private OpenErrorHandler openErrorHandler = null;
129 128

  
......
678 677
    }
679 678

  
680 679
    @Override
681
    public void registerDefaultEvaluator(Class evaluatorClass) {
682
        if (!Evaluator.class.isAssignableFrom(evaluatorClass)) {
683
            throw new ClassCastException();
684
        }
685
        this.defaultEvaluatorClass = evaluatorClass;
680
    public void registerDefaultEvaluator(EvaluatorFactory evaluatorFactory) {
681
        this.defaultEvaluatorFactory = evaluatorFactory;
686 682
    }
687 683

  
688 684
    @Override
689 685
    public Evaluator createExpresion(String expression) throws InitializeException {
690
        try {
691
            Evaluator eval = (Evaluator) this.defaultEvaluatorClass.
692
                    getConstructor(String.class).newInstance(expression);
693
            return eval;
694
        } catch (Exception ex) {
695
            throw new InitializeException(ex);
696
        }
686
        return this.defaultEvaluatorFactory.createEvaluator(expression);
697 687
    }
698 688

  
699 689
    @Override
700
    public  ExpressionEvaluator createExpresion() {
701
        return new ExpressionEvaluatorBase();
702
    }
703

  
704
    @Override
705 690
    public FeaturePagingHelper createFeaturePagingHelper(
706 691
            FeatureStore featureStore, int pageSize) throws BaseException {
707 692
        return new FeaturePagingHelperImpl(featureStore, pageSize);

Also available in: Unified diff