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/DefaultFeatureStore.java

View differences:

DefaultFeatureStore.java
46 46
import org.apache.commons.io.FilenameUtils;
47 47
import org.apache.commons.lang3.StringUtils;
48 48
import org.cresques.cts.IProjection;
49
import org.gvsig.expressionevaluator.Expression;
49 50

  
50 51
import org.gvsig.fmap.dal.DALLocator;
51 52
import org.gvsig.fmap.dal.DataManager;
......
1808 1809
    }
1809 1810

  
1810 1811
    @Override
1812
    public FeatureSet getFeatureSet(Expression filter) throws DataException {
1813
        return this.getFeatureSet(filter, null, true);
1814
    }
1815
    
1816
    @Override
1817
    public FeatureSet getFeatureSet(Expression filter, String sortBy) throws DataException {
1818
        return this.getFeatureSet(filter, sortBy, true);
1819
    }
1820
    
1821
    @Override
1822
    public FeatureSet getFeatureSet(Expression filter, String sortBy, boolean asc) throws DataException {
1823
        FeatureQuery query = this.createFeatureQuery();
1824
        if( filter!=null ) {
1825
            query.setFilter(filter);
1826
        }
1827
        if( !StringUtils.isEmpty(sortBy) ) {
1828
            query.getOrder().add(sortBy, asc);
1829
        }
1830
        return this.getFeatureSet(query);
1831
    }
1832
    
1833
    @Override
1811 1834
    public FeatureSet getFeatureSet(String filter, String sortBy, boolean asc) throws DataException {
1812 1835
        FeatureQuery query = this.createFeatureQuery();
1813 1836
        if( !StringUtils.isEmpty(filter) ) {
......
1842 1865
    }
1843 1866
    
1844 1867
    @Override
1868
    public List<Feature> getFeatures(Expression filter)  {
1869
        return this.getFeatures(filter, null, true);
1870
    }
1871

  
1872
    @Override
1873
    public List<Feature> getFeatures(Expression filter, String sortBy)  {
1874
        return this.getFeatures(filter, sortBy, true);
1875
    }
1876

  
1877
    @Override
1878
    public List<Feature> getFeatures(Expression filter, String sortBy, boolean asc)  {
1879
        FeatureQuery query = this.createFeatureQuery();
1880
        if( filter!=null ) {
1881
            query.setFilter(filter);
1882
        }
1883
        if( !StringUtils.isEmpty(sortBy) ) {
1884
            query.getOrder().add(sortBy, asc);
1885
        }
1886
        return this.getFeatures(query, 100);
1887
    }
1888
    
1889
    @Override
1845 1890
    public List<Feature> getFeatures(FeatureQuery query)  {
1846 1891
        return this.getFeatures(query, 100);
1847 1892
    }
......
1884 1929
    }
1885 1930
    
1886 1931
    @Override
1932
    public Feature findFirst(Expression filter) throws DataException {
1933
        return this.findFirst(filter, null, true);
1934
    }
1935

  
1936
    @Override
1937
    public Feature findFirst(Expression filter, String sortBy) throws DataException {
1938
        return this.findFirst(filter, sortBy, true);
1939
    }
1940

  
1941
    @Override
1942
    public Feature findFirst(Expression filter, String sortBy, boolean asc) throws DataException {
1943
        FeatureSet set = this.getFeatureSet(filter, sortBy, asc);
1944
        if( set==null || set.isEmpty() ) {
1945
            return null;
1946
        }
1947
        DisposableIterator it = set.iterator();
1948
        Feature f = (Feature) it.next();
1949
        it.dispose();
1950
        return f;
1951
    }
1952
    
1953
    @Override
1887 1954
    public void accept(Visitor visitor) throws BaseException {
1888 1955
        FeatureSet set = getFeatureSet();
1889 1956
        try {

Also available in: Unified diff