Revision 44304 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
1 1
package org.gvsig.fmap.dal.impl;
2 2

  
3
import java.io.ByteArrayInputStream;
3 4
import java.io.File;
4 5
import java.io.InputStream;
5 6
import java.net.URL;
......
13 14
import org.gvsig.expressionevaluator.Expression;
14 15
import org.gvsig.expressionevaluator.ExpressionBuilder;
15 16
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
17
import org.gvsig.fmap.dal.BaseStoresRepository;
16 18

  
17 19
import org.gvsig.fmap.dal.DataFactory;
18 20
import org.gvsig.fmap.dal.DataManager;
......
25 27
import org.gvsig.fmap.dal.DataStoreParameters;
26 28
import org.gvsig.fmap.dal.DataStoreProviderFactory;
27 29
import org.gvsig.fmap.dal.DataTypes;
30
import org.gvsig.fmap.dal.DatabaseWorkspaceManager;
28 31

  
29 32
import org.gvsig.fmap.dal.NewDataStoreParameters;
30 33
import org.gvsig.fmap.dal.OpenErrorHandler;
......
80 83
import org.gvsig.tools.folders.FoldersManager;
81 84
import org.gvsig.tools.identitymanagement.SimpleIdentityManager;
82 85
import org.gvsig.tools.identitymanagement.UnauthorizedException;
86
import org.gvsig.tools.persistence.PersistenceManager;
83 87
import org.gvsig.tools.service.spi.Services;
84
import org.gvsig.tools.util.GetItemByKey;
85
import org.gvsig.tools.util.UnmodifiableBasicMap;
86 88
import org.slf4j.Logger;
87 89
import org.slf4j.LoggerFactory;
88 90

  
91
@SuppressWarnings("UseSpecificCatch")
89 92
public class DefaultDataManager
90 93
        implements DataManager, DataManagerProviderServices, Services {
91 94

  
......
278 281
    }
279 282

  
280 283
    @Override
284
    public DataStoreParameters createStoreParameters(byte[] data) {
285
        try {
286
            PersistenceManager persistenceManager = ToolsLocator.getPersistenceManager();
287
            ByteArrayInputStream stream = new ByteArrayInputStream(data);
288
            DataStoreParameters parameters = (DataStoreParameters) persistenceManager.getObject(stream);
289
            return parameters;
290
        } catch (Exception ex) {
291
            LOGGER.warn("Can't get parameters from byte[].",ex);
292
            return null;
293
        }
294
    }
295

  
296
    @Override
281 297
    public DataStoreParameters createStoreParameters(String providerName) throws InitializeException, ProviderNotRegisteredException {
282 298
        if( providerName == null ) {
283 299
            String msg = "Provider name can't be null.";
......
1000 1016
    @Override
1001 1017
    public StoresRepository getStoresRepository() {
1002 1018
        if( this.storesRepository==null ) {
1003
            this.storesRepository = new DefaultStoresRepository();
1019
            this.storesRepository = new BaseStoresRepository("DAL");
1004 1020
        }
1005 1021
        return this.storesRepository;
1006 1022
    }
1007

  
1023
    
1008 1024
    @Override
1009
    public void addStoresRepository(String name, UnmodifiableBasicMap<String,DataStoreParameters> repository) {
1010
        ((DefaultStoresRepository)this.getStoresRepository()).add(name, repository);
1025
    public DatabaseWorkspaceManager createDatabaseWorkspaceManager(DataServerExplorerParameters connection) {
1026
        DatabaseWorkspaceManager workspace = new DefaultDatabaseWorkspaceManager(connection);
1027
        return workspace;
1011 1028
    }
1012
    
1013 1029
}

Also available in: Unified diff