Revision 23772 branches/v2_0_0_prep/libraries/libFMap_data/src/org/gvsig/fmap/data/feature/impl/AbstractFeatureStore.java

View differences:

AbstractFeatureStore.java
38 38
import org.gvsig.fmap.data.feature.impl.commands.implementation.FeatureCommandsRecord;
39 39
import org.gvsig.fmap.data.feature.impl.expansionadapter.ExpansionAdapter;
40 40
import org.gvsig.fmap.data.feature.impl.expansionadapter.MemoryExpansionAdapter;
41
import org.gvsig.fmap.data.impl.AbstractResource;
41
import org.gvsig.fmap.data.feature.spi.DefaultFeatureData;
42
import org.gvsig.fmap.data.feature.spi.FeatureData;
42 43
import org.gvsig.fmap.data.impl.DefaultDataManager;
43 44
import org.gvsig.fmap.data.index.IndexException;
44 45
import org.gvsig.fmap.data.index.IndexStore;
......
46 47
import org.gvsig.fmap.data.index.spatial.SpatialIndex;
47 48
import org.gvsig.fmap.data.index.spatial.SpatialIndexFactory;
48 49
import org.gvsig.fmap.data.index.spatial.SpatialIndexParameters;
50
import org.gvsig.fmap.data.spi.AbstractResource;
49 51
import org.gvsig.fmap.geom.Geometry;
50 52
import org.gvsig.fmap.geom.primitive.Envelope;
51 53
import org.gvsig.metadata.Metadata;
......
65 67
public abstract class AbstractFeatureStore implements FeatureStore,
66 68
		DataStoreProvider, Observer {
67 69
	protected DataStoreParameters parameters = null;
68
	protected FeatureSelection selection;
69
	protected FeatureLocks locks;
70
	protected DefaultFeatureSelection selection;
71
	protected DefaultFeatureLocks locks;
70 72

  
71 73
	protected DefaultObservable observable=new DefaultObservable();
72 74

  
......
201 203

  
202 204
		XMLEntity selectionXML = xmlEntity.firstChild("type", "selection");
203 205
		if (selectionXML != null) {
204
			selection = (FeatureSelection) createFeatureSelection();
206
			selection = (DefaultFeatureSelection) createFeatureSelection();
205 207
			selection.setXMLEntity(selectionXML);
206 208
		}
207 209

  
......
370 372
		}
371 373
		this.unsetSelectionObserver();
372 374
		if (this.getSelection().getClass().isInstance(selection)) {
373
			this.selection = (FeatureSelection) selection;
375
			this.selection = (DefaultFeatureSelection) selection;
374 376
		} else {
375 377
			this.selection = null;
376 378
			this.getFeatureSelection().addAll(selection);
......
380 382
	}
381 383

  
382 384
	public FeatureCollection createFeatureSelection() {
383
		FeatureSelection selection = new FeatureSelection(this);
385
		DefaultFeatureSelection selection = new DefaultFeatureSelection(this);
384 386
		return selection;
385 387
	}
386 388

  
387 389
	public final FeatureCollection getFeatureSelection() {
388 390
		if( selection == null ){
389
			this.selection = (FeatureSelection) createFeatureSelection();
391
			this.selection = (DefaultFeatureSelection) createFeatureSelection();
390 392
			this.setSelectionObserver();
391 393
		}
392 394
		return selection;
......
429 431

  
430 432
	public FeatureCollection getLocks() {
431 433
		if (locks == null) {
432
			this.locks = new FeatureLocks(this);
434
			this.locks = new DefaultFeatureLocks(this);
433 435
		}
434 436
		return locks;
435 437
	}

Also available in: Unified diff