Revision 44023 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/DefaultFeatureQuery.java
| DefaultFeatureQuery.java | ||
|---|---|---|
| 31 | 31 |
import java.util.logging.Logger; |
| 32 | 32 |
import org.apache.commons.lang3.ArrayUtils; |
| 33 | 33 |
import org.apache.commons.lang3.StringUtils; |
| 34 |
import org.gvsig.expressionevaluator.Expression; |
|
| 34 | 35 |
import org.gvsig.fmap.dal.DALLocator; |
| 35 | 36 |
import org.gvsig.fmap.dal.DataTypes; |
| 36 | 37 |
import org.gvsig.fmap.dal.exception.DataException; |
| ... | ... | |
| 40 | 41 |
import org.gvsig.fmap.dal.feature.FeatureQueryOrder; |
| 41 | 42 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
| 42 | 43 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| 44 |
import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultExpressionEvaluator; |
|
| 43 | 45 |
import org.gvsig.tools.ToolsLocator; |
| 44 | 46 |
import org.gvsig.tools.dynobject.DynStruct; |
| 45 | 47 |
import org.gvsig.tools.evaluator.AndEvaluator; |
| ... | ... | |
| 329 | 331 |
} |
| 330 | 332 |
|
| 331 | 333 |
@Override |
| 334 |
public void setFilter(Expression filter) {
|
|
| 335 |
Evaluator x = new DefaultExpressionEvaluator(filter); |
|
| 336 |
this.setFilter(x); |
|
| 337 |
} |
|
| 338 |
|
|
| 339 |
@Override |
|
| 332 | 340 |
public void setFilter(String filter) {
|
| 333 | 341 |
if( StringUtils.isEmpty(filter) ) {
|
| 334 | 342 |
this.clearFilter(); |
| ... | ... | |
| 364 | 372 |
} |
| 365 | 373 |
|
| 366 | 374 |
@Override |
| 375 |
public void addFilter(Expression filter) {
|
|
| 376 |
Evaluator x = new DefaultExpressionEvaluator(filter); |
|
| 377 |
this.addFilter(x); |
|
| 378 |
} |
|
| 379 |
|
|
| 380 |
@Override |
|
| 367 | 381 |
public void addFilter(Evaluator evaluator) {
|
| 368 | 382 |
if (evaluator == null) {
|
| 369 | 383 |
return; |
Also available in: Unified diff