Revision 47191

View differences:

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.jdbc/src/main/java/org/gvsig/export/jdbc/service/ExportJDBCAttributeNamesTranslator.java
66 66
        if (StringUtils.isBlank(target_name)) {
67 67
            target_name = DEFAULT_FIELD_NAME;
68 68
        }
69
        if (this.parameters.getRemoveSpacesInIdentifiers()) {
70
            //target_name = target_name.replaceAll("\\s","");
71
            target_name = StringUtils.normalizeSpace(target_name).replace(" ", "_");
72
        }
73
        if (this.parameters.getTranslateHyphens()) {
74
            target_name = target_name.replace("-", "_");
75
        }
76
        switch(this.parameters.getCaseIdentifiersMode()){
77
            case CASE_IDENTIFIERS_UPPERCASE:
78
                target_name = target_name.toUpperCase();
79
                break;
80
            case CASE_IDENTIFIERS_LOWERCASE:
81
                target_name = target_name.toLowerCase();
82
                break;
83
        }
69
        target_name = this.parameters.fixIdentifier(target_name);
84 70
        return target_name;
85 71
    }
86 72

  
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.jdbc/src/main/java/org/gvsig/export/jdbc/service/ExportJDBCParameters.java
169 169
    boolean isDeleteRows();
170 170

  
171 171
    void setDeleteRowsFilter(Expression deleteRowsFilter);
172
    
173
    public String fixIdentifier(String name);
172 174
}
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.jdbc/src/main/java/org/gvsig/export/jdbc/service/ExportJDBCParametersImpl.java
6 6
package org.gvsig.export.jdbc.service;
7 7

  
8 8
import java.util.List;
9
import org.apache.commons.lang3.StringUtils;
9 10
import org.gvsig.export.spi.AbstractExportParametersGeometry;
10 11
import org.gvsig.expressionevaluator.Expression;
11 12
import org.gvsig.fmap.dal.DALLocator;
12 13
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
13 14
import org.gvsig.fmap.dal.store.jdbc2.JDBCStoreProviderFactory;
15
import static org.gvsig.fmap.dal.store.jdbc2.JDBCStoreProviderFactory.CASE_IDENTIFIERS_LOWERCASE;
14 16
import static org.gvsig.fmap.dal.store.jdbc2.JDBCStoreProviderFactory.CASE_IDENTIFIERS_UPPERCASE;
15 17
import org.gvsig.tools.ToolsLocator;
16 18
import org.gvsig.tools.dynobject.DynStruct;
19
import static org.gvsig.tools.namestranslator.BaseNamesTranslator.DEFAULT_FIELD_NAME;
17 20
import org.gvsig.tools.persistence.PersistenceManager;
18 21
import org.gvsig.tools.persistence.PersistentState;
19 22
import org.gvsig.tools.persistence.exception.PersistenceException;
......
530 533
        nameTranslator.setParameters(this);
531 534
    }
532 535

  
536
    public String fixIdentifier(String name) {
537
        String target_name = name;
538
        if (this.getRemoveSpacesInIdentifiers()) {
539
            target_name = StringUtils.normalizeSpace(target_name).replace(" ", "_");
540
        }
541
        if (this.getTranslateHyphens()) {
542
            target_name = target_name.replace("-", "_");
543
        }
544
        switch(this.getCaseIdentifiersMode()){
545
            case CASE_IDENTIFIERS_UPPERCASE:
546
                target_name = target_name.toUpperCase();
547
                break;
548
            case CASE_IDENTIFIERS_LOWERCASE:
549
                target_name = target_name.toLowerCase();
550
                break;
551
        }
552
        return target_name;
553
    }
554

  
555
    
533 556
}
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.jdbc/src/main/java/org/gvsig/export/jdbc/swing/panels/SelectTableNamePanel.java
278 278
            }
279 279
        }
280 280
        if (this.rdoCreateTable.isSelected()) {
281
            ExportJDBCAttributeNamesTranslator nameTranslator
282
                    = (ExportJDBCAttributeNamesTranslator) this.parameters.getExportAttributes().getNamesTranslator();
283
            String tablename_tr = nameTranslator.getSuggestion(tablename);
281
            String tablename_tr = this.parameters.fixIdentifier(tablename);
284 282
            if (!tablename_tr.equals(tablename)) {
285 283
                String msg = i18nManager.getTranslation(
286 284
                        "_The_name_entered_for_the_table_does_not_correspond_to_the_conditions_selected_in_the_previous_panel_You_want_it_to_be_corrected_automatically"

Also available in: Unified diff