Revision 44023 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
10 10
import java.util.Map;
11 11
import org.apache.commons.lang3.StringUtils;
12 12
import org.gvsig.expressionevaluator.Expression;
13
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
13 14

  
14 15
import org.gvsig.fmap.dal.DataFactory;
15 16
import org.gvsig.fmap.dal.DataManager;
......
52 53
import org.gvsig.fmap.dal.feature.spi.cache.FeatureCacheProviderFactory;
53 54
import org.gvsig.fmap.dal.feature.spi.index.FeatureIndexProvider;
54 55
import org.gvsig.fmap.dal.feature.spi.index.FeatureIndexProviderServices;
55
import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultEvaluatorFactory;
56 56
import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultExpressionEvaluator;
57 57
import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultFeatureAttributeEmulatorExpression;
58 58
import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultFeatureSymbolTable;
......
73 73
import org.gvsig.tools.dynobject.DynStruct_v2;
74 74
import org.gvsig.tools.dynobject.Tags;
75 75
import org.gvsig.tools.evaluator.Evaluator;
76
import org.gvsig.tools.evaluator.EvaluatorFactory;
77 76
import org.gvsig.tools.exception.BaseException;
78 77
import org.gvsig.tools.extensionpoint.ExtensionPoint;
79 78
import org.gvsig.tools.folders.FoldersManager;
......
86 85
public class DefaultDataManager
87 86
        implements DataManager, DataManagerProviderServices, Services {
88 87

  
89
    private static final Logger logger = LoggerFactory.getLogger(DefaultDataManager.class);
88
    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultDataManager.class);
90 89
    
91 90
    final static private String DATA_MANAGER_CACHE = "Data.manager.caches";
92 91
    final static private String DATA_MANAGER_CACHE_DESCRIPTION =
......
129 128

  
130 129
    private final Map<Integer, String> defaultDataIndexProviders;
131 130

  
132
    private EvaluatorFactory defaultEvaluatorFactory = null;
133

  
134 131
    private OpenErrorHandler openErrorHandler = null;
135 132

  
136 133
    private DataServerExplorerPool dataServerExplorerPool = null;
......
278 275
    public DataStoreParameters createStoreParameters(String providerName) throws InitializeException, ProviderNotRegisteredException {
279 276
        if( providerName == null ) {
280 277
            String msg = "Provider name can't be null.";
281
            logger.warn(msg);
278
            LOGGER.warn(msg);
282 279
            throw new IllegalArgumentException(msg);
283 280
        }
284 281
        DataFactory providerFactory = this.getStoreProviderRegister().getFactory(providerName);
285 282
        if( providerFactory == null ) {
286 283
            String msg = "Can't locate provider factory for '"+providerName+"'.";
287
            logger.warn(msg);
284
            LOGGER.warn(msg);
288 285
            throw new IllegalArgumentException(msg);
289 286
        }
290 287
        return (DataStoreParameters) providerFactory.createParameters();
......
304 301
    public DataServerExplorerParameters createServerExplorerParameters(String explorerName) throws InitializeException, ProviderNotRegisteredException {
305 302
        if( explorerName == null ) {
306 303
            String msg = "Explorer name can't be null.";
307
            logger.warn(msg);
304
            LOGGER.warn(msg);
308 305
            throw new IllegalArgumentException(msg);
309 306
        }
310 307
        DataFactory explorerFactory = this.getServerExplorerRegister().getFactory(explorerName);
311 308
        if( explorerFactory == null ) {
312 309
            String msg = "Can't locate server explorer factory for '"+explorerName+"'.";
313
            logger.warn(msg);
310
            LOGGER.warn(msg);
314 311
            throw new IllegalArgumentException(msg);
315 312
        }
316 313
        DataServerExplorerParameters params = (DataServerExplorerParameters) explorerFactory.createParameters();
......
336 333
    public DataServerExplorer openServerExplorer(String explorerName, DataServerExplorerParameters parameters) throws InitializeException, ProviderNotRegisteredException, ValidateDataParametersException {
337 334
        if( explorerName == null ) {
338 335
            String msg = "Explorer name can't be null.";
339
            logger.warn(msg);
336
            LOGGER.warn(msg);
340 337
            throw new IllegalArgumentException(msg);
341 338
        }
342 339
        DataFactory explorerFactory = this.getServerExplorerRegister().getFactory(explorerName);
343 340
        if( explorerFactory == null ) {
344 341
            String msg = "Can't locate server explorer factory for '"+explorerName+"'.";
345
            logger.warn(msg);
342
            LOGGER.warn(msg);
346 343
            throw new IllegalArgumentException(msg);
347 344
        }
348 345
        if (parameters == null) {
......
365 362
        }
366 363
        if( explorerName == null ) {
367 364
            String msg = "Explorer name can't be null.";
368
            logger.warn(msg);
365
            LOGGER.warn(msg);
369 366
            throw new IllegalArgumentException(msg);
370 367
        }
371 368
        if( (arguments.length % 2)!= 0 ) {
......
416 413
    public DataStore openStore(String providerName, DataStoreParameters parameters) throws InitializeException, ProviderNotRegisteredException, ValidateDataParametersException {
417 414
        if( providerName == null ) {
418 415
            String msg = "Provider name can't be null.";
419
            logger.warn(msg);
416
            LOGGER.warn(msg);
420 417
            throw new IllegalArgumentException(msg);
421 418
        }
422 419
        SimpleIdentityManager identityManager = ToolsLocator.getIdentityManager();
......
429 426
        String storeName = this.getStoreName(parameters);
430 427
        if( StringUtils.isEmpty(storeName) ) {
431 428
            String msg = "Can't locate the store name from the parameters. parameters=" + parameters.toString();
432
            logger.warn(msg);
429
            LOGGER.warn(msg);
433 430
            throw new IllegalArgumentException(msg);
434 431
        }
435 432

  
436 433
        DataStoreFactory_v2_4 storeFactory = (DataStoreFactory_v2_4) this.getStoreRegister().getFactory(storeName);
437 434
        if( storeFactory == null ) {
438 435
            String msg = "Can't locate store factory for '"+storeName+"'.";
439
            logger.warn(msg);
436
            LOGGER.warn(msg);
440 437
            throw new IllegalArgumentException(msg);
441 438
        }
442 439
        DataFactory providerFactory = this.getStoreProviderRegister().getFactory(providerName);
443 440
        if( providerFactory == null ) {
444 441
            String msg = "Can't locate provider factory for '"+providerName+"'.";
445
            logger.warn(msg);
442
            LOGGER.warn(msg);
446 443
            throw new IllegalArgumentException(msg);
447 444
        }
448 445

  
......
476 473
        }
477 474
        if( providerName == null ) {
478 475
            String msg = "Provider name can't be null.";
479
            logger.warn(msg);
476
            LOGGER.warn(msg);
480 477
            throw new IllegalArgumentException(msg);
481 478
        }
482 479
        DataFactory providerFactory = this.getStoreProviderRegister().getFactory(providerName);
......
504 501
    public DataStoreProviderFactory getStoreProviderFactory(String providerName) {
505 502
        if( providerName == null ) {
506 503
            String msg = "Provider name can't be null.";
507
            logger.warn(msg);
504
            LOGGER.warn(msg);
508 505
            throw new IllegalArgumentException(msg);
509 506
        }
510 507
        DataFactory providerFactory = this.getStoreProviderRegister().getFactory(providerName);
......
520 517
    public List<String> getStoreProviders(String explorerName) {
521 518
        if( explorerName == null ) {
522 519
            String msg = "Explorer name can't be null.";
523
            logger.warn(msg);
520
            LOGGER.warn(msg);
524 521
            throw new IllegalArgumentException(msg);
525 522
        }
526 523
        try {
......
660 657
    public void newStore(String explorerName, String providerName, NewDataStoreParameters parameters, boolean overwrite) throws InitializeException, ProviderNotRegisteredException, ValidateDataParametersException {
661 658
        if( explorerName == null ) {
662 659
            String msg = "Explorer name can't be null.";
663
            logger.warn(msg);
660
            LOGGER.warn(msg);
664 661
            throw new IllegalArgumentException(msg);
665 662
        }
666 663
        if( providerName == null ) {
667 664
            String msg = "Provider name can't be null.";
668
            logger.warn(msg);
665
            LOGGER.warn(msg);
669 666
            throw new IllegalArgumentException(msg);
670 667
        }
671 668

  
......
684 681
    }
685 682

  
686 683
    @Override
687
    public void registerDefaultEvaluator(EvaluatorFactory evaluatorFactory) {
688
        this.defaultEvaluatorFactory = evaluatorFactory;
684
    @Deprecated
685
    public Evaluator createExpresion(String expression) throws InitializeException {
686
        Expression exp = ExpressionEvaluatorLocator.getManager().createExpression();
687
        exp.setPhrase(expression);
688
        return this.createExpresion(exp);
689 689
    }
690 690

  
691 691
    @Override
692
    public Evaluator createExpresion(String expression) throws InitializeException {
693
        return this.defaultEvaluatorFactory.createEvaluator(expression);
692
    @Deprecated
693
    public Evaluator createExpresion(Expression expression) throws InitializeException {
694
        DefaultExpressionEvaluator exp = new DefaultExpressionEvaluator(expression);
695
        return exp;        
694 696
    }
695 697

  
698

  
696 699
    @Override
697
    public Evaluator createExpresion(Expression expression) throws InitializeException {
700
    public Evaluator createFilter(String expression) throws InitializeException {
701
        Expression exp = ExpressionEvaluatorLocator.getManager().createExpression();
702
        exp.setPhrase(expression);
703
        return this.createFilter(exp);
704
    }
705

  
706
    @Override
707
    public Evaluator createFilter(Expression expression) throws InitializeException {
698 708
        DefaultExpressionEvaluator exp = new DefaultExpressionEvaluator(expression);
699 709
        return exp;        
700 710
    }
......
916 926
    }
917 927

  
918 928
    @Override
919
    public EvaluatorFactory createEvaluatorFactory() {
920
        EvaluatorFactory f = new DefaultEvaluatorFactory();
921
        return f;
922
    }
923

  
924
    @Override
925 929
    public FeatureAttributeEmulatorExpression createFeatureAttributeEmulatorExpression(FeatureType type, Expression expression) {
926 930
        FeatureAttributeEmulatorExpression emulator = new DefaultFeatureAttributeEmulatorExpression(type, expression);
927 931
        return emulator;

Also available in: Unified diff