Revision 25751 branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/impl/featureset/FilteredIterator.java

View differences:

FilteredIterator.java
5 5

  
6 6
import org.gvsig.fmap.dal.exception.DataEvaluatorException;
7 7
import org.gvsig.fmap.dal.exception.DataException;
8
import org.gvsig.fmap.dal.feature.Feature;
8 9
import org.gvsig.fmap.dal.feature.impl.DefaultFeature;
9 10
import org.gvsig.fmap.dal.feature.spi.FeatureData;
10 11
import org.gvsig.tools.evaluator.Evaluator;
......
48 49
		DefaultFeature feature;
49 50
		FeatureData data;
50 51
		while (this.getIterator().hasNext()) {
51
			data = (FeatureData) this.getIterator().next();
52
			data = (FeatureData)this.getIterator().next();
52 53
			if (isDeleted(data)) {
53 54
				continue;
54 55
			}
......
82 83

  
83 84
	public boolean match(DefaultFeature feature) throws DataException {
84 85
		try {
86
			if (filter==null)
87
				return true;
85 88
			return ((Boolean) this.filter.evaluate(feature)).booleanValue();
86 89
		} catch (EvaluatorException e) {
87 90
			throw new DataEvaluatorException(e);

Also available in: Unified diff