Revision 44441

View differences:

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/memory/MemoryFeatureProviderAttributeMapper.java
47 47
 *
48 48
 */
49 49
public class MemoryFeatureProviderAttributeMapper implements FeatureProvider {
50
	private final DefaultFeatureProvider original;
50
	private final FeatureProvider original;
51 51
	private final FeatureType myFeatureType;
52 52

  
53 53
	/**
......
58 58
	 * @param featureType
59 59
	 *            to expose
60 60
	 */
61
	public MemoryFeatureProviderAttributeMapper(DefaultFeatureProvider original,
61
	public MemoryFeatureProviderAttributeMapper(FeatureProvider original,
62 62
			FeatureType featureType) {
63 63
		this.original = original;
64 64
		this.myFeatureType = featureType;
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/memory/MemoryFeatureSet.java
33 33
import org.gvsig.fmap.dal.feature.spi.AbstractFeatureProviderIterator;
34 34
import org.gvsig.fmap.dal.feature.spi.AbstractFeatureSetProvider;
35 35
import org.gvsig.fmap.dal.feature.spi.AbstractFeatureStoreProvider;
36
import org.gvsig.fmap.dal.feature.spi.DefaultFeatureProvider;
36
import org.gvsig.fmap.dal.feature.spi.FeatureProvider;
37 37
import org.gvsig.fmap.dal.feature.spi.FeatureSetProvider;
38 38
import org.gvsig.fmap.dal.feature.spi.FeatureStoreProvider;
39 39
import org.gvsig.tools.dispose.Disposable;
......
154 154
		}
155 155

  
156 156
		protected Object internalNext() {
157
			DefaultFeatureProvider feature =
158
					(DefaultFeatureProvider) super.internalNext();
159
			if (fType == null) {
160
				return feature;
161
			} else {
162
				return new MemoryFeatureProviderAttributeMapper(feature,
163
						this.fType);
164
			}
157
                    FeatureProvider feature = (FeatureProvider) super.internalNext();
158
                    if (fType == null) {
159
                        return feature;
160
                    } else {
161
                        return new MemoryFeatureProviderAttributeMapper(
162
                                feature,
163
                                this.fType
164
                        );
165
                    }
165 166

  
166
		}
167
                }
167 168
	}
168 169
}

Also available in: Unified diff