Revision 45765 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/featureset/EditedIterator.java
| EditedIterator.java | ||
|---|---|---|
| 24 | 24 |
package org.gvsig.fmap.dal.feature.impl.featureset; |
| 25 | 25 |
|
| 26 | 26 |
import java.util.Iterator; |
| 27 |
import java.util.logging.Level; |
|
| 28 |
import java.util.logging.Logger; |
|
| 27 | 29 |
import org.gvsig.fmap.dal.exception.DataException; |
| 28 | 30 |
import org.gvsig.fmap.dal.feature.EditableFeature; |
| 29 | 31 |
import org.gvsig.fmap.dal.feature.FeatureReference; |
| ... | ... | |
| 69 | 71 |
|
| 70 | 72 |
@Override |
| 71 | 73 |
public FeatureProvider next() {
|
| 72 |
return providerIterator.next(); |
|
| 74 |
FeatureProvider data = providerIterator.next(); |
|
| 75 |
FeatureReference ref = FeatureReferenceFactory.createFromFeatureProvider(store, data); |
|
| 76 |
DefaultFeature modified; |
|
| 77 |
try {
|
|
| 78 |
modified = featureManager.get(ref, store); |
|
| 79 |
} catch (DataException ex) {
|
|
| 80 |
return data; |
|
| 81 |
} |
|
| 82 |
if (modified != null) {
|
|
| 83 |
return modified.getData(); |
|
| 84 |
} |
|
| 85 |
return data; |
|
| 73 | 86 |
} |
| 74 | 87 |
|
| 75 | 88 |
@Override |
| ... | ... | |
| 77 | 90 |
EditedIterator.super.remove(); |
| 78 | 91 |
} |
| 79 | 92 |
}; |
| 80 |
this.iterator = new ChainedIterator(wrappedProviderIterator, insertedFeatures, updatedFeatures);
|
|
| 93 |
this.iterator = new ChainedIterator(wrappedProviderIterator, insertedFeatures); |
|
| 81 | 94 |
if (index > 0) {
|
| 82 | 95 |
skypto(index); |
| 83 | 96 |
} |
| ... | ... | |
| 143 | 156 |
if (this.featureManager.isDeleted(data)) {
|
| 144 | 157 |
return true; |
| 145 | 158 |
}; |
| 146 |
FeatureReference ref = FeatureReferenceFactory.createFromFeatureProvider(store, data); |
|
| 147 |
if (this.featureManager.get(ref, store) != null) {
|
|
| 148 |
return true; |
|
| 149 |
}; |
|
| 159 |
// FeatureReference ref = FeatureReferenceFactory.createFromFeatureProvider(store, data);
|
|
| 160 |
// if (this.featureManager.get(ref, store) != null) {
|
|
| 161 |
// return true;
|
|
| 162 |
// };
|
|
| 150 | 163 |
} |
| 151 | 164 |
} catch (Exception ex) {
|
| 152 | 165 |
LOGGER.warn("Can't check if must skip feature.", ex);
|
Also available in: Unified diff