Revision 44395

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.file/org.gvsig.fmap.dal.file.csv/src/main/java/org/gvsig/fmap/dal/store/csv/CSVFilesystemServerProvider.java
160 160

  
161 161
                    CSVNewStoreParameters newparams = (CSVNewStoreParameters) params;
162 162
                    CsvPreference defaultPreference = CSVStoreParameters.getPredefinedCSVPreferences(newparams);
163

  
163
                    
164 164
                    s = CSVStoreParameters.getQuoteCharacter(params);
165 165
                    if (StringUtils.isBlank(s)) {
166 166
                        quoteChar = (char) defaultPreference.getQuoteChar();
......
188 188
                        builder.skipComments(cs);
189 189
                    }
190 190

  
191
                    builder.surroundingSpacesNeedQuotes(CSVStoreParameters
192
                            .getSurroundingSpacesNeedQuotes(newparams));
191
                    //builder.surroundingSpacesNeedQuotes(CSVStoreParameters
192
                    //        .getSurroundingSpacesNeedQuotes(newparams));
193
                    builder.surroundingSpacesNeedQuotes(true);
194
                    
193 195
                    QuoteMode quoteMode = CSVStoreParameters.getQuoteMode(newparams);
194 196
                    if (quoteMode != null) {
195 197
                        builder.useQuoteMode(quoteMode);
196 198
                    }
197 199

  
198 200
                    CsvPreference csvpreferences = builder.build();
199

  
201
                    
200 202
                    writer.initialize(params, file.getAbsoluteFile(), params.getDefaultFeatureType(), csvpreferences);
201 203
                    writer.begin();
202 204

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.file/org.gvsig.fmap.dal.file.csv/src/main/java/org/gvsig/fmap/dal/store/csv/CSVFeatureWriter.java
6 6
package org.gvsig.fmap.dal.store.csv;
7 7

  
8 8
import java.io.File;
9
import java.io.FileOutputStream;
9 10
import java.io.FileWriter;
10 11
import java.io.IOException;
12
import java.io.OutputStreamWriter;
13
import java.io.Writer;
11 14
import java.util.Locale;
12 15
import org.gvsig.fmap.dal.DataTypes;
13
import org.gvsig.fmap.dal.feature.Feature;
14 16
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
15 17
import org.gvsig.fmap.dal.feature.FeatureType;
16 18
import org.gvsig.fmap.dal.feature.exception.PerformEditingException;
......
35 37
    private boolean calculate_envelope = false;
36 38
    private CsvListWriter listWriter = null;
37 39
    private CsvPreference csvpreferences = null;
38
    private FileWriter fwriter = null;
40
    private Writer writer = null;
39 41
    private FeatureType ftype;
40 42
    private File file;
41 43
    private String[] values;
......
46 48
    private Locale locale = null;
47 49
    private CSVStoreParameters storeParameters;
48 50
    private static final Logger logger = LoggerFactory.getLogger(CSVFeatureWriter.class);
51
    private String charset = null;
49 52

  
50 53
    public void initialize(CSVStoreParameters storeParameters, File file, FeatureType ftype, CsvPreference csvpreferences) {
51 54
        this.file = file;
......
66 69
        }
67 70
        this.convert = ToolsLocator.getDataTypesManager().getCoercion(org.gvsig.tools.dataTypes.DataTypes.STRING);
68 71
        this.errorcounts = 0;
72
        this.charset = CSVStoreParameters.getCharset(storeParameters);
69 73
    }
70 74

  
71 75
    public void beginAppend() {
72 76
        try {
73
            this.fwriter = new FileWriter(file, true);
74
            this.listWriter = new CsvListWriter(this.fwriter, this.csvpreferences);
77
            FileOutputStream fos = new FileOutputStream(file, true);
78
            if (this.charset != null) {
79
                this.writer = new OutputStreamWriter(fos, this.charset);
80
            } else {
81
                this.writer = new OutputStreamWriter(fos);
82
            }
83
            this.listWriter = new CsvListWriter(this.writer, this.csvpreferences);
75 84
            if (ftype != null) {
76 85
                this.descriptors = ftype.getAttributeDescriptors();
77 86
                int n = 0;
......
91 100

  
92 101
    public void begin() {
93 102
        try {
94
            this.fwriter = new FileWriter(file);
103
            this.writer = new FileWriter(file);
95 104
        } catch (IOException e) {
96 105
            logger.warn("Can't open file for write (" + file.getAbsolutePath() + ").", e);
97 106
            throw new RuntimeException(e);
98 107
        }
99
        this.listWriter = new CsvListWriter(this.fwriter, this.csvpreferences);
108
        this.listWriter = new CsvListWriter(this.writer, this.csvpreferences);
100 109
        int n = 0;
101 110
        for (FeatureAttributeDescriptor descriptor : descriptors) {
102 111
            if (descriptor.getEvaluator() == null) {
......
195 204
            }
196 205
            listWriter = null;
197 206
        }
198
        if (fwriter != null) {
207
        if (writer != null) {
199 208
            try {
200
                fwriter.close();
209
                writer.close();
201 210
            } catch (Exception ex) {
202 211
                // Ignore error
203 212
            }
204
            fwriter = null;
213
            writer = null;
205 214
        }
206 215
    }
207 216

  
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.exportto.app/org.gvsig.exportto.app.mainplugin/src/main/java/org/gvsig/export/app/extension/ExportTable.java
84 84
    private void doAddTable(ExportProcess process) {
85 85
        ApplicationManager application = ApplicationLocator.getManager();
86 86
        I18nManager i18n = ToolsLocator.getI18nManager();
87

  
87
        if (process.getTargetOpenStoreParameters()==null) {
88
            return;
89
        }
88 90
        int n = application.confirmDialog(
89 91
                i18n.getTranslation("_Add_new_table_to_current_project"), 
90 92
                i18n.getTranslation("_Export"), 
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.exportto.app/org.gvsig.exportto.app.mainplugin/src/main/java/org/gvsig/export/app/extension/ExportLayerExtension.java
202 202
        
203 203
        ApplicationManager application = ApplicationLocator.getManager();
204 204
        I18nManager i18n = ToolsLocator.getI18nManager();
205
        
206
        if (process.getTargetOpenStoreParameters()==null) {
207
            return;
208
        }
205 209

  
206 210
        int n = application.confirmDialog(
207 211
                i18n.getTranslation("_Add_new_layer_to_current_view"), 
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.exportto.app/org.gvsig.exportto.app.mainplugin/src/main/resources-plugin/i18n/text.properties
77 77
_Target_projection=Projecci\u00f3n de destino
78 78
select_target_projection=Seleccione proyecci\u00f3n destino
79 79
_Use_the_same_projection_as_the_origin=Usar la misma proyecci\u00f3n que el origen
80
_Use_the_same_projection_of_the_context_usually_the_View=Usar la misma proteccion del contexto (normalmente la Vista)
80
_Use_the_same_projection_of_the_context_usually_the_View=Usar la misma proyecci\u00f3n del contexto (normalmente la Vista)
81 81
_Select_a_projection=Seleccionar una proyecci\u00f3n
82 82
_Select_simplified_export=Selecci\u00f3n de exportaci\u00f3n simplificada
83 83
_Use_simplified_export=Usar exportaci\u00f3n simplificada
84
_Use_simplified_export_description=Usar exportaci\u00f3n simplificada permite exportar rapidamente un shape indicando \u00fanicamente el fichero de destino.\nSi desea seleccionar la codificaci\u00f3n o el campo geometria a usar, desactive el check de 'Usar exportaci\u00f3n simplificada'.
84
_Use_simplified_export_description=Usar exportaci\u00f3n simplificada permite exportar rapidamente un shape indicando \u00fanicamente el fichero de destino.\nSi desea seleccionar la codificaci\u00f3n o el campo geometria a usar, desactive el check de 'Usar exportaci\u00f3n simplificada'.
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.exportto.app/org.gvsig.exportto.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
83 83
_Select_a_projection=Select a projection
84 84
_Select_simplified_export=Select simplified export
85 85
_Use_simplified_export=Use simplified export
86
_Use_simplified_export_description=Using simplified export allows you to quickly export a shape indicating only the destination file.\nIf you want to select the encoding or the geometry field to be used, uncheck the 'Use simplified export' check.
86
_Use_simplified_export_description=Using simplified export allows you to quickly export a shape indicating only the destination file.\nIf you want to select the encoding or the geometry field to be used, uncheck the 'Use simplified export' check.
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.csv.app/org.gvsig.csv.app.mainplugin/src/main/resources-plugin/i18n/text.properties
1
_Profile=Perfil
2
_Quote_Policy=Pol\u00edtica de entrecomillado
3
_Locale=C\u00f3digo
4
_Record_separator=Separador entre registros
5
_Delimiter=Delimitador
6
_Quote_character=Car\u00e1cter de entrecomillado
7
_Charset=Codificaci\u00f3n
0 8

  
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.csv.app/org.gvsig.csv.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
1
_Profile=Perfil
2
_Quote_Policy=Quote Policy
3
_Locale=Locale
4
_Record_separator=Record separator
5
_Delimiter=Delimiter
6
_Quote_character=Quote character
7
_Charset=Charset
0 8

  
trunk/org.gvsig.desktop/pom.xml
2537 2537

  
2538 2538
        <jython.artifactId>jython-standalone</jython.artifactId>
2539 2539
        <!-- External project versions -->
2540
        <gvsig.tools.version>3.0.194</gvsig.tools.version>
2540
        <gvsig.tools.version>3.0.195-SNAPSHOT</gvsig.tools.version>
2541 2541
        <gvsig.proj.version>1.0.4</gvsig.proj.version>
2542 2542
        <gvsig.projection.api.version>2.0.25</gvsig.projection.api.version>
2543 2543

  
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.lib/org.gvsig.exportto.lib.api/src/main/java/org/gvsig/export/ExportAttributes.java
20 20

  
21 21
    public ExportAttributes clone() throws CloneNotSupportedException;
22 22

  
23
    public void setActive(boolean b);
24
    
25
    public boolean isActive();
26

  
23 27
    public interface ExportAttribute extends Cloneable {
24 28

  
25 29
        public FeatureAttributeDescriptor getDescriptor();
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.lib/org.gvsig.exportto.lib.api/src/main/java/org/gvsig/export/spi/AbstractExportService.java
110 110
//        }
111 111
//        return this.attributeNamesTranslator;
112 112
//    }
113

  
114 113
    @Override
115 114
    public List<OpenDataStoreParameters> getTargetOpenStoreParameters() throws ExportException {
116 115
        List<OpenDataStoreParameters> r = new ArrayList<>();
......
151 150
            dataManager.newStore(explorerName, providerName, newStoreParameters, true);
152 151
            target = (FeatureStore) dataManager.openStore(providerName, openStoreParameters);
153 152

  
154
            FeatureType theTargetFeatureType = this.getParameters().getExportAttributes().getTargetFeatureType();//target.getDefaultFeatureType();
153
            FeatureType theTargetFeatureType;
154
            if (this.getParameters().getExportAttributes().isActive()) {
155
                theTargetFeatureType = this.getParameters().getExportAttributes().getTargetFeatureType();
156
            } else {
157
                theTargetFeatureType = target.getDefaultFeatureType();
158
            }
155 159
            FeatureType theSourceFeatureType = featureSet.getDefaultFeatureType();
156 160

  
157 161
            ExportGeometryHelper geomHelper = null;
......
170 174
            target.edit(FeatureStore.MODE_APPEND);
171 175
            it = featureSet.fastIterator();
172 176

  
173
            long featureCount = 0;
177
            long featureCount = 1;
174 178
            while (it.hasNext()) {
175 179
                this.getTaskStatus().setCurValue(featureCount);
176 180

  
......
214 218
    protected void copyValues(Feature source, EditableFeature target) {
215 219
        FeatureType sourceType = source.getType();
216 220
        FeatureType targetType = target.getType();
221
        ExportAttributes exp = this.getParameters().getExportAttributes();
222
        boolean isActive = exp.isActive();
217 223
        for (FeatureAttributeDescriptor targetAttr : targetType) {
218 224
            if (targetAttr.isReadOnly() || targetAttr.isComputed()) {
219 225
                continue;
220 226
            }
221 227
            String targetAttrName = targetAttr.getName();
222 228
            //translate field
223
            String sourceAttrName = getParameters().getExportAttributes().getSourceName(targetAttrName);
224
            ExportAttributes exp = this.getParameters().getExportAttributes();
225
            for (ExportAttributes.ExportAttribute exportAttribute : exp) {
226
                if (StringUtils.equals(exportAttribute.getNewName(),targetAttrName)) {
227
                    sourceAttrName = exportAttribute.getName();
229
            FeatureAttributeDescriptor sourceAttr;
230
            String sourceAttrName;
231
            if (isActive) {
232
                sourceAttrName = exp.getSourceName(targetAttrName);
233
                for (ExportAttributes.ExportAttribute exportAttribute : exp) {
234
                    if (StringUtils.equals(exportAttribute.getNewName(), targetAttrName)) {
235
                        sourceAttrName = exportAttribute.getName();
236
                    }
228 237
                }
238

  
239
                sourceAttr = sourceType.getAttributeDescriptor(sourceAttrName);
240
            } else {
241
                sourceAttrName = targetAttrName;
242
                sourceAttr = sourceType.getAttributeDescriptor(targetAttrName);
229 243
            }
230

  
231
            FeatureAttributeDescriptor sourceAttr = sourceType.getAttributeDescriptor(sourceAttrName);
232 244
            if (sourceAttr != null) {
233 245
                Object value = source.get(sourceAttrName);
234 246
                if (value == null) {
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.lib/org.gvsig.exportto.lib.api/src/main/java/org/gvsig/export/spi/AbstractExportParameters.java
3 3
import java.text.DateFormat;
4 4
import java.text.SimpleDateFormat;
5 5
import java.util.Date;
6
import org.apache.commons.lang3.StringUtils;
7 6
import org.gvsig.export.ExportAttributes;
8 7
import org.gvsig.export.ExportLocator;
9 8
import org.gvsig.fmap.dal.exception.DataException;
......
109 108
    @Override
110 109
    public ExportParameters clone() throws CloneNotSupportedException {
111 110
        ExportParameters clone = (ExportParameters) super.clone();
112
        clone.setContext(new Date());
113 111

  
114 112
        if (this.filterExpression != null) {
115 113
            clone.setFilterExpresion(this.filterExpression.clone());
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.lib/org.gvsig.exportto.lib.api/src/main/java/org/gvsig/export/ExportCharsetParameters.java
1
package org.gvsig.export;
2

  
3
public interface ExportCharsetParameters {
4

  
5
    public void setCharset(String charset);
6
    
7
    public String getCharset();
8
    
9
}
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.lib/org.gvsig.exportto.lib.impl/src/main/java/org/gvsig/export/impl/DefaultExportProcess.java
1 1
package org.gvsig.export.impl;
2 2

  
3 3
import java.util.List;
4
import org.apache.commons.lang3.StringUtils;
5 4
import org.cresques.cts.ICoordTrans;
6 5
import org.cresques.cts.IProjection;
7
import org.gvsig.export.ExportAttributes;
8 6
import org.gvsig.export.ExportException;
9 7
import org.gvsig.export.ExportLocator;
10 8
import org.gvsig.export.ExportParameters;
11 9
import org.gvsig.export.ExportParametersGeometry;
12 10
import org.gvsig.export.ExportProcess;
13
import org.gvsig.export.spi.AttributeNamesTranslator;
14 11
import org.gvsig.export.spi.ExportService;
15 12
import org.gvsig.export.spi.ExportServiceFactory;
16 13
import org.gvsig.export.spi.ExportServiceManager;
......
46 43

  
47 44
    @Override
48 45
    public void setOutputFormat(String serviceName) throws ExportException {
49
        
50
        if (this.factory != null && StringUtils.equalsIgnoreCase(serviceName, this.factory.getName())) {
51
            return;
52
        }
46

  
53 47
        ExportServiceManager serviceManager = ExportLocator.getServiceManager();
54 48
        this.factory = serviceManager.getServiceFactory(serviceName);
55 49
        this.parameters = this.factory.createParameters();
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.lib/org.gvsig.exportto.lib.impl/src/main/java/org/gvsig/export/impl/service/DefaultExportAttributes.java
8 8
import java.util.ArrayList;
9 9
import java.util.Iterator;
10 10
import java.util.List;
11
import java.util.logging.Level;
12
import org.apache.commons.collections.ListUtils;
13 11
import org.apache.commons.lang3.StringUtils;
14 12
import org.gvsig.export.ExportAttributes;
15
import org.gvsig.export.ExportLocator;
16 13
import org.gvsig.export.spi.AttributeNamesTranslator;
17 14
import org.gvsig.export.spi.DummyAttributeNamesTranslator;
18 15
import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
19 16
import org.gvsig.fmap.dal.feature.EditableFeatureType;
20 17
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
21 18
import org.gvsig.fmap.dal.feature.FeatureType;
22
import org.gvsig.tools.dataTypes.DataType;
23
import org.gvsig.tools.util.UnmodifiableBasicListAdapter;
24 19
import org.slf4j.Logger;
25 20
import org.slf4j.LoggerFactory;
26 21

  
......
30 25
    private AttributeNamesTranslator namesTranslator = null;
31 26
    private FeatureType sourceFeatureType;
32 27
    static final Logger LOGGER = LoggerFactory.getLogger(DefaultExportAttributes.class);
28
    private boolean active;
33 29

  
34 30
    public DefaultExportAttributes() { //FeatureType ftype) {
35 31
//        this.setSourceFeatureType(ftype);
36 32
        this.namesTranslator = new DummyAttributeNamesTranslator();
33
        this.active = false;
37 34
    }
38 35

  
39 36
    public void fillExportAttributes(FeatureType ftype) {
......
257 254
    public void setExportAttributes(List<ExportAttribute> exportAttributes) {
258 255
        this.exportAttributes = exportAttributes;
259 256
    }
257

  
258
    @Override
259
    public void setActive(boolean active) {
260
        this.active = active;
261
    }
262

  
263
    @Override
264
    public boolean isActive() {
265
        return this.active;
266
    }
267
    
268
    
260 269
}
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/service/ExportCSVServiceFactory.java
38 38

  
39 39
    @Override
40 40
    public boolean hasVectorialSupport() {
41
        return false;
41
        return true;
42 42
    }
43 43
    
44 44
}
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/service/ExportCSVService.java
106 106
            newStoreParameters.setDynValue("quoteCharacter", this.getParameters().getQuoteCharacter());
107 107
            newStoreParameters.setDynValue("commentStartMarker", this.getParameters().getCommentStartMarker());
108 108
            newStoreParameters.setDynValue("escapeCharacter", this.getParameters().getEscapeCharacter());
109
            newStoreParameters.setDynValue("charset", this.getParameters().getCharset());
109 110

  
110 111
            FeatureType ft = this.getParameters().getExportAttributes().getTargetFeatureType();
111 112
            if (ft == null) {
......
143 144
            openStoreParameters.setDynValue("commentStartMarker", checkEmptyStringParam(this.getParameters().getCommentStartMarker()));
144 145
            openStoreParameters.setDynValue("escapeCharacter", checkEmptyStringParam(this.getParameters().getEscapeCharacter()));
145 146
            openStoreParameters.setDynValue("firstLineHeader", true);
147
            openStoreParameters.setDynValue("charset", checkEmptyStringParam(this.getParameters().getCharset()));
146 148

  
147 149
            return openStoreParameters;
148 150
        } catch (DataException ex) {
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/service/ExportCSVParameters.java
1 1
package org.gvsig.export.csv.service;
2 2

  
3
import org.gvsig.export.ExportCharsetParameters;
3 4
import org.gvsig.tools.util.HasAFile;
4 5
import org.gvsig.export.ExportParameters;
5 6

  
......
7 8
 *
8 9
 * @author jjdelcerro
9 10
 */
10
public interface ExportCSVParameters extends ExportParameters, HasAFile {
11
public interface ExportCSVParameters extends ExportCharsetParameters, ExportParameters, HasAFile {
11 12
    
12 13
    public String getProfile();
13 14
    
......
41 42
    
42 43
    public void setEscapeCharacter(String escapeCharacter);
43 44
    
44
    public String getCharset();
45
    
46
    public void setCharset(String charset);
47
    
48 45
}
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/service/ExportCSVParametersImpl.java
3 3
import java.io.File;
4 4
import org.apache.commons.io.FilenameUtils;
5 5
import org.apache.commons.lang3.StringUtils;
6
import org.gvsig.export.spi.AbstractExportParameters;
6
import org.gvsig.export.spi.AbstractExportParametersGeometry;
7 7
import org.gvsig.fmap.dal.feature.FeatureType;
8 8

  
9 9
/**
......
11 11
 * @author jjdelcerro
12 12
 */
13 13
public class ExportCSVParametersImpl
14
        extends AbstractExportParameters
14
        extends AbstractExportParametersGeometry
15 15
        implements ExportCSVParameters {
16 16

  
17 17
    private String encoding;
......
117 117

  
118 118
    @Override
119 119
    public void setCommentStartMarker(String commentStartMarker) {
120
        this.commentStartMarker  = commentStartMarker;
120
        this.commentStartMarker = commentStartMarker;
121 121
    }
122 122

  
123 123
    @Override
......
139 139
    public void setCharset(String charset) {
140 140
        this.charset = charset;
141 141
    }
142
    
142

  
143 143
    @Override
144 144
    public String toString() {
145
        String label = StringUtils.join(super.getLabel(),",", this.getProfile());
145
        String label = StringUtils.join(super.getLabel(), ",", this.getProfile());
146 146
        return label;
147 147
    }
148 148

  
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/ExportCSVPanels.java
13 13
import org.gvsig.export.swing.spi.ExportPanels;
14 14
import org.gvsig.export.swing.spi.ExportPanelsFactory;
15 15
import org.gvsig.export.swing.spi.ExportPanelsManager;
16
import org.gvsig.fmap.geom.Geometry;
16 17

  
17 18
/**
18 19
 *
19 20
 * @author jjdelcerro
20 21
 */
21
public class ExportCSVPanels 
22
public class ExportCSVPanels
22 23
        extends AbstractExportPanels
23
        implements ExportPanels
24
    {
24
        implements ExportPanels {
25 25

  
26 26
    ExportCSVPanels(
27
            ExportPanelsFactory factory, 
28
            JExportProcessPanel processPanel, 
27
            ExportPanelsFactory factory,
28
            JExportProcessPanel processPanel,
29 29
            ExportParameters parameters
30
        ) {
30
    ) {
31 31
        super(factory, processPanel, parameters);
32 32
        this.initPanels();
33 33
    }
34
    
34

  
35 35
    private void initPanels() {
36 36
        ExportPanelsManager manager = ExportSwingLocator.getExportPanelsManager();
37
        
38
        this.add( new CSVExportParametersPanel(
39
                this.getProcessPanel(), 
37

  
38
        this.add(new CSVExportParametersPanel(
39
                this.getProcessPanel(),
40 40
                this.getParameters()
41
            )
41
        )
42 42
        );
43
        this.add( manager.createStandardPanel(
44
                ExportPanelsManager.PANEL_SELECT_OUTPUT_FILE, 
45
                this.getProcessPanel(), 
43
        this.add(manager.createStandardPanel(
44
                ExportPanelsManager.PANEL_SELECT_OUTPUT_FILE,
45
                this.getProcessPanel(),
46 46
                this.getParameters()
47
            )
47
        )
48 48
        );
49 49
        this.add(manager.createStandardPanel(
50
                ExportPanelsManager.PANEL_SELECT_CHARSET,
51
                this.getProcessPanel(),
52
                this.getParameters()
53
        )
54
        );
55

  
56
        this.add(manager.createStandardPanel(
57
                ExportPanelsManager.PANEL_SELECT_GEOMETRY_FIELD,
58
                this.getProcessPanel(),
59
                this.getParameters()
60
        )
61
        );
62
        this.add(manager.createStandardPanel(
63
                ExportPanelsManager.PANEL_SELECT_GEOMETRY_TYPE,
64
                this.getProcessPanel(),
65
                this.getParameters(),
66
                new int[]{
67
                    Geometry.TYPES.GEOMETRY,
68
                    Geometry.TYPES.POINT,
69
                    Geometry.TYPES.LINE,
70
                    Geometry.TYPES.POLYGON,
71
                    Geometry.TYPES.MULTIPOINT,
72
                    Geometry.TYPES.MULTILINE,
73
                    Geometry.TYPES.MULTIPOLYGON
74
                },
75
                new int[]{
76
                    Geometry.SUBTYPES.GEOM2D,
77
                    Geometry.SUBTYPES.GEOM3D,
78
                    Geometry.SUBTYPES.GEOM3DM
79
                }
80
        )
81
        );
82
        this.add(manager.createStandardPanel(
83
                ExportPanelsManager.PANEL_CHECK_GEOMETRIES,
84
                this.getProcessPanel(),
85
                this.getParameters()
86
        )
87
        );
88

  
89
        this.add(manager.createStandardPanel(
50 90
                ExportPanelsManager.PANEL_ATTRIBUTES_SELECTION,
51 91
                this.getProcessPanel(),
52 92
                this.getParameters()
53
            )
93
        )
54 94
        );
55 95
    }
56 96
}
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/CSVExportParametersPanelView.xml
24 24
    </at>
25 25
    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
26 26
   </super>
27
   <at name="id">/home/osc/devel/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/EncodingPanelView.xml</at>
28
   <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE</at>
27
   <at name="id">/home/osc/devel/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/CSVExportParametersPanelView.xml</at>
28
   <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE</at>
29 29
   <at name="colspecs">FILL:DEFAULT:NONE,FILL:106DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE</at>
30 30
   <at name="components">
31 31
    <object classname="java.util.LinkedList">
......
455 455
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
456 456
         <at name="cellconstraints">
457 457
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
458
           <at name="column">2</at>
459
           <at name="row">16</at>
460
           <at name="colspan">1</at>
461
           <at name="rowspan">1</at>
462
           <at name="halign">default</at>
463
           <at name="valign">default</at>
464
           <at name="insets" object="insets">0,0,0,0</at>
465
          </object>
466
         </at>
467
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
468
        </super>
469
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
470
        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
471
        <at name="beanproperties">
472
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
473
          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
474
          <at name="properties">
475
           <object classname="com.jeta.forms.store.support.PropertyMap">
476
            <at name="border">
477
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
478
              <super classname="com.jeta.forms.store.properties.BorderProperty">
479
               <at name="name">border</at>
480
              </super>
481
              <at name="borders">
482
               <object classname="java.util.LinkedList">
483
                <item >
484
                 <at name="value">
485
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
486
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
487
                    <at name="name">border</at>
488
                   </super>
489
                  </object>
490
                 </at>
491
                </item>
492
               </object>
493
              </at>
494
             </object>
495
            </at>
496
            <at name="name">lblEscapeCharacter</at>
497
            <at name="width">182</at>
498
            <at name="text">_Escape_character</at>
499
            <at name="fill">
500
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
501
              <at name="name">fill</at>
502
             </object>
503
            </at>
504
            <at name="height">14</at>
505
           </object>
506
          </at>
507
         </object>
508
        </at>
509
       </object>
510
      </at>
511
     </item>
512
     <item >
513
      <at name="value">
514
       <object classname="com.jeta.forms.store.memento.BeanMemento">
515
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
516
         <at name="cellconstraints">
517
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
518
           <at name="column">2</at>
519
           <at name="row">18</at>
520
           <at name="colspan">1</at>
521
           <at name="rowspan">1</at>
522
           <at name="halign">default</at>
523
           <at name="valign">default</at>
524
           <at name="insets" object="insets">0,0,0,0</at>
525
          </object>
526
         </at>
527
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
528
        </super>
529
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
530
        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
531
        <at name="beanproperties">
532
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
533
          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
534
          <at name="properties">
535
           <object classname="com.jeta.forms.store.support.PropertyMap">
536
            <at name="border">
537
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
538
              <super classname="com.jeta.forms.store.properties.BorderProperty">
539
               <at name="name">border</at>
540
              </super>
541
              <at name="borders">
542
               <object classname="java.util.LinkedList">
543
                <item >
544
                 <at name="value">
545
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
546
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
547
                    <at name="name">border</at>
548
                   </super>
549
                  </object>
550
                 </at>
551
                </item>
552
               </object>
553
              </at>
554
             </object>
555
            </at>
556
            <at name="name">lblCharset</at>
557
            <at name="width">182</at>
558
            <at name="text">_Charset</at>
559
            <at name="fill">
560
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
561
              <at name="name">fill</at>
562
             </object>
563
            </at>
564
            <at name="height">14</at>
565
           </object>
566
          </at>
567
         </object>
568
        </at>
569
       </object>
570
      </at>
571
     </item>
572
     <item >
573
      <at name="value">
574
       <object classname="com.jeta.forms.store.memento.BeanMemento">
575
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
576
         <at name="cellconstraints">
577
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
578 458
           <at name="column">3</at>
579 459
           <at name="row">2</at>
580 460
           <at name="colspan">1</at>
......
614 494
             </object>
615 495
            </at>
616 496
            <at name="name">cmbProfile</at>
617
            <at name="width">429</at>
497
            <at name="width">448</at>
618 498
            <at name="items">
619 499
             <object classname="com.jeta.forms.store.properties.ItemsProperty">
620 500
              <at name="name">items</at>
......
673 553
             </object>
674 554
            </at>
675 555
            <at name="name">cmbQuotePolicy</at>
676
            <at name="width">429</at>
556
            <at name="width">448</at>
677 557
            <at name="items">
678 558
             <object classname="com.jeta.forms.store.properties.ItemsProperty">
679 559
              <at name="name">items</at>
......
732 612
             </object>
733 613
            </at>
734 614
            <at name="name">cmbLocale</at>
735
            <at name="width">429</at>
615
            <at name="width">448</at>
736 616
            <at name="items">
737 617
             <object classname="com.jeta.forms.store.properties.ItemsProperty">
738 618
              <at name="name">items</at>
......
791 671
             </object>
792 672
            </at>
793 673
            <at name="name">txtRecordSeparator</at>
794
            <at name="width">429</at>
674
            <at name="width">448</at>
795 675
            <at name="height">20</at>
796 676
           </object>
797 677
          </at>
......
845 725
             </object>
846 726
            </at>
847 727
            <at name="name">txtDelimiter</at>
848
            <at name="width">429</at>
728
            <at name="width">448</at>
849 729
            <at name="height">20</at>
850 730
           </object>
851 731
          </at>
......
899 779
             </object>
900 780
            </at>
901 781
            <at name="name">txtQuoteCharacter</at>
902
            <at name="width">429</at>
782
            <at name="width">448</at>
903 783
            <at name="height">20</at>
904 784
           </object>
905 785
          </at>
......
953 833
             </object>
954 834
            </at>
955 835
            <at name="name">txtCommentStartMarker</at>
956
            <at name="width">429</at>
836
            <at name="width">448</at>
957 837
            <at name="height">20</at>
958 838
           </object>
959 839
          </at>
......
962 842
       </object>
963 843
      </at>
964 844
     </item>
965
     <item >
966
      <at name="value">
967
       <object classname="com.jeta.forms.store.memento.BeanMemento">
968
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
969
         <at name="cellconstraints">
970
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
971
           <at name="column">3</at>
972
           <at name="row">16</at>
973
           <at name="colspan">1</at>
974
           <at name="rowspan">1</at>
975
           <at name="halign">default</at>
976
           <at name="valign">default</at>
977
           <at name="insets" object="insets">0,0,0,0</at>
978
          </object>
979
         </at>
980
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
981
        </super>
982
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
983
        <at name="beanclass">javax.swing.JTextField</at>
984
        <at name="beanproperties">
985
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
986
          <at name="classname">javax.swing.JTextField</at>
987
          <at name="properties">
988
           <object classname="com.jeta.forms.store.support.PropertyMap">
989
            <at name="border">
990
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
991
              <super classname="com.jeta.forms.store.properties.BorderProperty">
992
               <at name="name">border</at>
993
              </super>
994
              <at name="borders">
995
               <object classname="java.util.LinkedList">
996
                <item >
997
                 <at name="value">
998
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
999
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
1000
                    <at name="name">border</at>
1001
                   </super>
1002
                  </object>
1003
                 </at>
1004
                </item>
1005
               </object>
1006
              </at>
1007
             </object>
1008
            </at>
1009
            <at name="name">txtEscapeCharacter</at>
1010
            <at name="width">429</at>
1011
            <at name="height">20</at>
1012
           </object>
1013
          </at>
1014
         </object>
1015
        </at>
1016
       </object>
1017
      </at>
1018
     </item>
1019
     <item >
1020
      <at name="value">
1021
       <object classname="com.jeta.forms.store.memento.BeanMemento">
1022
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
1023
         <at name="cellconstraints">
1024
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1025
           <at name="column">3</at>
1026
           <at name="row">18</at>
1027
           <at name="colspan">1</at>
1028
           <at name="rowspan">1</at>
1029
           <at name="halign">default</at>
1030
           <at name="valign">default</at>
1031
           <at name="insets" object="insets">0,0,0,0</at>
1032
          </object>
1033
         </at>
1034
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1035
        </super>
1036
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1037
        <at name="beanclass">javax.swing.JTextField</at>
1038
        <at name="beanproperties">
1039
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1040
          <at name="classname">javax.swing.JTextField</at>
1041
          <at name="properties">
1042
           <object classname="com.jeta.forms.store.support.PropertyMap">
1043
            <at name="border">
1044
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1045
              <super classname="com.jeta.forms.store.properties.BorderProperty">
1046
               <at name="name">border</at>
1047
              </super>
1048
              <at name="borders">
1049
               <object classname="java.util.LinkedList">
1050
                <item >
1051
                 <at name="value">
1052
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1053
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
1054
                    <at name="name">border</at>
1055
                   </super>
1056
                  </object>
1057
                 </at>
1058
                </item>
1059
               </object>
1060
              </at>
1061
             </object>
1062
            </at>
1063
            <at name="name">txtCharset</at>
1064
            <at name="width">429</at>
1065
            <at name="height">20</at>
1066
           </object>
1067
          </at>
1068
         </object>
1069
        </at>
1070
       </object>
1071
      </at>
1072
     </item>
1073 845
    </object>
1074 846
   </at>
1075 847
   <at name="properties">
......
1127 899
   <at name="cellpainters">
1128 900
    <object classname="com.jeta.forms.store.support.Matrix">
1129 901
     <at name="rows">
1130
      <object classname="[Ljava.lang.Object;" size="20">
902
      <object classname="[Ljava.lang.Object;" size="16">
1131 903
       <at name="item" index="0">
1132 904
        <object classname="[Ljava.lang.Object;" size="4"/>
1133 905
       </at>
......
1176 948
       <at name="item" index="15">
1177 949
        <object classname="[Ljava.lang.Object;" size="4"/>
1178 950
       </at>
1179
       <at name="item" index="16">
1180
        <object classname="[Ljava.lang.Object;" size="4"/>
1181
       </at>
1182
       <at name="item" index="17">
1183
        <object classname="[Ljava.lang.Object;" size="4"/>
1184
       </at>
1185
       <at name="item" index="18">
1186
        <object classname="[Ljava.lang.Object;" size="4"/>
1187
       </at>
1188
       <at name="item" index="19">
1189
        <object classname="[Ljava.lang.Object;" size="4"/>
1190
       </at>
1191 951
      </object>
1192 952
     </at>
1193 953
    </object>
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/CSVExportParametersPanelView.java
1 1
package org.gvsig.export.csv.swing.panels;
2

  
3 2
import com.jeta.open.i18n.I18NUtils;
4 3
import com.jgoodies.forms.layout.CellConstraints;
5 4
import com.jgoodies.forms.layout.FormLayout;
......
27 26
   JLabel lblDelimiter = new JLabel();
28 27
   JLabel lblQuoteCharacter = new JLabel();
29 28
   JLabel lblCommentStartMarker = new JLabel();
30
   JLabel lblEscapeCharacter = new JLabel();
31
   JLabel lblCharset = new JLabel();
32 29
   JComboBox cmbProfile = new JComboBox();
33 30
   JComboBox cmbQuotePolicy = new JComboBox();
34 31
   JComboBox cmbLocale = new JComboBox();
......
36 33
   JTextField txtDelimiter = new JTextField();
37 34
   JTextField txtQuoteCharacter = new JTextField();
38 35
   JTextField txtCommentStartMarker = new JTextField();
39
   JTextField txtEscapeCharacter = new JTextField();
40
   JTextField txtCharset = new JTextField();
41 36

  
42 37
   /**
43 38
    * Default constructor
......
149 144
   public JPanel createPanel()
150 145
   {
151 146
      JPanel jpanel1 = new JPanel();
152
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:106DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE");
147
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:106DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE,CENTER:4PX:NONE,CENTER:DEFAULT:NONE");
153 148
      CellConstraints cc = new CellConstraints();
154 149
      jpanel1.setLayout(formlayout1);
155 150

  
......
181 176
      lblCommentStartMarker.setText("_Comment_start_marker");
182 177
      jpanel1.add(lblCommentStartMarker,cc.xy(2,14));
183 178

  
184
      lblEscapeCharacter.setName("lblEscapeCharacter");
185
      lblEscapeCharacter.setText("_Escape_character");
186
      jpanel1.add(lblEscapeCharacter,cc.xy(2,16));
187

  
188
      lblCharset.setName("lblCharset");
189
      lblCharset.setText("_Charset");
190
      jpanel1.add(lblCharset,cc.xy(2,18));
191

  
192 179
      cmbProfile.setName("cmbProfile");
193 180
      jpanel1.add(cmbProfile,cc.xy(3,2));
194 181

  
......
210 197
      txtCommentStartMarker.setName("txtCommentStartMarker");
211 198
      jpanel1.add(txtCommentStartMarker,cc.xy(3,14));
212 199

  
213
      txtEscapeCharacter.setName("txtEscapeCharacter");
214
      jpanel1.add(txtEscapeCharacter,cc.xy(3,16));
215

  
216
      txtCharset.setName("txtCharset");
217
      jpanel1.add(txtCharset,cc.xy(3,18));
218

  
219
      addFillComponents(jpanel1,new int[]{ 1,2,3,4 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20 });
200
      addFillComponents(jpanel1,new int[]{ 1,2,3,4 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 });
220 201
      return jpanel1;
221 202
   }
222 203

  
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
107 107
        DynStruct parametersDefinition = ToolsLocator.getPersistenceManager().getDefinition("CSVNewStoreParameters");
108 108
        this.cmbProfile.setModel(this.fillComboBoxWithAvaibleParameters("profile"));
109 109
        this.cmbProfile.setSelectedIndex(0);
110
//        this.cmbProfile.addActionListener(new ActionListener() {
111
//            @Override
112
//            public void actionPerformed(ActionEvent e) {
113
//                JComboBox combo = (JComboBox) e.getSource();
114
//                ComboItem item = (ComboItem) combo.getSelectedItem();
115
//                String s = item.getValue();
116
//                CsvPreference pref = null;
117
//                if ("STANDARD_PREFERENCE".equalsIgnoreCase(s)) {
118
//                    pref = CsvPreference.STANDARD_PREFERENCE;
119
//                }
120
//                if ("EXCEL_PREFERENCE".equalsIgnoreCase(s)) {
121
//                    pref = CsvPreference.EXCEL_PREFERENCE;
122
//                }
123
//                if ("EXCEL_NORTH_EUROPE_PREFERENCE".equalsIgnoreCase(s)) {
124
//                    pref = CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE;
125
//                }
126
//                if ("TAB_PREFERENCE".equalsIgnoreCase(s)) {
127
//                    pref = CsvPreference.TAB_PREFERENCE;
128
//                }
129
//                txtQuoteCharacter.setText(String.valueOf(pref.getQuoteChar()));
130
//                txtDelimiter.setText(String.valueOf(pref.getDelimiterChar()));
131
//                txtRecordSeparator.setText(String.valueOf(pref.getEndOfLineSymbols()));
132
//                txtCommentStartMarker.setText(pref.getCommentMatcher().toString());
133
//            }
134
//        });
135
        // Si viene de otro csv coger sus parametros
136
        DataStoreParameters params = this.parameters.getSourceFeatureStore().getParameters();
110
        
111
        //TODO: set params from previous source store in case of null values
112
        //it can be null
113
        //DataStoreParameters params = this.parameters.getSourceFeatureStore().getParameters();
137 114
//        if (params instanceof CSVStoreParameters) {
138 115
//            CSVStoreParameters sparams = (CSVStoreParameters) params;
139 116
//            CsvPreference profile = CSVStoreParameters.getPredefinedCSVPreferences(sparams);
......
166 143
        this.cmbLocale.setModel(this.fillComboBoxWithAvaibleParameters("locale"));
167 144
        this.cmbLocale.setSelectedIndex(0);
168 145

  
169
//        String sourceProviderName = this.parameters.getSourceFeatureStore().getProviderName();
170
//        if (sourceProviderName.equalsIgnoreCase("Shape") || sourceProviderName.equalsIgnoreCase("CSV")) {
171
//            DataStoreParameters params = this.parameters.getSourceFeatureStore().getParameters();
172
//            String encoding = (String) params.getDynValue("Encoding");
173
//            ListElement.setSelected(this.lstEncoding, encoding);
174
//        }
175

  
176 146
        this.translate();
177 147
    }
178 148

  
......
185 155
        i18nc.translate(this.lblDelimiter);
186 156
        i18nc.translate(this.lblQuoteCharacter);
187 157
        i18nc.translate(this.lblCommentStartMarker);
188
        i18nc.translate(this.lblEscapeCharacter);
189
        i18nc.translate(this.lblCharset);
190 158

  
191 159
    }
192 160

  
......
230 198
        return this.txtCommentStartMarker.getText();
231 199
    }
232 200

  
233
    public String getParameterEscapeCharacter() {
234
        return this.txtEscapeCharacter.getText();
235
    }
236

  
237
    public String getParameterCharset() {
238
        return this.txtCharset.getText();
239
    }
240

  
241 201
    @Override
242 202
    public JComponent asJComponent() {
243 203
        return this;
......
272 232
        this.txtDelimiter.setText(this.parameters.getDelimiter());
273 233
        this.txtQuoteCharacter.setText(this.parameters.getQuoteCharacter());
274 234
        this.txtCommentStartMarker.setText(this.parameters.getCommentStartMarker());
275
        this.txtEscapeCharacter.setText(this.parameters.getRecordSeparator());
276
        this.txtCharset.setText(this.parameters.getCharset());
277 235
    }
278 236

  
279 237
    @Override
......
304 262
        if (this.getParameterDelimiter() != null) {
305 263
            this.parameters.setDelimiter(this.getParameterDelimiter());
306 264
        }
307
        if (this.getParameterCharset() != null) {
308
            this.parameters.setQuoteCharacter(this.getParameterQuoteCharacter());
309
        }
310 265
        if (this.getParameterCommentStartMarker() != null) {
311 266
            this.parameters.setCommentStartMarker(this.getParameterCommentStartMarker());
312 267
        }
313
        if (this.getParameterEscapeCharacter() != null) {
314
            this.parameters.setEscapeCharacter(this.getParameterEscapeCharacter());
268
        if (this.getParameterQuoteCharacter()!=null) {
269
            this.parameters.setQuoteCharacter(this.getParameterQuoteCharacter());
315 270
        }
316
        if (this.getParameterCharset() != null) {
317
            this.parameters.setCharset(this.getParameterCharset());
318
        }
319 271
    }
320 272
}
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.shape/src/main/java/org/gvsig/export/shape/service/ExportShapeParametersImpl.java
25 25
        AttributeNamesTranslator attr = new CutAttributeNamesTranslator(ExportDBFService.MAX_FIELD_NAME_LENGTH);
26 26
        this.exportAttributes.setNamesTranslator(attr);
27 27
    }
28
    
28

  
29 29
    @Override
30 30
    public String getServiceName() {
31 31
        return ExportShapeServiceFactory.SERVICE_NAME;
......
56 56
        return this.useSimplifiedExport;
57 57
    }
58 58

  
59
    @Override
59 60
    public void setUseSimplifiedExport(boolean useSimplifiedExport) {
60 61
        this.useSimplifiedExport = useSimplifiedExport;
61 62
    }
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
41 41
    public ExportJDBCParametersImpl(ExportJDBCServiceFactory factory) {
42 42
        super(factory);
43 43
        this.exportAttributes.setNamesTranslator(new ExportJDBCAttributeNamesTranslator(this));
44
        
45
        this.canCreatetable = true;
46
        this.translateIdentifiersToLowerCase = true;
47
        this.removeSpacesInIdentifiers = true;
48
        this.translateHyphens = true;
49
        this.createIndexInGeometryRow = true;
50
        this.updateTableStatistics = true;
44 51
    }
45 52

  
46 53
    @Override
......
387 394

  
388 395
    public ExportJDBCParameters clone() throws CloneNotSupportedException {
389 396
        ExportJDBCParameters clone = (ExportJDBCParameters) super.clone();
397
        clone.setExplorerParameters((JDBCServerExplorerParameters) this.explorerParameters.getCopy());
390 398
        clone.getExportAttributes().setNamesTranslator(new ExportJDBCAttributeNamesTranslator(clone));
391
//        clone.setExplorerParameters(this.explorerParameters.clone());
392 399
        return clone;
393 400
    }
394 401

  
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.api/src/main/java/org/gvsig/export/swing/spi/ExportPanelsManager.java
10 10
public interface ExportPanelsManager {
11 11

  
12 12
    public static final String PANEL_CHECK_GEOMETRIES = "PANEL_CHECK_GEOMETRIES";
13
    public static final String PANEL_SELECT_CHARSET = "PANEL_SELECT_CHARSET";
13 14
    public static final String PANEL_SELECT_FILTER = "PANEL_SELECT_EXPORT_FILTER";
14 15
    public static final String PANEL_SELECT_GEOMETRY_TYPE = "PANEL_SELECT_GEOMETRY_TYPE";
15 16
    public static final String PANEL_SELECT_OUTPUT_FILE = "PANEL_SELECT_OUTPUT_FILE";
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/resources/org/gvsig/exportto/swing/impl/i18n/text.properties
31 31
_Change_field_name=Cambiar nombre
32 32
_Change_field_type=Cambiar tipo
33 33
_Check_export=Exportar
34
_Change_field_size=Tama\u00f1o
34
_Change_field_size=Tama\u00f1o
35
_Charset=Codificaci\u00f3n de caracteres
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/resources/org/gvsig/exportto/swing/impl/i18n/text_en.properties
31 31
_Change_field_name=Change name
32 32
_Change_field_type=Change type
33 33
_Check_export=Export
34
_Change_field_size=Size
34
_Change_field_size=Size
35
_Charset=Charset
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/export/swing/impl/DefaultJExportProcessPanel.java
27 27
import java.awt.Dimension;
28 28
import java.awt.event.ActionEvent;
29 29
import java.awt.event.ActionListener;
30
import java.util.Date;
30 31
import java.util.HashSet;
31 32
import java.util.Set;
32 33
import javax.swing.JButton;
......
133 134
        try {
134 135
            removePreviousPanels();
135 136
            if (this.process.getParameters() != null) {
136
                if ( StringUtils.equals(this.process.getParameters().getServiceName(),serviceFactory.getName())) {
137
                    this.process.setParameters(null);
137
                // Check parameters are for the actual serviceFactory, if not, reset.
138
                if ( !StringUtils.equals(this.process.getParameters().getServiceName(),serviceFactory.getName())) {
139
                    this.process.setOutputFormat(serviceFactory.getName());
138 140
                }
139
            }
140
            
141
            if (this.process.getParameters()==null) {
141
            } else if (this.process.getParameters()==null) {
142 142
                this.process.setOutputFormat(serviceFactory.getName());
143 143
            }
144 144
            
......
293 293
        ExportParameters copyParams = null;
294 294
        try {
295 295
            copyParams = (ExportParameters) params.clone();
296
            copyParams.setCreationDate(new Date());
296 297
            History<ExportParameters> h = exportManager.getHistory();
297 298
            h.add(copyParams);
298 299
        } catch (Exception ex) {
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/export/swing/impl/panels/SelectAttributesPanelView.xml
74 74
             </object>
75 75
            </at>
76 76
            <at name="name">lblHeader</at>
77
            <at name="width">838</at>
78
            <at name="text">_select_attributes_to_export_and_its_name</at>
77
            <at name="width">652</at>
78
            <at name="text">_Select_name_type_size_and_attributes_to_export</at>
79 79
            <at name="fill">
80 80
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
81 81
              <at name="name">fill</at>
......
115 115
           <object classname="com.jeta.forms.store.support.PropertyMap">
116 116
            <at name="autoscrolls">true</at>
117 117
            <at name="name">jplAttributes</at>
118
            <at name="width">810</at>
118
            <at name="width">624</at>
119 119
            <at name="height">12</at>
120 120
           </object>
121 121
          </at>
......
169 169
             </object>
170 170
            </at>
171 171
            <at name="name">tblAttributes</at>
172
            <at name="width">808</at>
172
            <at name="width">622</at>
173 173
            <at name="scollBars">
174 174
             <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
175 175
              <at name="name">scollBars</at>
176 176
              <at name="verticalpolicy">20</at>
177 177
              <at name="horizontalpolicy">30</at>
178
              <at name="border">
179
               <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
180
                <super classname="com.jeta.forms.store.properties.BorderProperty">
181
                 <at name="name">border</at>
182
                </super>
183
                <at name="borders">
184
                 <object classname="java.util.LinkedList">
185
                  <item >
186
                   <at name="value">
187
                    <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
188
                     <super classname="com.jeta.forms.store.properties.BorderProperty">
189
                      <at name="name">border</at>
190
                     </super>
191
                    </object>
192
                   </at>
193
                  </item>
194
                 </object>
195
                </at>
196
               </object>
197
              </at>
178 198
             </object>
179 199
            </at>
180 200
            <at name="height">32</at>
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/export/swing/impl/panels/SelectCharsetPanelView.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2

  
3
<object classname="com.jeta.forms.store.memento.FormPackage">
4
 <at name="fileversion">
5
  <object classname="com.jeta.forms.store.memento.FormsVersion2">
6
   <at name="major">2</at>
7
   <at name="minor">0</at>
8
   <at name="sub">0</at>
9
  </object>
10
 </at>
11
 <at name="form">
12
  <object classname="com.jeta.forms.store.memento.FormMemento">
13
   <super classname="com.jeta.forms.store.memento.ComponentMemento">
14
    <at name="cellconstraints">
15
     <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
16
      <at name="column">1</at>
17
      <at name="row">1</at>
18
      <at name="colspan">1</at>
19
      <at name="rowspan">1</at>
20
      <at name="halign">default</at>
21
      <at name="valign">default</at>
22
      <at name="insets" object="insets">0,0,0,0</at>
23
     </object>
24
    </at>
25
    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
26
   </super>
27
   <at name="id">/home/osc/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/export/swing/impl/panels/SelectCharsetPanelView.xml</at>
28
   <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE</at>
29
   <at name="colspecs">FILL:DEFAULT:NONE,FILL:8DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE</at>
30
   <at name="components">
31
    <object classname="java.util.LinkedList">
32
     <item >
33
      <at name="value">
34
       <object classname="com.jeta.forms.store.memento.BeanMemento">
35
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
36
         <at name="cellconstraints">
37
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
38
           <at name="column">2</at>
39
           <at name="row">2</at>
40
           <at name="colspan">2</at>
41
           <at name="rowspan">1</at>
42
           <at name="halign">default</at>
43
           <at name="valign">default</at>
44
           <at name="insets" object="insets">0,0,0,0</at>
45
          </object>
46
         </at>
47
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
48
        </super>
49
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
50
        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
51
        <at name="beanproperties">
52
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
53
          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
54
          <at name="properties">
55
           <object classname="com.jeta.forms.store.support.PropertyMap">
56
            <at name="border">
57
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
58
              <super classname="com.jeta.forms.store.properties.BorderProperty">
59
               <at name="name">border</at>
60
              </super>
61
              <at name="borders">
62
               <object classname="java.util.LinkedList">
63
                <item >
64
                 <at name="value">
65
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
66
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
67
                    <at name="name">border</at>
68
                   </super>
69
                  </object>
70
                 </at>
71
                </item>
72
               </object>
73
              </at>
74
             </object>
75
            </at>
76
            <at name="name">lblCharset</at>
77
            <at name="width">634</at>
78
            <at name="text">_Charset</at>
79
            <at name="fill">
80
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
81
              <at name="name">fill</at>
82
             </object>
83
            </at>
84
            <at name="height">14</at>
85
           </object>
86
          </at>
87
         </object>
88
        </at>
89
       </object>
90
      </at>
91
     </item>
92
     <item >
93
      <at name="value">
94
       <object classname="com.jeta.forms.store.memento.BeanMemento">
95
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
96
         <at name="cellconstraints">
97
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
98
           <at name="column">3</at>
99
           <at name="row">3</at>
100
           <at name="colspan">1</at>
101
           <at name="rowspan">1</at>
102
           <at name="halign">default</at>
103
           <at name="valign">default</at>
104
           <at name="insets" object="insets">0,0,0,0</at>
105
          </object>
106
         </at>
107
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
108
        </super>
109
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
110
        <at name="beanclass">javax.swing.JList</at>
111
        <at name="beanproperties">
112
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
113
          <at name="classname">javax.swing.JList</at>
114
          <at name="properties">
115
           <object classname="com.jeta.forms.store.support.PropertyMap">
116
            <at name="border">
117
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
118
              <super classname="com.jeta.forms.store.properties.BorderProperty">
119
               <at name="name">border</at>
120
              </super>
121
              <at name="borders">
122
               <object classname="java.util.LinkedList">
123
                <item >
124
                 <at name="value">
125
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
126
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
127
                    <at name="name">border</at>
128
                   </super>
129
                  </object>
130
                 </at>
131
                </item>
132
               </object>
133
              </at>
134
             </object>
135
            </at>
136
            <at name="scrollableTracksViewportHeight">true</at>
137
            <at name="scrollableTracksViewportWidth">true</at>
138
            <at name="name">lstCharset</at>
139
            <at name="width">618</at>
140
            <at name="items">
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff