Revision 20058 trunk/libraries/libDataSourceDBBaseDrivers/src/org/gvsig/data/datastores/vectorial/db/jdbc/h2/H2FeatureCollection.java

View differences:

H2FeatureCollection.java
21 21
import com.iver.cit.gvsig.fmap.drivers.WKBParser2;
22 22

  
23 23
public class H2FeatureCollection extends AbstractJDBCDataFeatureCollection {
24
	protected IFeatureType featureType;
24
	protected DBFeatureType featureType;
25 25
	protected String filter;
26 26
	protected String totalFilter;
27 27
	protected H2Store store;
......
31 31
	private String sqlCount;
32 32
	private String totalOrder;
33 33

  
34
	H2FeatureCollection(H2Store store,IFeatureType type, String filter, String order) {
34
	H2FeatureCollection(H2Store store,DBFeatureType type, String filter, String order) {
35 35
		this.store=store;
36 36
		this.featureType=type;
37 37
		this.filter=filter;
......
137 137

  
138 138
	protected class H2Iterator implements Iterator{
139 139
		private ResultSet rs;
140
		private JDBCStore store;
141
		private IFeatureType featureType;
140
		private H2Store store;
141
		private DBFeatureType featureType;
142 142

  
143
		public H2Iterator(JDBCStore store,IFeatureType featureType ,ResultSet rs){
143
		public H2Iterator(H2Store store,DBFeatureType featureType ,ResultSet rs){
144 144
			this.rs = rs;
145 145
			this.store = store;
146 146
			this.featureType = featureType;
......
178 178
				IFeature feature=null;
179 179
				try {
180 180
					if(rs.next()){
181
						feature = H2Utils.createFeature(this.store, this.rs, this.featureType);
181
						feature = this.store.createFeatureFromResulset(this.rs, this.featureType);
182 182
					} else {
183 183
						rs.close();
184 184
						rs.getStatement().close();

Also available in: Unified diff