Revision 44207 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/featureset/FilteredIterator.java
| FilteredIterator.java | ||
|---|---|---|
| 25 | 25 |
|
| 26 | 26 |
import java.util.Iterator; |
| 27 | 27 |
import java.util.NoSuchElementException; |
| 28 |
import org.apache.commons.lang3.BooleanUtils; |
|
| 28 | 29 |
|
| 29 | 30 |
import org.gvsig.fmap.dal.exception.DataEvaluatorException; |
| 30 | 31 |
import org.gvsig.fmap.dal.exception.DataException; |
| ... | ... | |
| 120 | 121 |
public boolean match(DefaultFeature feature) throws DataException {
|
| 121 | 122 |
try {
|
| 122 | 123 |
if (filter==null) {
|
| 123 |
return true;
|
|
| 124 |
return true;
|
|
| 124 | 125 |
} |
| 125 |
return ((Boolean) this.filter.evaluate(feature)).booleanValue(); |
|
| 126 |
Object x = this.filter.evaluate(feature); |
|
| 127 |
if( x == null ) {
|
|
| 128 |
return false; |
|
| 129 |
} else if( x instanceof Boolean ) {
|
|
| 130 |
return ((Boolean) x); |
|
| 131 |
} else {
|
|
| 132 |
return true; |
|
| 133 |
} |
|
| 126 | 134 |
} catch (EvaluatorException e) {
|
| 127 | 135 |
throw new DataEvaluatorException(e); |
| 128 | 136 |
} |
Also available in: Unified diff