Revision 45008 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.lib/org.gvsig.exportto.lib.impl/src/main/java/org/gvsig/export/impl/service/DefaultExportAttributes.java
DefaultExportAttributes.java | ||
---|---|---|
7 | 7 |
import org.apache.commons.lang3.StringUtils; |
8 | 8 |
import org.gvsig.export.ExportAttributes; |
9 | 9 |
import org.gvsig.fmap.dal.DALLocator; |
10 |
import org.gvsig.fmap.dal.DataTypes; |
|
10 | 11 |
import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor; |
11 | 12 |
import org.gvsig.fmap.dal.feature.EditableFeatureType; |
12 | 13 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
... | ... | |
14 | 15 |
import org.gvsig.fmap.dal.feature.FeatureQuery; |
15 | 16 |
import org.gvsig.fmap.dal.feature.FeatureType; |
16 | 17 |
import org.gvsig.tools.ToolsLocator; |
17 |
import org.gvsig.tools.dataTypes.DataTypes;
|
|
18 |
import org.gvsig.tools.dataTypes.DataType; |
|
18 | 19 |
import org.gvsig.tools.dataTypes.DataTypesManager; |
19 | 20 |
import org.gvsig.tools.dynobject.DynStruct; |
20 | 21 |
import org.gvsig.tools.namestranslator.NamesTranslator; |
... | ... | |
47 | 48 |
exportAttribute.setNewType(fad.getDataType().getType()); |
48 | 49 |
exportAttribute.setSize(fad.getSize()); |
49 | 50 |
if (query == null || (query != null && query.getGroupByColumns().isEmpty())) { |
50 |
exportAttribute.setExported(isShowableDataType(fad.getDataType().getType()));
|
|
51 |
exportAttribute.setExported(isShowableDataType(fad.getDataType())); |
|
51 | 52 |
} else { |
52 | 53 |
if (query.getAggregate(fad.getName()) != null || query.getGroupByColumns().contains(fad.getName())) { |
53 |
exportAttribute.setExported(isShowableDataType(fad.getDataType().getType()));
|
|
54 |
exportAttribute.setExported(isShowableDataType(fad.getDataType())); |
|
54 | 55 |
} else { |
55 | 56 |
exportAttribute.setExported(false); |
56 | 57 |
} |
... | ... | |
65 | 66 |
this.getNamesTranslator().addSource(fad.getName()); |
66 | 67 |
exportAttribute.setNewType(fad.getDataType().getType()); |
67 | 68 |
exportAttribute.setSize(fad.getSize()); |
68 |
exportAttribute.setExported(isShowableDataType(fad.getDataType().getType()));
|
|
69 |
exportAttribute.setExported(isShowableDataType(fad.getDataType())); |
|
69 | 70 |
attrs.add(exportAttribute); |
70 | 71 |
} |
71 | 72 |
} |
... | ... | |
73 | 74 |
|
74 | 75 |
} |
75 | 76 |
|
76 |
protected boolean isShowableDataType(int dataType) {
|
|
77 |
DataTypesManager dataTypemanager = ToolsLocator.getDataTypesManager();
|
|
78 |
if (dataTypemanager.isContainer(dataType)
|
|
79 |
|| dataTypemanager.isObject(dataType)
|
|
80 |
|| dataType == DataTypes.ARRAY) {
|
|
77 |
protected boolean isShowableDataType(DataType dataType) {
|
|
78 |
if ( dataType.getType() != DataTypes.GEOMETRY && (
|
|
79 |
dataType.isContainer()
|
|
80 |
|| dataType.isObject()
|
|
81 |
|| dataType.getType() == DataTypes.ARRAY)) {
|
|
81 | 82 |
return false; |
82 | 83 |
|
83 | 84 |
} else { |
84 | 85 |
return true; |
85 | 86 |
} |
86 | 87 |
} |
88 |
|
|
87 | 89 |
|
88 | 90 |
@Override |
89 | 91 |
public void setNamesTranslator(NamesTranslator namesTranslator) { |
Also available in: Unified diff