Revision 23842 branches/v2_0_0_prep/libraries/libFMap_dataDB/src/org/gvsig/fmap/data/feature/db/jdbc/h2/H2Store.java
| H2Store.java | ||
|---|---|---|
| 7 | 7 |
import java.util.Iterator; |
| 8 | 8 |
import java.util.Locale; |
| 9 | 9 |
|
| 10 |
import org.gvsig.fmap.data.DataCollection;
|
|
| 10 |
import org.gvsig.fmap.data.DataSet;
|
|
| 11 | 11 |
import org.gvsig.fmap.data.DataExplorer; |
| 12 | 12 |
import org.gvsig.fmap.data.DataManager; |
| 13 | 13 |
import org.gvsig.fmap.data.exceptions.CloseException; |
| ... | ... | |
| 16 | 16 |
import org.gvsig.fmap.data.exceptions.OpenException; |
| 17 | 17 |
import org.gvsig.fmap.data.exceptions.ReadException; |
| 18 | 18 |
import org.gvsig.fmap.data.feature.Feature; |
| 19 |
import org.gvsig.fmap.data.feature.FeatureCollection;
|
|
| 19 |
import org.gvsig.fmap.data.feature.FeatureSet;
|
|
| 20 | 20 |
import org.gvsig.fmap.data.feature.FeatureType; |
| 21 | 21 |
import org.gvsig.fmap.data.feature.db.DBFeatureType; |
| 22 | 22 |
import org.gvsig.fmap.data.feature.db.DBResource; |
| ... | ... | |
| 84 | 84 |
} |
| 85 | 85 |
|
| 86 | 86 |
|
| 87 |
public DataCollection getDataCollection(FeatureType type, String filter, String order) throws ReadException {
|
|
| 87 |
public DataSet getDataCollection(FeatureType type, String filter, String order) throws ReadException {
|
|
| 88 | 88 |
try {
|
| 89 | 89 |
type = this.checkFeatureTypeForCollection(type); |
| 90 | 90 |
} catch (DataException e) {
|
| ... | ... | |
| 97 | 97 |
} |
| 98 | 98 |
} |
| 99 | 99 |
|
| 100 |
FeatureCollection coll;
|
|
| 100 |
FeatureSet coll;
|
|
| 101 | 101 |
if (featureManager == null){
|
| 102 | 102 |
coll=new H2FeatureCollection(this,(DBFeatureType)type,filter,order); |
| 103 | 103 |
}else{
|
| ... | ... | |
| 193 | 193 |
} |
| 194 | 194 |
if (this.alterMode){
|
| 195 | 195 |
Envelope extent=(Envelope)metadata.get("extent");
|
| 196 |
FeatureCollection featureCollection=(FeatureCollection)getDataCollection();
|
|
| 196 |
FeatureSet featureCollection=(FeatureSet)getDataSet();
|
|
| 197 | 197 |
if (spatialManager.isFullExtentDirty()){
|
| 198 | 198 |
if (!featureCollection.isEmpty()){
|
| 199 | 199 |
Iterator featureIterator=featureCollection.iterator(); |
| ... | ... | |
| 229 | 229 |
Envelope result = new DefaultEnvelope(2); |
| 230 | 230 |
|
| 231 | 231 |
String geomField = this.getParametersH2().getDefaultGeometryField(); |
| 232 |
FeatureCollection coll = (FeatureCollection) this.getDataCollection(new String[] {geomField},null,null);
|
|
| 232 |
FeatureSet coll = (FeatureSet) this.getDataCollection(new String[] {geomField},null,null);
|
|
| 233 | 233 |
Iterator iter = coll.iterator(); |
| 234 | 234 |
Feature feature; |
| 235 | 235 |
Geometry geom; |
Also available in: Unified diff