Revision 42775 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/CSVStoreParameters.java

View differences:

CSVStoreParameters.java
35 35
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemStoreParameters;
36 36
import org.gvsig.fmap.dal.spi.AbstractDataParameters;
37 37
import org.gvsig.fmap.dal.spi.DataStoreProviderServices;
38
import org.gvsig.fmap.geom.DataTypes;
39
import org.gvsig.tools.ToolsLocator;
40
import org.gvsig.tools.dataTypes.DataTypesManager;
41 38
import org.gvsig.tools.dynobject.DelegatedDynObject;
42 39
import org.gvsig.tools.dynobject.DynObject;
43 40
import org.slf4j.Logger;
......
64 61
    private static final String COMMENTSTARTMARKER = "commentStartMarker";
65 62
    private static final String AUTOMATICTYPESDETECTION = "automaticTypesDetection";
66 63

  
67
    //private static final String ESCAPECHARACTER = "escapeCharacter";
64
    private static final String ESCAPECHARACTER = "escapeCharacter";
65
    private static final String FIRST_LINE_HEADER = "firstLineHeader";
68 66
    private static final String HEADER = "header";
69 67
    private static final String SURROUNDINGSPACESNEEDQUOTES = "surroundingSpacesNeedQuotes";
70 68

  
......
74 72
//    private static final String NULLTO = "nullTo";
75 73
    private static final String CHARSET = "charset"; // Default "UTF-8"
76 74
    private static final String LOCALE = "locale";
75
    private static final String POINT_COLUMN_NAME = "pointColumnName";
76
    private static final String LIMIT = "limit";
77 77

  
78 78
    private DelegatedDynObject parameters;
79 79

  
......
206 206
        String s = (String) dynobj.getDynValue(COMMENTSTARTMARKER);
207 207
        return StringEscapeUtils.unescapeJava(s);
208 208
    }
209
    
210
    public static String getPointColumnName(DynObject dynobj) {
211
        String s = (String) dynobj.getDynValue(POINT_COLUMN_NAME);
212
        return s;
213
    }
209 214

  
210 215
    public static String getQuoteCharacter(DynObject dynobj) {
211 216
        String s = (String) dynobj.getDynValue(QUOTECHAR);
......
298 303
        return BooleanUtils.isTrue(b);
299 304
    }
300 305

  
306
    static boolean isFirstLineHeader(DynObject dynobj) {
307
        Boolean b = (Boolean) dynobj.getDynValue(FIRST_LINE_HEADER);
308
        return BooleanUtils.isTrue(b);
309
    }
310

  
301 311
//    static int[] getFieldTypes(DynObject dynobj) {
302 312
//        String s = (String) dynobj.getDynValue(FIELDTYPES);
303 313
//        if ( StringUtils.isBlank(s) ) {
......
367 377
        if ( n == null ) {
368 378
            return 0;
369 379
        }
370
        return new Integer(n);
380
        return n;
371 381
    }
372 382

  
383
    static int getLimit(DynObject dynobj) {
384
        Integer n = (Integer) dynobj.getDynValue(LIMIT);
385
        if ( n == null ) {
386
            return -1;
387
        }
388
        return n;
389
    }
390

  
373 391
    static String getRawFieldsDefinition(DynObject dynobj) {
374 392
        String s = (String) dynobj.getDynValue("fieldsDefinition");
375 393
        if ( StringUtils.isBlank(s) ) {
......
386 404
        public FieldDefinition(String def) {
387 405
            def = def.trim();
388 406
            String[] ss = def.split(":");
389
            this.start = Integer.parseInt(ss[0])-1;
407
            this.start = Integer.parseInt(ss[0]);
390 408
            if ( ss.length < 2 ) {
391 409
                this.end = -1;
392 410
            } else {
393
                this.end = Integer.parseInt(ss[1])-1;
411
                this.end = Integer.parseInt(ss[1]);
394 412
            }
395 413
        }
396 414

  

Also available in: Unified diff