Revision 44307 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.spi/src/main/java/org/gvsig/fmap/dal/feature/spi/AbstractFeatureStoreProvider.java

View differences:

AbstractFeatureStoreProvider.java
215 215
		return resource;
216 216
	}
217 217

  
218
	/*
219
	 * (non-Javadoc)
220
	 *
221
	 * @see
222
	 * org.gvsig.fmap.dal.feature.spi.FeatureStoreProvider#getStoreServices()
223
	 */
218
        @Override
224 219
	public FeatureStoreProviderServices getStoreServices() {
225 220
		return this.store;
226 221
	}
227 222

  
223
        @Override
228 224
	public FeatureStore getFeatureStore() {
229
		if(this.store == null){
230
			return null;
231
		}
232
		return this.store.getFeatureStore();
225
            FeatureStoreProviderServices services = this.getStoreServices();
226
            if(services == null){
227
                    return null;
228
            }
229
            return services.getFeatureStore();
233 230
	}
234 231

  
235
	/**
236
	 * unsupported by default, override this otherwise
237
	 *
238
	 * @see org.gvsig.fmap.dal.feature.spi.FeatureStoreProvider#allowWrite()
239
	 */
232
        @Override
240 233
	public boolean allowWrite() {
241 234
		return false;
242 235
	}
......
280 273

  
281 274
	public FeatureProvider createFeatureProvider(FeatureType type)
282 275
			throws DataException {
283
		return this.store.createDefaultFeatureProvider(type);
276
            FeatureStoreProviderServices services = this.getStoreServices();
277
            return services.createDefaultFeatureProvider(type);
284 278
	}
285 279

  
286 280
	/**
......
305 299
	 *
306 300
	 * @see org.gvsig.fmap.dal.feature.spi.FeatureStoreProvider#createFeatureSelection()
307 301
	 */
302
        @Override
308 303
	public FeatureSelection createFeatureSelection() throws DataException {
309
		return this.store.createDefaultFeatureSelection();
304
            FeatureStoreProviderServices services = this.getStoreServices();
305
            return services.createDefaultFeatureSelection();
310 306
	}
311 307

  
312 308
	/**
......
323 319
	 *
324 320
	 * @see org.gvsig.fmap.dal.feature.spi.FeatureStoreProvider#close()
325 321
	 */
322
        @Override
326 323
	public void close() throws CloseException {
327 324
		// Do nothing by default
328 325
	}
329 326

  
327
        @Override
330 328
	protected void doDispose() throws BaseException {
331 329
		this.metadata = null;
332 330
		this.store = null;

Also available in: Unified diff