Revision 42971

View differences:

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
27 27
import java.util.HashMap;
28 28
import java.util.List;
29 29
import java.util.Map;
30

  
30
import java.util.logging.Level;
31
import java.util.logging.Logger;
32
import org.gvsig.fmap.dal.DALLocator;
33
import org.gvsig.fmap.dal.exception.InitializeException;
31 34
import org.gvsig.fmap.dal.feature.FeatureQuery;
32 35
import org.gvsig.fmap.dal.feature.FeatureQueryOrder;
33 36
import org.gvsig.fmap.dal.feature.FeatureType;
......
261 264
    public Evaluator getFilter() {
262 265
        return filter;
263 266
    }
267
    
268
    @Override
269
    public void setFilter(String filter) {
270
        try {
271
            this.setFilter(DALLocator.getDataManager().createExpresion(filter));
272
        } catch (Exception ex) {
273
            throw new RuntimeException("Can't create filter from '"+filter+"'",ex);
274
        }
275
    }
264 276

  
265 277
    public void setFilter(Evaluator filter) {
266 278
        this.filter = filter;
......
269 281
    }
270 282

  
271 283
    @Override
284
    public void addFilter(String filter) {
285
        try {
286
            this.addFilter(DALLocator.getDataManager().createExpresion(filter));
287
        } catch (Exception ex) {
288
            throw new RuntimeException("Can't create filter from '"+filter+"'",ex);
289
        }
290
    }
291
    
292
    @Override
272 293
    public void addFilter(Evaluator evaluator) {
273 294
        if( evaluator == null ) {
274 295
            return;
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.api/src/main/java/org/gvsig/fmap/dal/feature/FeatureQuery.java
176 176
	 *            the filter to apply to the {@link Feature}s to load
177 177
	 */
178 178
	void setFilter(Evaluator filter);
179
        
180
        void setFilter(String filter);
179 181
	
180 182
	/**
181 183
	 * Adds a filter to apply to the {@link Feature}s to load. A query
......
188 190
	 */
189 191
	void addFilter(Evaluator filter);
190 192

  
193
        void addFilter(String filter);
194
        
191 195
	/**
192 196
	 * Returns if a filter has been defined for the query.
193 197
	 * 

Also available in: Unified diff