Revision 47336 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.xml2db/org.gvsig.xml2db.swing/org.gvsig.xml2db.swing.impl/src/main/java/org/gvsig/xml2db/swing/impl/copyxml2db/CopyXml2dbPanel.java
CopyXml2dbPanel.java | ||
---|---|---|
31 | 31 |
import javax.swing.JComponent; |
32 | 32 |
import org.cresques.cts.IProjection; |
33 | 33 |
import java.nio.charset.Charset; |
34 |
import java.util.Locale; |
|
34 | 35 |
import javax.swing.JOptionPane; |
35 | 36 |
import javax.swing.SwingUtilities; |
36 | 37 |
import javax.swing.event.ChangeEvent; |
... | ... | |
48 | 49 |
import org.gvsig.tools.swing.api.ToolsSwingUtils; |
49 | 50 |
import org.gvsig.tools.swing.api.pickercontroller.CharsetPickerController; |
50 | 51 |
import org.gvsig.tools.swing.api.pickercontroller.FilePickerController; |
52 |
import org.gvsig.tools.swing.api.pickercontroller.PickerController; |
|
51 | 53 |
import org.gvsig.tools.swing.api.task.TaskStatusController; |
52 | 54 |
import org.gvsig.tools.swing.api.windowmanager.Dialog; |
53 | 55 |
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2; |
... | ... | |
74 | 76 |
{ |
75 | 77 |
|
76 | 78 |
protected static final Logger LOGGER = LoggerFactory.getLogger(CopyXml2dbPanel.class); |
79 |
private PickerController<Locale> pickerLocale; |
|
77 | 80 |
|
78 | 81 |
private static class XMLInfoListModel extends AbstractListModel<LabeledValue<XMLTableInfo>> { |
79 | 82 |
|
... | ... | |
187 | 190 |
}); |
188 | 191 |
|
189 | 192 |
this.cboCharset.setSelectedIndex(-1); |
193 |
|
|
194 |
this.pickerLocale = toolsSwingManager.createLocalePickerController(this.cboLocale); |
|
195 |
this.pickerLocale.set(Locale.getDefault()); |
|
190 | 196 |
|
197 |
|
|
191 | 198 |
SwingUtilities.invokeLater(() -> { updateStateComponents(); }); |
192 | 199 |
|
193 |
ToolsSwingUtils.ensureRowsCols(this, 13, 80, 15, 100);
|
|
200 |
ToolsSwingUtils.ensureRowsCols(this, 14, 80, 16, 100);
|
|
194 | 201 |
} |
195 | 202 |
|
196 | 203 |
private void translate() { |
... | ... | |
204 | 211 |
toolsSwingManager.translate(this.lblRegisterConnection); |
205 | 212 |
toolsSwingManager.translate(this.lblConnectToRepository); |
206 | 213 |
toolsSwingManager.translate(this.lblOverwriteDatabase); |
214 |
toolsSwingManager.translate(this.lblLocale); |
|
207 | 215 |
} |
208 | 216 |
|
209 | 217 |
private boolean isProcessing() { |
... | ... | |
316 | 324 |
message("Database already exists", JOptionPane.WARNING_MESSAGE); |
317 | 325 |
return; |
318 | 326 |
} |
319 |
}
|
|
327 |
} |
|
320 | 328 |
|
329 |
Locale locale = this.pickerLocale.get(); |
|
330 |
|
|
321 | 331 |
this.lastTask = new Task( |
322 | 332 |
"Xml2db_copy", |
323 | 333 |
"Copy xml to database", |
... | ... | |
333 | 343 |
H2SpatialUtils.removeH2db(dbfile); |
334 | 344 |
H2SpatialUtils.server_start(); |
335 | 345 |
} |
336 |
XMLInfo xmlinfo = manager.extractStructure(xmlfile, charset, proj, taskStatus); |
|
346 |
XMLInfo xmlinfo = manager.extractStructure(xmlfile, charset, proj, locale, taskStatus);
|
|
337 | 347 |
if( xmlinfo==null ) { |
338 | 348 |
throw new RuntimeException("Can't process xml file"); |
339 | 349 |
} |
Also available in: Unified diff