Revision 44738 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
18 18
import org.gvsig.expressionevaluator.ExpressionBuilder;
19 19
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
20 20
import org.gvsig.expressionevaluator.MutableSymbolTable;
21
import org.gvsig.expressionevaluator.impl.symboltable.FeatureSymbolTableImpl;
21 22
import org.gvsig.fmap.dal.BaseStoresRepository;
22 23
import org.gvsig.fmap.dal.DALLocator;
23 24

  
......
71 72
import org.gvsig.fmap.dal.feature.spi.index.FeatureIndexProviderServices;
72 73
import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultExpressionEvaluator;
73 74
import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultFeatureAttributeEmulatorExpression;
74
import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultFeatureSymbolTable;
75 75
import org.gvsig.fmap.dal.raster.impl.RasterStoreFactory;
76 76
import org.gvsig.fmap.dal.raster.impl.RasterStoreOldFactory;
77 77
import org.gvsig.fmap.dal.raster.spi.CoverageStoreProvider;
......
315 315
    }
316 316

  
317 317
    @Override
318
    public DataStoreParameters createStoreParameters(String providerName) throws InitializeException, ProviderNotRegisteredException {
318
    public DataStoreParameters createStoreParameters(String providerName, Object... arguments) throws InitializeException, ProviderNotRegisteredException {
319 319
        if( providerName == null ) {
320 320
            String msg = "Provider name can't be null.";
321 321
            LOGGER.warn(msg);
322 322
            throw new IllegalArgumentException(msg);
323 323
        }
324
        if( arguments.length == 1 ) { 
325
            // Desde jython entra por este metodo en lugar de los especificos
326
            // de DataStoreParameters o DynObject
327
            if( arguments[0] instanceof DataStoreParameters ) {
328
                return this.createStoreParameters(providerName, (DataStoreParameters)(arguments[0]));
329
            } else if( arguments[0] instanceof DynObject ) {
330
                return this.createStoreParameters(providerName, (DynObject)(arguments[0]));
331
            }
332
        }
333
        if( (arguments.length % 2)!= 0 ) {
334
            throw new IllegalArgumentException("The number of arguments must be even.");
335
        }
336
        if( providerName == null ) {
337
            String msg = "Provider name can't be null.";
338
            LOGGER.warn(msg);
339
            throw new IllegalArgumentException(msg);
340
        }
324 341
        DataFactory providerFactory = this.getStoreProviderRegister().getFactory(providerName);
325 342
        if( providerFactory == null ) {
326 343
            String msg = "Can't locate provider factory for '"+providerName+"'.";
327 344
            LOGGER.warn(msg);
328 345
            throw new IllegalArgumentException(msg);
329 346
        }
330
        return (DataStoreParameters) providerFactory.createParameters();
347
        DataStoreParameters parameters = (DataStoreParameters) providerFactory.createParameters();
348
        for( int i=0; i<arguments.length; i+=2 ) {
349
            String name = (String) arguments[i];
350
            if( name.endsWith("=") ) {
351
                name = name.substring(0, name.length()-1);
352
            }
353
            Object value = arguments[i+1];
354
            parameters.setDynValue(name, value);
355
        }
356
        return parameters;
331 357
    }
332 358

  
333 359
    @Override
......
989 1015

  
990 1016
    @Override
991 1017
    public FeatureSymbolTable createFeatureSymbolTable() {
992
        FeatureSymbolTable symbolTable = new DefaultFeatureSymbolTable();
1018
        FeatureSymbolTable symbolTable = new FeatureSymbolTableImpl();
993 1019
        return symbolTable;
994 1020
    }
995 1021

  

Also available in: Unified diff