Revision 27525 branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/FLyrVect.java
| FLyrVect.java | ||
|---|---|---|
| 46 | 46 |
import java.awt.geom.Point2D; |
| 47 | 47 |
import java.awt.image.BufferedImage; |
| 48 | 48 |
import java.net.URI; |
| 49 |
import java.util.Iterator; |
|
| 50 | 49 |
import java.util.Set; |
| 51 | 50 |
import java.util.TreeSet; |
| 52 | 51 |
|
| ... | ... | |
| 60 | 59 |
import org.gvsig.fmap.dal.DataStoreParameters; |
| 61 | 60 |
import org.gvsig.fmap.dal.exception.DataException; |
| 62 | 61 |
import org.gvsig.fmap.dal.exception.ReadException; |
| 62 |
import org.gvsig.fmap.dal.feature.DisposableIterator; |
|
| 63 | 63 |
import org.gvsig.fmap.dal.feature.Feature; |
| 64 | 64 |
import org.gvsig.fmap.dal.feature.FeatureQuery; |
| 65 | 65 |
import org.gvsig.fmap.dal.feature.FeatureSelection; |
| ... | ... | |
| 462 | 462 |
|
| 463 | 463 |
} |
| 464 | 464 |
featureSet = featureStore.getFeatureSet(featureQuery); |
| 465 |
Iterator it = featureSet.fastIterator(); |
|
| 465 |
DisposableIterator it = featureSet.fastIterator();
|
|
| 466 | 466 |
|
| 467 | 467 |
ZSort zSort = ((IVectorLegend) getLegend()).getZSort(); |
| 468 | 468 |
|
| ... | ... | |
| 723 | 723 |
imageLevels = null; |
| 724 | 724 |
graphics = null; |
| 725 | 725 |
} |
| 726 |
// it.closeIterator(); |
|
| 727 |
it=null; |
|
| 726 |
it.dispose(); + |
|
| 728 | 727 |
featureSet.dispose(); |
| 729 | 728 |
|
| 730 | 729 |
if (bSymbolLevelError) {
|
| ... | ... | |
| 804 | 804 |
} |
| 805 | 805 |
|
| 806 | 806 |
|
| 807 |
FeatureSet featureCollection=null;
|
|
| 807 |
FeatureSet featureSet=null;
|
|
| 808 | 808 |
FeatureQuery featureQuery=featureStore.createFeatureQuery(); |
| 809 | 809 |
featureQuery.setAttributeNames(fieldNames); |
| 810 | 810 |
featureQuery.setScale(scale); |
| 811 | 811 |
// ??SQLJEPEvaluator evaluator=new SQLJEPEvaluator(featureFilter); |
| 812 | 812 |
ContainsEnvelopeEvaluator iee=new ContainsEnvelopeEvaluator(viewPort.getAdjustedExtent(),viewPort.getProjection(),featureStore.getDefaultFeatureType(),featureStore.getDefaultFeatureType().getDefaultGeometryAttributeName()); |
| 813 | 813 |
featureQuery.setFilter(iee); |
| 814 |
featureCollection = featureStore.getFeatureSet(featureQuery); Iterator it = featureCollection.iterator(); |
|
| 814 |
featureSet = featureStore.getFeatureSet(featureQuery); |
|
| 815 |
DisposableIterator it = featureSet.fastIterator(); |
|
| 815 | 816 |
|
| 816 | 817 |
// Iteration over each feature |
| 817 | 818 |
while ( !cancel.isCanceled() && it.hasNext()) {
|
| ... | ... | |
| 883 | 884 |
doc.setDPI(dpi); |
| 884 | 885 |
geom.invokeOperation(DrawInts.CODE,doc); |
| 885 | 886 |
} |
| 886 |
} |
|
| 887 |
} |
|
| 888 |
it.dispose(); |
|
| 887 | 889 |
it=null; |
| 888 |
featureCollection.dispose();
|
|
| 890 |
featureSet.dispose();
|
|
| 889 | 891 |
} |
| 890 | 892 |
} catch (ReadException e) {
|
| 891 | 893 |
this.setVisible(false); |
| ... | ... | |
| 1715 | 1717 |
+ this.featureStore.getMetadataName(); |
| 1716 | 1718 |
} |
| 1717 | 1719 |
public String getTypeVectorLayer() throws DataException {
|
| 1718 |
|
|
| 1720 |
// FIXME Esto deberia de pedirse a FType!!!! |
|
| 1719 | 1721 |
String typeString=""; |
| 1720 | 1722 |
int typeShape = this.getShapeType(); |
| 1721 | 1723 |
FeatureStore fs = this.getFeatureStore(); |
| 1722 | 1724 |
|
| 1723 | 1725 |
Geometry geom = null; |
| 1724 | 1726 |
FeatureSet set=fs.getFeatureSet(); |
| 1725 |
Iterator iter = set.fastIterator(); |
|
| 1727 |
DisposableIterator iter = set.fastIterator();
|
|
| 1726 | 1728 |
if (iter.hasNext()) {
|
| 1727 | 1729 |
Feature feature = (Feature) iter.next(); |
| 1728 | 1730 |
geom = feature.getDefaultGeometry(); |
| 1729 | 1731 |
} |
| 1730 |
iter = null;
|
|
| 1732 |
iter.dispose();
|
|
| 1731 | 1733 |
set.dispose(); |
| 1732 | 1734 |
if (Geometry.TYPES.GEOMETRY==typeShape){
|
| 1733 | 1735 |
if (geom != null) {
|
Also available in: Unified diff