Revision 47472 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

View differences:

CopyXml2dbPanel.java
210 210 
        this.pickerLocale = toolsSwingManager.createLocalePickerController(this.cboLocale);
211 211 
        this.pickerLocale.set(Locale.getDefault());
212 212
213 
        toolsSwingManager.addClearButton(this.txtPrefixesForTables);
213 214
214 215 
        SwingUtilities.invokeLater(() -> { updateStateComponents(); });
215 216
......
230 231 
        toolsSwingManager.translate(this.lblLocale);
231 232 
        toolsSwingManager.translate(this.btnDetectProjection);
232 233 
        toolsSwingManager.translate(this.btnDetectCharset);
233
234 
        toolsSwingManager.translate(this.lblPrefixesForTables);
234 235 
    }
235 236
236 237 
    private boolean isProcessing() {
......
354 355 
            }
355 356 
        }
356 357
358 
        String tablesPrefix = StringUtils.defaultIfBlank(this.txtPrefixesForTables.getText(), null);
359
357 360 
        Locale locale = this.pickerLocale.get();
358 361 

  		




  359
  362
  
    
        this.lastTask = new Task(                


  		




  ......




  371
  374
  
    
                        H2SpatialUtils.removeH2db(dbfile);


  		




  372
  375
  
    
                        H2SpatialUtils.server_start();


  		




  373
  376
  
    
                    }        


  		




  374
  
  
    
                    XMLInfo xmlinfo = manager.extractStructure(xmlfile, charset, userproj, locale, taskStatus);


  		




  
  377
  
    
                    XMLInfo xmlinfo = manager.extractStructure(xmlfile, charset, userproj, locale, tablesPrefix, taskStatus);


  		




  375
  378
  
    
                    if( xmlinfo==null ) {


  		




  376
  379
  
    
                        throw new RuntimeException("Can't process xml file");


  		




  377
  380
  
    
                    }


  		




  ......




  394
  397
  
    
                    if( registerConnection ) {


  		




  395
  398
  
    
                        addToConnectionPool(params,repoName);   


  		




  396
  399
  
    
                    }


  		




  397
  
  
    
                    manager.copyXml2Db(xmlfile, xmlinfo.getCharset(), params, taskStatus);


  		




  
  400
  
    
                    manager.copyXml2Db(xmlfile, xmlinfo.getCharset(), params, tablesPrefix, taskStatus);


  		




  398
  401
  
    
                    if( connectToRepository) {


  		




  399
  402
  
    
                        DataSwingManager dataSwingManager = DALSwingLocator.getDataSwingManager();


  		




  400
  403
  
    
                        dataSwingManager.connectToDatabaseWorkspace(params);                        


  		












Also available in:  Unified diff