Revision 24204

View differences:

branches/v2_0_0_prep/libraries/libFMap_data/src/org/gvsig/fmap/data/resource/impl/DefaultResourceManager.java
182 182 
			if (args == null) {
183 183 
				return (DataParameters) ToolsLocator.getExtensionPointManager()
184 184 
						.get(
185 
						DATA_MANAGER_RESOURCE).create(type);
185 
						DATA_MANAGER_RESOURCE_PARAMS).create(type);
186 186 
			} else {
187 187 
				return (DataParameters) ToolsLocator.getExtensionPointManager()
188 
						.get(DATA_MANAGER_RESOURCE).create(type, args);
188 
						.get(DATA_MANAGER_RESOURCE_PARAMS).create(type, args);
189 189 
			}
190 190 
		} catch (InstantiationException e) {
191 191 
			throw new InitializeException(e);
branches/v2_0_0_prep/libraries/libFMap_data/src/org/gvsig/fmap/data/impl/DefaultDataManager.java
17 17 
import org.gvsig.fmap.data.feature.FeatureStore;
18 18 
import org.gvsig.fmap.data.feature.FeatureType;
19 19 
import org.gvsig.fmap.data.feature.impl.DefaultFeatureIndex;
20 
import org.gvsig.fmap.data.feature.impl.DefaultFeatureStore;
21 
import org.gvsig.fmap.data.feature.spi.FeatureStoreProvider;
20 22 
import org.gvsig.fmap.data.feature.spi.FeatureStoreProviderServices;
21 23 
import org.gvsig.fmap.data.feature.spi.index.FeatureIndexProvider;
22 24 
import org.gvsig.fmap.data.feature.spi.index.FeatureIndexProviderServices;
23 25 
import org.gvsig.fmap.data.resource.ResourceManager;
24 26 
import org.gvsig.fmap.data.spi.DataManagerProviderServices;
27 
import org.gvsig.fmap.data.spi.DataStoreProvider;
25 28 
import org.gvsig.tools.ToolsLocator;
26 29 
import org.gvsig.tools.evaluator.Evaluator;
27 30 
import org.gvsig.tools.operations.OperationManager;
......
147 150 
		String name = parameters.getDataStoreName();
148 151 

  		




  149
  152
  
    
		try {


  		




  150
  
  
    
			DataStore store = (DataStore) ToolsLocator


  		




  
  153
  
    
			DataStoreProvider storeProvider = (DataStoreProvider) ToolsLocator


  		




  151
  154
  
    
					.getExtensionPointManager().get(DATA_MANAGER_STORE).create(


  		




  152
  155
  
    
							name, new Object[] { parameters });


  		




  153
  
  
    
			if (store == null) {


  		




  
  156
  
    
			if (storeProvider == null) {


  		




  154
  157
  
    
				throw new ProviderNotRegisteredException(name);


  		




  155
  158
  
    
			}


  		




  156
  
  
    
			return store;


  		




  
  159
  
    

  		




  
  160
  
    
			return new DefaultFeatureStore(this, parameters,


  		




  
  161
  
    
					(FeatureStoreProvider) storeProvider);


  		




  157
  162
  
    
		} catch (InstantiationException e) {


  		




  158
  163
  
    
			throw new InitializeException(e);


  		




  159
  164
  
    
		} catch (IllegalAccessException e) {


  		












Also available in:  Unified diff