Revision 47524 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/export/swing/impl/panels/SelectGeometryFieldPanel.java

View differences:

SelectGeometryFieldPanel.java
7 7
import java.util.List;
8 8
import javax.swing.DefaultComboBoxModel;
9 9
import javax.swing.JComponent;
10
import org.gvsig.export.ExportAttributes;
10 11
import org.gvsig.export.ExportParameters;
11 12
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
12 13
import org.gvsig.tools.ToolsLocator;
......
18 19
import org.gvsig.export.swing.spi.ExportPanel;
19 20
import org.gvsig.export.swing.spi.ExportPanelValidationException;
20 21
import org.gvsig.export.swing.spi.ExportPanelsManager;
22
import org.gvsig.fmap.dal.feature.FeatureType;
23
import org.gvsig.fmap.geom.type.GeometryType;
21 24

  
22 25
/**
23 26
 *
......
63 66

  
64 67
    @Override
65 68
    public void nextPanel() {
66
        this.parameters.setSourceGeometryFieldName(this.getGeometryField());
69
        String geometryFieldName = this.getGeometryField();
70
        this.parameters.setSourceGeometryFieldName(geometryFieldName);
71
        FeatureType ft = this.parameters.getExportAttributes().getTargetFeatureType();
72
        FeatureAttributeDescriptor descriptor = ft.getAttributeDescriptor(geometryFieldName);
73
        if( descriptor!=null ) {
74
            GeometryType gt = descriptor.getGeomType();
75
            this.parameters.setTargetGeometryType(gt.getType());
76
            this.parameters.setTargetGeometrySubtype(gt.getSubType());
77
        }
67 78
    }
68 79

  
69 80
    @Override
......
75 86
            if (this.parameters.getSourceGeometryFieldName() == null ? defaultGeomName == null : this.parameters.getSourceGeometryFieldName().equals(defaultGeomName)) {
76 87
                this.rdoUseTheGeometryFieldByDefault.setSelected(true);
77 88
            } else {
78
                this.rdoUseTheGeometryFieldByDefault.setSelected(true);
89
                this.rdoSelectTheFieldToBeUsedAsGeometry.setSelected(true);
79 90
                String toCheck = this.parameters.getSourceGeometryFieldName();
80 91
                DefaultComboBoxModel model = (DefaultComboBoxModel) this.cboGeometryField.getModel();
81 92
                if (model.getIndexOf(toCheck) != -1) {
......
106 117
            this.rdoUseNullAsTheValueOfTheGeometry.setSelected(false);
107 118
        }
108 119
        List<String> items = new ArrayList<>();
109
        for (FeatureAttributeDescriptor descr : this.parameters.getSourceFeatureType()) {
110
            items.add(descr.getName());
120
//        for (FeatureAttributeDescriptor descr : this.parameters.getSourceFeatureType()) {
121
//            items.add(descr.getName());
122
//        }
123
        for (ExportAttributes.ExportAttribute exportAttribute : this.parameters.getExportAttributes()) {
124
            items.add(exportAttribute.getName());
111 125
        }
112 126
        items.sort(new Comparator<String>() {
113 127
            @Override

Also available in: Unified diff