Revision 29289 branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/spi/memory/AbstractMemoryStoreProvider.java

View differences:

AbstractMemoryStoreProvider.java
11 11
import org.gvsig.fmap.dal.feature.FeatureType;
12 12
import org.gvsig.fmap.dal.feature.exception.PerformEditingException;
13 13
import org.gvsig.fmap.dal.feature.spi.AbstractFeatureStoreProvider;
14
import org.gvsig.fmap.dal.feature.spi.DefaultFeatureData;
15
import org.gvsig.fmap.dal.feature.spi.FeatureData;
14
import org.gvsig.fmap.dal.feature.spi.DefaultFeatureProvider;
15
import org.gvsig.fmap.dal.feature.spi.FeatureProvider;
16 16
import org.gvsig.fmap.dal.feature.spi.FeatureReferenceProviderServices;
17 17
import org.gvsig.fmap.dal.feature.spi.FeatureSetProvider;
18 18
import org.gvsig.fmap.dal.feature.spi.FeatureStoreProvider;
......
35 35
		return this;
36 36
	}
37 37

  
38
	public void performEditing(Iterator deleteds, Iterator inserteds, Iterator updateds, Iterator originalFeatureTypesUpdated) throws PerformEditingException {
38
	public void performChanges(Iterator deleteds, Iterator inserteds, Iterator updateds, Iterator originalFeatureTypesUpdated) throws PerformEditingException {
39 39
		throw new UnsupportedOperationException();
40 40
	}
41 41

  
42
	public void addFeatureData(FeatureData data) {
42
	public void addFeatureData(FeatureProvider data) {
43 43
		data.setOID(this.createNewOID());
44 44
		this.data.add(data);
45 45
	}
......
73 73
		return this.data.size();
74 74
	}
75 75

  
76
	public FeatureData getFeatureDataByReference(
76
	public FeatureProvider getFeatureDataByReference(
77 77
			FeatureReferenceProviderServices reference)
78 78
			throws DataException {
79 79
		int oid = ((Long) reference.getOID()).intValue();
80
		return (FeatureData) this.data.get(oid);
80
		return (FeatureProvider) this.data.get(oid);
81 81
	}
82 82

  
83
	public FeatureData getFeatureDataByReference(
83
	public FeatureProvider getFeatureDataByReference(
84 84
			FeatureReferenceProviderServices reference,
85 85
			FeatureType featureType) throws DataException {
86 86
		int oid = ((Long) reference.getOID()).intValue();
87
		return new MemoryFeatureDataWrapper((DefaultFeatureData) this.data
87
		return new MemoryFeatureDataWrapper((DefaultFeatureProvider) this.data
88 88
				.get(oid),
89 89
				featureType);
90 90
	}
......
95 95
		return new MemoryFeatureSet(this, query, featureType);
96 96
	}
97 97

  
98
	public FeatureData createFeatureData(FeatureType featureType)throws DataException  {
98
	public FeatureProvider createFeatureData(FeatureType featureType)throws DataException  {
99 99
		this.open();
100
		return new DefaultFeatureData(featureType);
100
		return new DefaultFeatureProvider(featureType);
101 101
	}
102 102

  
103
	public boolean canWriteGeometry(int geometryType) {
103
	public boolean canWriteGeometry(int geometryType, int geometrySubType) {
104 104
		// By default memory stores support all geometry types
105 105
		return true;
106 106
	}
......
134 134
				return delegated.next();
135 135
			} else {
136 136
				return new MemoryFeatureDataWrapper(
137
						(DefaultFeatureData) delegated.next(),
137
						(DefaultFeatureProvider) delegated.next(),
138 138
						this.fType);
139 139
			}
140 140

  

Also available in: Unified diff