Revision 23303 branches/v2_0_0_prep/libraries/libFMap_data/src/org/gvsig/fmap/data/feature/joinstore/JoinFeatureStore.java

View differences:

JoinFeatureStore.java
38 38
import java.util.List;
39 39
import java.util.Map;
40 40

  
41
import org.gvsig.tools.exception.BaseException;
42 41
import org.gvsig.fmap.data.CloseException;
43 42
import org.gvsig.fmap.data.DataCollection;
44 43
import org.gvsig.fmap.data.DataException;
......
58 57
import org.gvsig.fmap.data.feature.IsNotAttributeSettingException;
59 58
import org.gvsig.fmap.data.index.IndexException;
60 59
import org.gvsig.metadata.IMetadata;
60
import org.gvsig.tools.exception.BaseException;
61 61
import org.gvsig.tools.observer.Observable;
62 62
import org.gvsig.tools.observer.Observer;
63 63

  
......
101 101
		//		JoinFeatureCollection complexDataCollection=new JoinFeatureCollection(this,type,filter,order);
102 102
		//		return complexDataCollection;
103 103
		this.checkChanged();
104
		if (type == null) {
105
			type = this.defaultFeatureType;
106
		} else if (!(type instanceof JoinFeatureType)) {
104

  
105
		try {
106
			type = this.checkFeatureTypeForCollection(type);
107
		} catch (DataException e) {
108
			throw new ReadException(this.getName(), e);
109
		}
110

  
111
		if (!(type instanceof JoinFeatureType)) {
107 112
			throw new ReadException("incompatible types", this.getName());
108
		} else if (!(type.isSubtypeOf(this.defaultFeatureType))) {
109
			throw new ReadException("incompatible types", this.getName());
110 113
		}
111 114

  
112 115
		FeatureCollection coll;

Also available in: Unified diff