Revision 45818 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.csv/src/main/java/org/gvsig/export/csv/swing/panels/CSVExportParametersPanel.java

View differences:

CSVExportParametersPanel.java
41 41
import org.slf4j.Logger;
42 42
import org.slf4j.LoggerFactory;
43 43
import org.gvsig.export.csv.service.ExportCSVParameters;
44
import org.gvsig.fmap.dal.DataStoreParameters;
45
import org.gvsig.fmap.dal.feature.FeatureStore;
46 44

  
47 45
/**
48 46
 * @author gvSIG Team
......
69 67

  
70 68
    class ComboItem {
71 69

  
72
        private String key;
73
        private String value;
70
        private final String key;
71
        private final String value;
74 72

  
75 73
        public ComboItem(String key, String value) {
76 74
            this.key = key;
......
91 89
        }
92 90
    }
93 91

  
94
    private DefaultComboBoxModel fillComboBoxWithAvaibleParameters(String dynFieldValue) {
92
    private DefaultComboBoxModel createComboBoxModelFromAvaiblesValues(String dynFieldValue) {
95 93
        DynStruct parametersDefinition = ToolsLocator.getPersistenceManager().getDefinition("CSVNewStoreParameters");
96 94
        DynField dynField = parametersDefinition.getDynField(dynFieldValue);
97 95

  
......
108 106

  
109 107
    private void initComponents() {
110 108
        DynStruct parametersDefinition = ToolsLocator.getPersistenceManager().getDefinition("CSVNewStoreParameters");
111
        this.cmbProfile.setModel(this.fillComboBoxWithAvaibleParameters("profile"));
109
        this.cmbProfile.setModel(this.createComboBoxModelFromAvaiblesValues("profile"));
112 110
        this.cmbProfile.setSelectedIndex(0);
113 111
        
114 112
        //TODO: set params from previous source store in case of null values
......
140 138
//            //this.cmbLocale.setSelectedItem(CSVStoreParameters.);
141 139
//        }
142 140

  
143
        this.cmbQuotePolicy.setModel(this.fillComboBoxWithAvaibleParameters("quotePolicy"));
141
        this.cmbQuotePolicy.setModel(this.createComboBoxModelFromAvaiblesValues("quotePolicy"));
144 142
        this.cmbQuotePolicy.setSelectedIndex(0);
145 143

  
146
        this.cmbLocale.setModel(this.fillComboBoxWithAvaibleParameters("locale"));
144
        this.cmbLocale.setModel(this.createComboBoxModelFromAvaiblesValues("locale"));
147 145
        this.cmbLocale.setSelectedIndex(0);
148 146

  
147
        this.cboGeometryFormat.setModel(this.createComboBoxModelFromAvaiblesValues("geometryFormat"));
148
        this.cboGeometryFormat.setSelectedIndex(0);
149

  
149 150
        this.translate();
150 151
    }
151 152

  
......
159 160
        i18nc.translate(this.lblQuoteCharacter);
160 161
        i18nc.translate(this.lblCommentStartMarker);
161 162
        i18nc.translate(this.lblIncludeMetadataInHeader);
163
        i18nc.translate(this.lblGeometryFormat);
162 164

  
163 165
    }
164 166

  
......
186 188
        return item.getValue();
187 189
    }
188 190

  
191
    public String getGeometryFormat() {
192
        ComboItem item = (ComboItem) this.cboGeometryFormat.getSelectedItem();
193
        if (item == null) {
194
            return null;
195
        }
196
        return item.getValue();
197
    }
198

  
189 199
    public String getParameterRecordSeparator() {
190 200
        return this.txtRecordSeparator.getText();
191 201
    }
......
235 245
        this.setSelectedStringValue(cmbProfile, this.parameters.getProfile());
236 246
        this.setSelectedStringValue(cmbLocale, this.parameters.getLocale());
237 247
        this.setSelectedStringValue(cmbQuotePolicy, this.parameters.getQuotePolicy());
248
        this.setSelectedStringValue(cboGeometryFormat, this.parameters.getGeometryFormat());
238 249

  
239 250
        this.txtRecordSeparator.setText(this.parameters.getRecordSeparator());
240 251
        this.txtDelimiter.setText(this.parameters.getDelimiter());
......
278 289
            this.parameters.setQuoteCharacter(this.getParameterQuoteCharacter());
279 290
        }
280 291
        this.parameters.setIncludeMetadataInHeader(this.getParameterIncludeMetadataInHeader());
292
        this.parameters.setGeometryFormat(this.getGeometryFormat());
281 293
    }
282 294
}

Also available in: Unified diff