/ - Diff - Application: gvSIG desktop - gvSIG

     	FastFilteredIterator(DefaultFeatureSet featureSet, long index)
     			throws DataException {
     		super(featureSet, index);
     		myFeature = new DefaultFeature(fset.store);
     		initializeFeature();
     		this.iterator = featureSet.provider.fastIterator();
     		if (index > 0) {
-...
     					myFeature, fset.getDefaultFeatureType());
+    		}
+    	}
     	protected void initializeFeature() {
     		myFeature = new DefaultFeature(fset.store);
+    	}
     	public void remove() {
     		super.remove();
     		this.initializeFeature();
+    	}
+    }

     import java.util.Iterator;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.dal.feature.FeatureReference;
     import org.gvsig.fmap.dal.feature.impl.DefaultFeature;
     import org.gvsig.fmap.dal.feature.impl.DefaultFeatureReference;
-...
     	Iterator newsFeatures;
     	boolean featureIsNew;
     	protected Feature lastFeature = null;
     	public EditedIterator(DefaultFeatureSet featureSet) {
     		super(featureSet);
+    	}
-...
     		return fset.store.getFeatureManager().isDeleted(ref);
+    	}
     	public void remove() {
     		if (lastFeature == null) {
     			throw new IllegalStateException();
+    		}
     		try {
     			this.fset.store.delete(this.lastFeature);
     		} catch (DataException e) {
     			// FIXME Cambiar excepcion a una Runtime de DAL
     			throw new RuntimeException(e);
+    		}
     		lastFeature = null;
+    	}
     	public Object next() {
     		lastFeature = null;
     		lastFeature = (Feature) super.next();
     		return lastFeature;
+    	}
+    }

     		if (this.current == null) {
     			throw new NoSuchElementException();
+    		}
     		this.lastFeature = null;
     		nextChecked = false;
     		DefaultFeature feature = this.current;
     		this.current = null;
     		this.lastFeature = feature;
     		return feature;
+    	}

+    	}
     	public long getSize() throws DataException {
     		this.checkModified();
     		if (size < 0) {
     			size = calculateSize();
+    		}
-...
     	public void delete(Feature feature) throws DataException {
     		this.featureToIgnoreNotification = feature;
     		this.store.delete(feature);
     		if (this.size > 0) {
     			this.size--;
+    		}
     		this.featureToIgnoreNotification = null;
+    	}
     	public void insert(EditableFeature feature) throws DataException {
     		this.featureToIgnoreNotification = feature;
     		this.store.insert(feature);
     		if (this.size >= 0) {
     			this.size++;
+    		}
     		this.featureToIgnoreNotification = null;
+    	}

     	public FastDefaultIterator(DefaultFeatureSet featureSet, long index)
     			throws DataException {
     		super(featureSet);
     		myFeature = new DefaultFeature(fset.store);
     		this.initializeFeature();
     		if (index > 0) {
     			if (featureSet.provider.canIterateFromIndex()) {
     				try {
-...
     							.getDefaultFeatureType());
+    		}
+    	}
     	protected void initializeFeature() {
     		myFeature = new DefaultFeature(fset.store);
+    	}
     	public void remove() {
     		super.remove();
     		this.initializeFeature();
+    	}
+    }

     import java.util.Iterator;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.dal.feature.impl.DefaultFeature;
     import org.gvsig.fmap.dal.feature.spi.FeatureData;
-...
     	protected Iterator iterator;
     	protected DefaultFeatureSet fset;
     	protected Feature lastFeature = null;
     	public DefaultIterator(DefaultFeatureSet featureSet) {
     		this.fset = featureSet;
-...
     	public Object next() {
     		fset.checkModified();
     		lastFeature = null;
     		try {
     			return this.createFeature((FeatureData) this.getIterator().next());
     			lastFeature = this.createFeature((FeatureData) this.getIterator()
     					.next());
     			return lastFeature;
     		} catch (DataException e) {
     			RuntimeException ex = new RuntimeException();
     			e.initCause(e);
-...
+    	}
     	public void remove() {
     		throw new UnsupportedOperationException();
     		if (!fset.store.isEditing()) {
     			throw new UnsupportedOperationException();
+    		}
     		if (lastFeature == null) {
     			throw new IllegalStateException();
+    		}
     		try {
     			this.fset.delete(this.lastFeature);
     		} catch (DataException e) {
     			// FIXME Cambiar excepcion a una Runtime de DAL
     			throw new RuntimeException(e);
+    		}
     		lastFeature = null;
+    	}
     	protected DefaultFeature createFeature(FeatureData fData)

     import java.util.Iterator;
     import java.util.List;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.dal.feature.impl.DefaultFeature;
-...
+    		}
+    	}
     	public Object next() {
     		lastFeature = null;
     		lastFeature = (Feature) super.next();
     		return lastFeature;
+    	}
     	public void remove() {
     		if (!fset.store.isEditing()) {
     			throw new UnsupportedOperationException();
+    		}
     		if (this.lastFeature == null) {
     			throw new IllegalStateException();
+    		}
     		try {
     			fset.store.delete(this.lastFeature);
     		} catch (DataException e) {
     			// FIXME Cambiar excepcion a una Runtime de DAL
     			throw new RuntimeException(e);
+    		}
     		super.remove();
     		this.iterator.remove();
+    	}

Application: gvSIG desktop