Revision 42220

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/CSVStoreProvider.java
410 410
                    CSVReader reader = new CSVReader(getCSVParameters());
411 411
                    return reader.getCSVPreferences();
412 412
                }
413
                
413

  
414 414
            });
415 415
            this.taskStatus.terminate();
416 416
        } catch (Exception e) {
......
700 700
            );
701 701
            fad.setSize(fieldTypes[i].size);
702 702
            fad.setAllowNull(fieldTypes[i].allowNulls);
703
            if ( fieldTypes[i].type == DataTypes.GEOMETRY ) {                
703
            if ( fieldTypes[i].type == DataTypes.GEOMETRY ) {
704 704
                if( fType.getDefaultGeometryAttributeName() == null ) {
705 705
                    fType.setDefaultGeometryAttributeName(fieldTypes[i].name);
706 706
                }
......
717 717
                gt = geommgr.getGeometryType(Geometry.TYPES.GEOMETRY, Geometry.SUBTYPES.GEOM3D);
718 718
                attr.setGeometryType(gt);
719 719
                attr.setGeometryType(Geometry.TYPES.POINT);
720
                attr.setGeometrySubType(Geometry.SUBTYPES.GEOM3D);                
720
                attr.setGeometrySubType(Geometry.SUBTYPES.GEOM3D);
721 721
            } catch (Exception e) {
722 722
                logger.warn("Can't set geometry type for the calculated field in CSV file '" + getFullFileName() + "'.", e);
723 723
            }
......
884 884
            FeatureStoreProviderServices store = this.getStoreServices();
885 885

  
886 886
            boolean ignore_errors = CSVStoreParameters.getIgnoreErrors(getCSVParameters());
887
            
887

  
888 888
            in = new FileReader(this.getCSVParameters().getFile());
889 889

  
890 890
            reader = getSimpleReader(in);
......
1157 1157
                types[i] = DataTypes.LONG;
1158 1158
                continue;
1159 1159
            }
1160
            if ( possibleDataTypes[i][T_DOUBLE] ) {
1161
                types[i] = DataTypes.DOUBLE;
1162
                continue;
1163
            }
1160 1164
            if ( possibleDataTypes[i][T_FLOAT] ) {
1161 1165
                types[i] = DataTypes.FLOAT;
1162 1166
                continue;
1163 1167
            }
1164
            if ( possibleDataTypes[i][T_DOUBLE] ) {
1165
                types[i] = DataTypes.DOUBLE;
1166
                continue;
1167
            }
1168 1168
            if ( possibleDataTypes[i][T_URL] ) {
1169 1169
                types[i] = DataTypes.URL;
1170 1170
                continue;

Also available in: Unified diff