Revision 44158 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/DALDefaultImplLibrary.java

View differences:

DALDefaultImplLibrary.java
31 31
import org.gvsig.fmap.dal.DALLibrary;
32 32
import org.gvsig.fmap.dal.DALLocator;
33 33
import org.gvsig.fmap.dal.DataManager;
34
import org.gvsig.fmap.dal.DataTypes;
35 34
import org.gvsig.fmap.dal.feature.AbstractFeatureStoreTransform;
36 35
import org.gvsig.fmap.dal.feature.impl.DALFile;
37 36
import org.gvsig.fmap.dal.feature.impl.DefaultFeatureQuery;
......
40 39
import org.gvsig.fmap.dal.feature.impl.DefaultFeatureSelection;
41 40
import org.gvsig.fmap.dal.feature.impl.DefaultFeatureStore;
42 41
import org.gvsig.fmap.dal.feature.impl.DefaultFeatureStoreTransforms;
43
import org.gvsig.fmap.dal.feature.impl.JSIRSpatialIndexProvider;
44
import org.gvsig.fmap.dal.feature.impl.JSIRSpatialIndexProviderFactory;
45
import org.gvsig.fmap.dal.feature.impl.MemorySpatialIndexProvider;
46
import org.gvsig.fmap.dal.feature.impl.MemorySpatialIndexProviderFactory;
42
import org.gvsig.fmap.dal.feature.impl.indexes.jsir.JSIRSpatialIndexProviderFactory;
43
import org.gvsig.fmap.dal.feature.impl.indexes.memoryspatial.MemorySpatialIndexProviderFactory;
47 44
import org.gvsig.fmap.dal.feature.impl.dynobjectutils.ComputeAvailableValuesFromTable;
48 45
import org.gvsig.fmap.dal.feature.impl.dynobjectutils.DumbFeatureTypeDefinitionsManager;
49 46
import org.gvsig.fmap.dal.feature.impl.dynobjectutils.relations.DALLink_getRelatedFeature;
50 47
import org.gvsig.fmap.dal.feature.impl.dynobjectutils.relations.DALLink_getRelatedFeatures;
48
import org.gvsig.fmap.dal.feature.impl.indexes.memorybasictypes.MemoryDoubleIndexProviderFactory;
49
import org.gvsig.fmap.dal.feature.impl.indexes.memorybasictypes.MemoryFloatIndexProviderFactory;
50
import org.gvsig.fmap.dal.feature.impl.indexes.memorybasictypes.MemoryIntIndexProviderFactory;
51
import org.gvsig.fmap.dal.feature.impl.indexes.memorybasictypes.MemoryLongIndexProviderFactory;
52
import org.gvsig.fmap.dal.feature.impl.indexes.memorybasictypes.MemoryStringIndexProviderFactory;
51 53
import org.gvsig.fmap.dal.feature.spi.memory.MemoryResource;
52 54
import org.gvsig.fmap.dal.feature.spi.memory.MemoryResourceParameters;
53 55
import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultFeatureAttributeEmulatorExpression;
......
140 142
                    DALLocator.DATA_MANAGER_NAME, DALLocator.getInstance());
141 143
        }
142 144
        
143
        // Register a default spatial index based in the default memory spatial index of geom library
144
        if( !dataManager.getFeatureIndexRegister().exits(MemorySpatialIndexProvider.NAME) ) {
145
            dataManager.getFeatureIndexRegister().register(new MemorySpatialIndexProviderFactory());
146
        }
147
        if( !dataManager.getFeatureIndexRegister().exits(JSIRSpatialIndexProvider.NAME) ) {
148
            dataManager.getFeatureIndexRegister().register(new JSIRSpatialIndexProviderFactory());
149
            dataManager.setDefaultFeatureIndexProviderName(
150
                    DataTypes.GEOMETRY, 
151
                    JSIRSpatialIndexProvider.NAME
152
            );
153
        }
154
    	
145
        MemorySpatialIndexProviderFactory.selfRegister();
146
        JSIRSpatialIndexProviderFactory.selfRegister();
147
        MemoryStringIndexProviderFactory.selfRegister();
148
        MemoryIntIndexProviderFactory.selfRegister();
149
        MemoryLongIndexProviderFactory.selfRegister();
150
        MemoryFloatIndexProviderFactory.selfRegister();
151
        MemoryDoubleIndexProviderFactory.selfRegister();
152

  
155 153
        ResourceManagerProviderServices resourceManager =
156 154
                (ResourceManagerProviderServices) DALLocator.getResourceManager();
157 155
        if (resourceManager == null) {

Also available in: Unified diff