Revision 43967
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/editing/memory/MemoryEditingManager.java | ||
---|---|---|
2 | 2 |
package org.gvsig.fmap.dal.feature.impl.editing.memory; |
3 | 3 |
|
4 | 4 |
import java.util.Iterator; |
5 |
import java.util.List; |
|
5 | 6 |
import org.gvsig.fmap.dal.exception.DataException; |
6 | 7 |
import org.gvsig.fmap.dal.feature.Feature; |
7 | 8 |
import org.gvsig.fmap.dal.feature.FeatureReference; |
... | ... | |
86 | 87 |
} |
87 | 88 |
|
88 | 89 |
@Override |
89 |
public Iterator<FeatureStoreProvider.FeatureTypeChanged> getFeatureTypesChanged() throws DataException {
|
|
90 |
public List<FeatureStoreProvider.FeatureTypeChanged> getFeatureTypesChanged() throws DataException {
|
|
90 | 91 |
return this.featureTypeManager.getFeatureTypesChanged(); |
91 | 92 |
} |
92 | 93 |
|
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/editing/memory/FeatureTypeManager.java | ||
---|---|---|
440 | 440 |
|
441 | 441 |
} |
442 | 442 |
|
443 |
public Iterator getFeatureTypesChanged() throws DataException {
|
|
443 |
public List<FeatureTypeChanged> getFeatureTypesChanged() throws DataException {
|
|
444 | 444 |
// FIXME this don't work for Store.fType.size() > 1 |
445 | 445 |
List list = new ArrayList(); |
446 | 446 |
if (modifiedFromOriginal.size() > 0) { |
447 | 447 |
FeatureType src = this.getOriginalFeatureType(); |
448 |
list.add(new FeatureTypesChangedItem(src, this.store |
|
449 |
.getFeatureType(src.getId()))); |
|
448 |
list.add( |
|
449 |
new FeatureTypesChangedItem( |
|
450 |
src, |
|
451 |
this.store.getFeatureType(src.getId()) |
|
452 |
) |
|
453 |
); |
|
450 | 454 |
} |
451 |
return list.iterator();
|
|
455 |
return list; |
|
452 | 456 |
} |
453 | 457 |
|
454 | 458 |
} |
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/DefaultEditableFeatureAttributeDescriptor.java | ||
---|---|---|
204 | 204 |
return this; |
205 | 205 |
} |
206 | 206 |
|
207 |
@Override |
|
207 | 208 |
public EditableFeatureAttributeDescriptor setName(String name) { |
208 | 209 |
if (originalName == null) { |
209 | 210 |
originalName = this.name; |
210 |
hasStrongChanges = true; |
|
211 |
if (!isComputed()) { |
|
212 |
hasStrongChanges = true; |
|
213 |
} |
|
211 | 214 |
} |
212 | 215 |
this.name = name; |
213 | 216 |
if (!isComputed()) { |
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/DefaultFeatureStore.java | ||
---|---|---|
1467 | 1467 |
provider.performChanges(featureManager.getDeleted(), |
1468 | 1468 |
featureManager.getInserted(), |
1469 | 1469 |
featureManager.getUpdated(), |
1470 |
featureTypeManager.getFeatureTypesChanged());
|
|
1470 |
removeCalculatedAttributes(featureTypeManager.getFeatureTypesChanged()).iterator());
|
|
1471 | 1471 |
} |
1472 | 1472 |
saveDALFile(); |
1473 | 1473 |
exitEditingMode(); |
... | ... | |
1481 | 1481 |
throw new FinishEditingException(e); |
1482 | 1482 |
} |
1483 | 1483 |
} |
1484 |
|
|
1485 |
private List<FeatureStoreProvider.FeatureTypeChanged> removeCalculatedAttributes(List<FeatureStoreProvider.FeatureTypeChanged> ftypes) { |
|
1486 |
// FIXME: Falta por implementar |
|
1487 |
return ftypes; |
|
1488 |
} |
|
1489 |
|
|
1484 | 1490 |
|
1485 | 1491 |
@SuppressWarnings("UseSpecificCatch") |
1486 | 1492 |
private void saveDALFile() { |
... | ... | |
1559 | 1565 |
provider.performChanges(featureManager.getDeleted(), |
1560 | 1566 |
featureManager.getInserted(), |
1561 | 1567 |
featureManager.getUpdated(), |
1562 |
featureTypeManager.getFeatureTypesChanged());
|
|
1568 |
removeCalculatedAttributes(featureTypeManager.getFeatureTypesChanged()).iterator());
|
|
1563 | 1569 |
} |
1564 | 1570 |
invalidateIndexes(); |
1565 | 1571 |
featureManager = new FeatureManager(); |
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/EditingManager.java | ||
---|---|---|
2 | 2 |
package org.gvsig.fmap.dal.feature.impl; |
3 | 3 |
|
4 | 4 |
import java.util.Iterator; |
5 |
import java.util.List; |
|
5 | 6 |
import org.gvsig.fmap.dal.exception.DataException; |
6 | 7 |
import org.gvsig.fmap.dal.feature.Feature; |
7 | 8 |
import org.gvsig.fmap.dal.feature.FeatureReference; |
... | ... | |
63 | 64 |
public Iterator<FeatureProvider> getInsertedFeatures(); |
64 | 65 |
public Iterator<FeatureProvider> getUpdatedFeatures(); |
65 | 66 |
|
66 |
public Iterator<FeatureTypeChanged> getFeatureTypesChanged() throws DataException;
|
|
67 |
public List<FeatureTypeChanged> getFeatureTypesChanged() throws DataException;
|
|
67 | 68 |
|
68 | 69 |
public FeatureType getFeatureType(String id) throws DataException ; |
69 | 70 |
|
Also available in: Unified diff