Revision 45647 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 | ||
|---|---|---|
| 25 | 25 |
|
| 26 | 26 |
import java.util.Iterator; |
| 27 | 27 |
import org.gvsig.fmap.dal.exception.DataException; |
| 28 |
import org.gvsig.fmap.dal.feature.FeatureReference; |
|
| 29 | 28 |
import org.gvsig.fmap.dal.feature.exception.ConcurrentDataModificationException; |
| 30 | 29 |
import org.gvsig.fmap.dal.feature.impl.DefaultFeature; |
| 31 |
import org.gvsig.fmap.dal.feature.impl.DefaultFeatureReference; |
|
| 32 | 30 |
import org.gvsig.fmap.dal.feature.impl.DefaultFeatureStore; |
| 33 | 31 |
import org.gvsig.fmap.dal.feature.impl.editing.memory.FeatureManager; |
| 34 | 32 |
import org.gvsig.fmap.dal.feature.spi.FeatureProvider; |
| ... | ... | |
| 113 | 111 |
@Override |
| 114 | 112 |
protected DefaultFeature createFeature(FeatureProvider data) throws DataException {
|
| 115 | 113 |
|
| 116 |
DefaultFeature f = null; |
|
| 117 |
try {
|
|
| 118 |
FeatureReference ref = new DefaultFeatureReference(store, data); |
|
| 119 |
f= (DefaultFeature) this.featureManager.get(ref, store, data.getType()); |
|
| 120 |
} catch (DataException e) {
|
|
| 121 |
RuntimeException ex = new RuntimeException(); |
|
| 122 |
e.initCause(e); |
|
| 123 |
throw ex; |
|
| 124 |
} |
|
| 114 |
DefaultFeature f = this.featureManager.get(data); |
|
| 115 |
// DefaultFeature f = null; |
|
| 116 |
// try {
|
|
| 117 |
// FeatureReference ref = new DefaultFeatureReference(store, data); |
|
| 118 |
// f= (DefaultFeature) this.featureManager.get(ref, store, data.getType()); |
|
| 119 |
// } catch (DataException e) {
|
|
| 120 |
// RuntimeException ex = new RuntimeException(); |
|
| 121 |
// e.initCause(e); |
|
| 122 |
// throw ex; |
|
| 123 |
// } |
|
| 125 | 124 |
if (f == null) {
|
| 126 | 125 |
// La feature no se ha editado. |
| 127 | 126 |
f = new DefaultFeature(store, data); |
| ... | ... | |
| 136 | 135 |
|
| 137 | 136 |
@Override |
| 138 | 137 |
protected boolean skipFeature(FeatureProvider data) {
|
| 139 |
|
|
| 140 | 138 |
try {
|
| 141 | 139 |
if (getIterator().getCurrent() == 0) {
|
| 142 |
FeatureReference ref = new DefaultFeatureReference(store, data); |
|
| 143 |
if (this.featureManager.isDeleted(ref)) {
|
|
| 140 |
// FeatureReference ref = new DefaultFeatureReference(store, data);
|
|
| 141 |
if (this.featureManager.isDeleted(data)) {
|
|
| 144 | 142 |
return true; |
| 145 | 143 |
}; |
| 146 | 144 |
// if (this.featureManager.get(ref, store) != null) {
|
Also available in: Unified diff