Revision 23842 branches/v2_0_0_prep/libraries/libFMap_data/src/org/gvsig/fmap/data/feature/joinstore/JoinFeatureCollectionWithFeatureID.java

View differences:

JoinFeatureCollectionWithFeatureID.java
9 9
import org.gvsig.fmap.data.DataStore;
10 10
import org.gvsig.fmap.data.exceptions.ReadException;
11 11
import org.gvsig.fmap.data.feature.Feature;
12
import org.gvsig.fmap.data.feature.FeatureCollection;
12
import org.gvsig.fmap.data.feature.FeatureSet;
13 13
import org.gvsig.fmap.data.feature.FeatureStore;
14 14
import org.gvsig.fmap.data.feature.FeatureType;
15 15
import org.gvsig.fmap.data.feature.expressionevaluator.Filter;
......
53 53
			}
54 54

  
55 55

  
56
			FeatureCollection coll = (FeatureCollection) this.store
57
					.getDataCollection();
56
			FeatureSet coll = (FeatureSet) this.store
57
					.getDataSet();
58 58
			Iterator iter = coll.iterator();
59 59
			if (fFilter != null) {
60 60
				while (iter.hasNext()) {
61 61
					Feature feature = (Feature) iter.next();
62 62
					if (fFilter.evaluate(feature)) {
63
						featureIDs.add(feature.getID());
63
						featureIDs.add(feature.getReference());
64 64
					}
65 65
				}
66 66
			} else {
67 67
				while (iter.hasNext()) {
68 68
					Feature feature = (Feature) iter.next();
69
					featureIDs.add(feature.getID());
69
					featureIDs.add(feature.getReference());
70 70
				}
71 71

  
72 72
			}
......
88 88
	public boolean contains(Object o) {
89 89
		checkModified();
90 90
		if (o instanceof Feature){
91
			featureIDs.contains(((Feature)o).getID());
91
			featureIDs.contains(((Feature)o).getReference());
92 92
		}
93 93
		return featureIDs.contains(o);
94 94
	}

Also available in: Unified diff