Revision 19663 trunk/libraries/libDataSourceDBBaseDrivers/src/org/gvsig/data/datastores/vectorial/driver/jdbc/h2/H2FeaturesReader.java

View differences:

H2FeaturesReader.java
2 2

  
3 3
import org.gvsig.data.datastores.vectorial.driver.IDriver;
4 4
import org.gvsig.data.datastores.vectorial.driver.IFeaturesReader;
5
import org.gvsig.data.exception.ReadException;
5 6
import org.gvsig.data.vectorial.IFeatureCollection;
6 7
import org.gvsig.data.vectorial.IFeatureType;
7 8
import org.gvsig.data.vectorial.expansionadapter.FeatureManager;
......
12 13
		this.driver=(H2Driver)driver;
13 14
	}
14 15

  
15
	public IFeatureCollection getFeatures(FeatureManager featureManager, IFeatureType type, String filter, String order) {
16
	public IFeatureCollection getFeatures(FeatureManager featureManager, IFeatureType type, String filter, String order) throws ReadException {
16 17
		IFeatureCollection coll;
17
//		if (featureManager == null){
18
		if (featureManager == null){
18 19
			coll=new H2FeatureCollection(driver,type,filter,order);
19
//		}else{
20
//			coll=new H2FeatureCollectionWithFeatureID(featureManager,driver,type,filter,order);
21
//		}
20
		}else{
21
			if ((order != null && order != "")){
22
				coll=new H2FeatureCollectionWithFeatureID(featureManager,driver,type,filter,order);
23
			} else{
24
				if (filter == null || filter == ""){
25
					coll=new H2FeatureCollectionEditing(featureManager,driver,type);
26
				} else {
27
					coll=new H2FeatureCollectionEditingFiltered(featureManager,driver,type,filter);
28
				}
29
			}
22 30

  
31

  
32
		}
33

  
23 34
		return coll;
24 35

  
25 36

  

Also available in: Unified diff