Revision 47363
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/dalactions/CreateTemporalLayerAction.java | ||
|---|---|---|
| 116 | 116 |
ft_targetStore.addAll(ft_sourceStore); |
| 117 | 117 |
boolean ignoreDefaultGeometry = false; |
| 118 | 118 |
|
| 119 |
for (EditableFeatureAttributeDescriptor column : query.getExtraColumn().getColumns()) {
|
|
| 120 |
if (column.getType() == DataTypes.GEOMETRY) {
|
|
| 121 |
ignoreDefaultGeometry = true; |
|
| 122 |
} |
|
| 123 |
} |
|
| 119 |
if(query != null) {
|
|
| 120 |
for (EditableFeatureAttributeDescriptor column : query.getExtraColumn().getColumns()) {
|
|
| 121 |
if (column.getType() == DataTypes.GEOMETRY) {
|
|
| 122 |
ignoreDefaultGeometry = true; |
|
| 123 |
} |
|
| 124 |
} |
|
| 125 |
} |
|
| 124 | 126 |
for (FeatureAttributeDescriptor attr : ft_sourceStore) {
|
| 125 | 127 |
DataType dataType = attr.getDataType(); |
| 126 | 128 |
EditableFeatureAttributeDescriptor eattr = ft_targetStore.getEditableAttributeDescriptor(attr.getName()); |
| ... | ... | |
| 146 | 148 |
for (EditableFeatureAttributeDescriptor column : ft_sourceStore.getExtraColumns().getColumns()) {
|
| 147 | 149 |
allExtraColumns.put(column.getName(), column); |
| 148 | 150 |
} |
| 149 |
for (EditableFeatureAttributeDescriptor column : query.getExtraColumn().getColumns()) {
|
|
| 150 |
allExtraColumns.put(column.getName(), column); |
|
| 151 |
} |
|
| 151 |
if(query != null) {
|
|
| 152 |
for (EditableFeatureAttributeDescriptor column : query.getExtraColumn().getColumns()) {
|
|
| 153 |
allExtraColumns.put(column.getName(), column); |
|
| 154 |
} |
|
| 155 |
} |
|
| 152 | 156 |
if (allExtraColumns.size() > 0) {
|
| 153 | 157 |
for (EditableFeatureAttributeDescriptor column : allExtraColumns.values()) {
|
| 154 | 158 |
DataType dataType = column.getDataType(); |
Also available in: Unified diff