Revision 1055 org.gvsig.geoprocess/branches/refactor-2018/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/dataObjects/DALIFeatureIterator.java

View differences:

DALIFeatureIterator.java
43 43
import org.gvsig.fmap.dal.feature.FeatureSet;
44 44
import org.gvsig.fmap.dal.feature.FeatureStore;
45 45
import org.gvsig.fmap.dal.feature.FeatureType;
46
import org.gvsig.fmap.geom.operation.GeometryOperationException;
47
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException;
46 48
import org.gvsig.fmap.geom.operation.tojts.ToJTS;
47 49
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
48 50
import org.gvsig.tools.dispose.DisposableIterator;
......
104 106
        }
105 107

  
106 108
        boolean bFound = false;
107
        ;
108 109
        while (!bFound && m_FeatureIterator.hasNext()) {
109 110
            try {
110 111
                final Feature f = (Feature) m_FeatureIterator.next();
111
                final org.gvsig.fmap.geom.Geometry geometry =
112
                    f.getDefaultGeometry();
112
                final org.gvsig.fmap.geom.Geometry geometry;
113
                geometry = f.getDefaultGeometry();
113 114
                final Geometry geom =
114 115
                    (Geometry) geometry.invokeOperation(ToJTS.CODE, null);
115 116
                final FeatureType type = f.getType();
116 117
                @SuppressWarnings("unchecked")
117
                final Iterator<FeatureAttributeDescriptor> iter =
118
                    type.iterator();
118
                final Iterator<FeatureAttributeDescriptor> iter;
119
                iter = type.iterator();
119 120
                final List<Object> objects = new ArrayList<Object>();
120 121
                while (iter.hasNext()) {
121 122
                    final FeatureAttributeDescriptor descriptor = iter.next();
......
134 135
                    m_CurrentValue = feature;
135 136
                    m_bIsNextConsumed = false;
136 137
                }
137
            } catch (final Exception e) {
138
            } catch (final GeometryOperationException e) {
138 139
                Sextante.addErrorToLog(e);
139 140
                return false;
141
            } catch (final GeometryOperationNotSupportedException e) {
142
                Sextante.addErrorToLog(e);
143
                return false;
140 144
            }
141 145
        }
142 146
        if (!bFound) {
......
145 149
        return bFound;
146 150
    }
147 151

  
152
    @Override
148 153
    public IFeature next() {
149 154

  
150 155
        if (!m_bIsNextConsumed) {
......
162 167
        throw new NoSuchElementException();
163 168
    }
164 169

  
170
    @Override
165 171
    public boolean hasNext() {
166 172

  
167 173
        if (m_bFinished) {
......
176 182

  
177 183
    }
178 184

  
185
    @Override
179 186
    public void close() {
180 187
    }
181 188

  

Also available in: Unified diff