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/createdbfromxml/CreatedbFromXmlPanel.java
| CreatedbFromXmlPanel.java | ||
|---|---|---|
| 35 | 35 |
import org.cresques.cts.IProjection; |
| 36 | 36 |
import java.nio.charset.Charset; |
| 37 | 37 |
import java.util.Collections; |
| 38 |
import java.util.Locale; |
|
| 38 | 39 |
import javax.swing.JOptionPane; |
| 39 | 40 |
import javax.swing.SwingUtilities; |
| 40 | 41 |
import javax.swing.event.ChangeEvent; |
| ... | ... | |
| 57 | 58 |
import org.gvsig.tools.swing.api.ToolsSwingUtils; |
| 58 | 59 |
import org.gvsig.tools.swing.api.pickercontroller.CharsetPickerController; |
| 59 | 60 |
import org.gvsig.tools.swing.api.pickercontroller.FilePickerController; |
| 61 |
import org.gvsig.tools.swing.api.pickercontroller.PickerController; |
|
| 60 | 62 |
import org.gvsig.tools.swing.api.task.TaskStatusController; |
| 61 | 63 |
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager; |
| 62 | 64 |
import org.gvsig.tools.swing.api.windowmanager.Dialog; |
| ... | ... | |
| 85 | 87 |
{
|
| 86 | 88 |
|
| 87 | 89 |
protected static final Logger LOGGER = LoggerFactory.getLogger(CreatedbFromXmlPanel.class); |
| 90 |
private PickerController<Locale> pickerLocale; |
|
| 88 | 91 |
|
| 89 | 92 |
private static class XMLInfoListModel extends AbstractListModel<LabeledValue<XMLTableInfo>> {
|
| 90 | 93 |
|
| ... | ... | |
| 209 | 212 |
|
| 210 | 213 |
this.cboCharset.setSelectedIndex(-1); |
| 211 | 214 |
|
| 215 |
this.pickerLocale = toolsSwingManager.createLocalePickerController(this.cboLocale); |
|
| 216 |
this.pickerLocale.set(Locale.getDefault()); |
|
| 217 |
|
|
| 212 | 218 |
SwingUtilities.invokeLater(() -> { updateStateComponents(); });
|
| 213 | 219 |
|
| 214 |
ToolsSwingUtils.ensureRowsCols(this, 4, 80, 5, 100);
|
|
| 220 |
ToolsSwingUtils.ensureRowsCols(this, 5, 80, 6, 100);
|
|
| 215 | 221 |
} |
| 216 | 222 |
|
| 217 | 223 |
private void translate() {
|
| ... | ... | |
| 227 | 233 |
toolsSwingManager.translate(this.btnAnalizeXML); |
| 228 | 234 |
toolsSwingManager.translate(this.btnViewTableStructure); |
| 229 | 235 |
toolsSwingManager.translate(this.lblRegisterConnection); |
| 236 |
toolsSwingManager.translate(this.lblLocale); |
|
| 237 |
|
|
| 230 | 238 |
} |
| 231 | 239 |
|
| 232 | 240 |
private boolean isProcessing() {
|
| ... | ... | |
| 404 | 412 |
} |
| 405 | 413 |
IProjection proj = this.pickerProjection.get(); |
| 406 | 414 |
Charset charset = this.pickerCharset.get(); |
| 415 |
Locale locale = this.pickerLocale.get(); |
|
| 407 | 416 |
|
| 408 | 417 |
this.lastTask = new Task( |
| 409 | 418 |
"Xml2db_AnalizeXML", |
| ... | ... | |
| 414 | 423 |
@Override |
| 415 | 424 |
protected void task(SimpleTaskStatus taskStatus) throws Throwable{
|
| 416 | 425 |
try {
|
| 417 |
XMLInfo xmlinfo = manager.extractStructure(xmlfile, charset, proj, taskStatus); |
|
| 426 |
XMLInfo xmlinfo = manager.extractStructure(xmlfile, charset, proj, locale, taskStatus);
|
|
| 418 | 427 |
setTablesModel(xmlinfo); |
| 419 | 428 |
if( proj==null && xmlinfo.getSrid()!=null ) {
|
| 420 | 429 |
pickerProjection.set(xmlinfo.getSrid()); |
Also available in: Unified diff