Revision 599

View differences:

org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/dataObjects/FlyrVectIVectorLayer.java
40 40 
import org.gvsig.fmap.dal.feature.EditableFeature;
41 41 
import org.gvsig.fmap.dal.feature.EditableFeatureType;
42 42 
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
43 
import org.gvsig.fmap.dal.feature.FeatureSelection;
43 44 
import org.gvsig.fmap.dal.feature.FeatureStore;
44 45 
import org.gvsig.fmap.dal.feature.FeatureType;
45 46 
import org.gvsig.fmap.dal.feature.NewFeatureStoreParameters;
......
379 380 
    public int getShapesCount() {
380 381 
        if (featureStore != null) {
381 382 
            try {
382 
            	return (int)featureStore.getFeatureSet().getSize();
383 
            	FeatureSelection featureSelection = featureStore.getFeatureSelection();
384 
            	if (!featureSelection.isEmpty()) {
385 
            		return (int)featureSelection.getSize();
386 
            	} else {
387 
            		return (int)featureStore.getFeatureSet().getSize();
388 
            	}
383 389 
            } catch (final DataException e) {
384 390 
                Sextante.addErrorToLog(e);
385 391 
                return 0;
org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/dataObjects/DALIFeatureIterator.java
39 39 
import org.gvsig.fmap.dal.exception.DataException;
40 40 
import org.gvsig.fmap.dal.feature.Feature;
41 41 
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
42 
import org.gvsig.fmap.dal.feature.FeatureSelection;
42 43 
import org.gvsig.fmap.dal.feature.FeatureSet;
44 
import org.gvsig.fmap.dal.feature.FeatureStore;
43 45 
import org.gvsig.fmap.dal.feature.FeatureType;
44 46 
import org.gvsig.fmap.geom.operation.tojts.ToJTS;
45 47 
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
......
60 62 
        m_Filters = filters;
61 63 

  		




  62
  64
  
    
        FeatureSet set = null;


  		




  
  65
  
    
        FeatureStore featureStore = layer.getFeatureStore();


  		




  63
  66
  
    
        try {


  		




  64
  
  
    
            set = layer.getFeatureStore().getFeatureSet();


  		




  
  67
  
    
        	FeatureSelection featureSelection = featureStore.getFeatureSelection();


  		




  
  68
  
    
			if (!featureSelection.isEmpty()){


  		




  
  69
  
    
            	set = featureSelection;


  		




  
  70
  
    
			} else {


  		




  
  71
  
    
				set = featureStore.getFeatureSet();


  		




  
  72
  
    
			}


  		




  65
  73
  
    
            m_FeatureIterator = set.fastIterator();


  		




  66
  74
  
    
        } catch (final DataException e) {


  		




  67
  75
  
    
            if (m_FeatureIterator != null) {


  		












Also available in:  Unified diff