Revision 35338

View differences:

branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/spi/AbstractDataProviderIterator.java
26 26
*/
27 27
package org.gvsig.fmap.dal.spi;
28 28

  
29
import org.gvsig.tools.dispose.DisposableIterator;
30 29
import org.gvsig.fmap.dal.feature.spi.FeatureProvider;
31 30
import org.gvsig.fmap.dal.resource.Resource;
32 31
import org.gvsig.fmap.dal.resource.ResourceAction;
32
import org.gvsig.tools.dispose.DisposableIterator;
33 33
import org.gvsig.tools.dispose.impl.AbstractDisposable;
34 34

  
35 35
/**
......
66 66
		this.dataStoreProvider = dataStoreProvider;
67 67
	}
68 68

  
69
	public final Object next() {
69
    public Object next() {
70 70
		return getResource().execute(nextResourceAction);
71 71
	}
72 72

  
73
	public final boolean hasNext() {
73
    public boolean hasNext() {
74 74
		Object hasNext = getResource().execute(hasNextResourceAction);
75 75
		return ((Boolean) hasNext).booleanValue();
76 76
	}
branches/v2_0_0_prep/libraries/libFMap_daldb/src/org/gvsig/fmap/dal/store/jdbc/JDBCIterator.java
30 30
import java.util.NoSuchElementException;
31 31

  
32 32
import org.gvsig.fmap.dal.exception.DataException;
33
import org.gvsig.fmap.dal.exception.OpenException;
33 34
import org.gvsig.fmap.dal.feature.FeatureType;
34 35
import org.gvsig.fmap.dal.feature.spi.AbstractFeatureProviderIterator;
35 36
import org.gvsig.fmap.dal.feature.spi.FeatureProvider;
......
63 64
		return (JDBCStoreProvider) getFeatureStoreProvider();
64 65
	}
65 66

  
67
    public final Object next() {
68
        try {
69
            getDataStoreProvider().open();
70
        } catch (OpenException e) {
71
            throw new RuntimeException(e);
72
        }
73
        return internalNext();
74
    }
75

  
76
    public final boolean hasNext() {
77
        return internalHasNext();
78
    }
79

  
66 80
	@Override
67 81
	protected boolean internalHasNext() {
68 82
		if (hasNext == null) {

Also available in: Unified diff