/ - Diff - Application: gvSIG desktop - gvSIG

                 case DataTypes.STRING:
                 case DataTypes.TIME:
                 case DataTypes.TIMESTAMP:
                 case DataTypes.URI:
                 case DataTypes.URL:
                 case DataTypes.FILE:
                     break;
                 default:

     package org.gvsig.fmap.dal.store.csv;
     import java.io.File;
     import java.io.FileInputStream;
     import java.io.FileNotFoundException;
     import java.io.FileReader;
     import java.io.FileWriter;
     import java.io.IOException;
     import java.io.InputStreamReader;
     import java.net.URL;
     import java.text.SimpleDateFormat;
     import java.nio.charset.Charset;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.Iterator;
-...
                     logger.warn("Can't set geometry type for the calculated field in CSV file '" + getFullFileName() + "'.", e);
+                }
+            }
             String geometry_column = CSVStoreParameters.getGeometryColumn(this.getParameters());
             if( !StringUtils.isEmpty(geometry_column) ) {
                 EditableFeatureAttributeDescriptor attr = (EditableFeatureAttributeDescriptor) fType.get(geometry_column);
                 if( attr!=null && attr.getType()!=DataTypes.GEOMETRY ) {
                     attr.setDataType(DataTypes.GEOMETRY);
                     GeometryManager geommgr = GeometryLocator.getGeometryManager();
                     GeometryType gt;
                     try {
                         gt = geommgr.getGeometryType(Geometry.TYPES.GEOMETRY, Geometry.SUBTYPES.UNKNOWN);
                         attr.setGeometryType(gt);
                     } catch (Exception e) {
                         logger.warn("Can't set geometry type for the calculated field in CSV file '" + getFullFileName() + "'.", e);
+                    }
                     fType.setDefaultGeometryAttributeName(geometry_column);
+                }
+            }
             return fType;
+        }
-...
+        }
         private SimpleReader getSimpleReader(FileReader in) {
         private SimpleReader getSimpleReader(InputStreamReader in) {
             SimpleReader reader;
             if (CSVStoreParameters.getRawFieldsDefinition(getCSVParameters()) != null) {
                 reader = new FixedLenReader(in, getCSVParameters());
-...
             return headers;
+        }
         private InputStreamReader openFile(File f, String charsetName) throws FileNotFoundException {
             Charset charset = Charset.defaultCharset();
             FileInputStream fis = new FileInputStream(f);
             if( !StringUtils.isEmpty(charsetName) ) {
                 if( Charset.isSupported(charsetName) )  {
                     try {
                         charset = Charset.forName(charsetName);
                     } catch(Throwable th) {
                         logger.warn("Can't use charset '"+charsetName+"' for read csv '"+this.getFullFileName()+"'.", th);
+                    }
                 } else {
                     logger.warn("charset '"+charsetName+"' not supported for read csv '"+this.getFullFileName()+"'.");
+                }
+            }
             InputStreamReader isr = new InputStreamReader(fis, charset);
             return isr;
+        }
         private void loadFeatures() {
             FileReader in = null;
             InputStreamReader in = null;
             SimpleReader reader = null;
             try {
                 String headers[] = null;
-...
                 boolean ignore_errors = CSVStoreParameters.getIgnoreErrors(getCSVParameters());
                 in = new FileReader(this.getCSVParameters().getFile());
                 in = openFile(
                     this.getCSVParameters().getFile(),
                     CSVStoreParameters.getCharset(this.getCSVParameters())
                 );
                 reader = getSimpleReader(in);

         private static final String LOCALE = "locale";
         private static final String POINT_COLUMN_NAME = "pointColumnName";
         private static final String LIMIT = "limit";
         private static final String GEOEMTRY_COLUMN = "geometry_column";
         private DelegatedDynObject parameters;
-...
             return StringEscapeUtils.unescapeJava(s);
+        }
         public static String getGeometryColumn(DynObject dynobj) {
             String s = (String) dynobj.getDynValue(GEOEMTRY_COLUMN);
             return s;
+        }
         static Locale getLocale(DynObject dynobj) {
             try {
                 String s = (String) dynobj.getDynValue(LOCALE);

     package org.gvsig.fmap.dal.store.csv.simplereaders;
     import java.io.FileReader;
     import java.io.IOException;
     import java.io.InputStreamReader;
     import java.util.List;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.fmap.dal.store.csv.CSVStoreParameters;
-...
         private List<String>  nextLine;
         private int columns;
         public CSVReader(FileReader in, CSVStoreParameters parameters) {
         public CSVReader(InputStreamReader in, CSVStoreParameters parameters) {
             this(parameters);
             this.reader = new CsvListReader(in, getCSVPreferences());
+        }

     package org.gvsig.fmap.dal.store.csv.simplereaders;
     import java.io.BufferedReader;
     import java.io.FileReader;
     import java.io.IOException;
     import java.io.InputStreamReader;
     import java.util.ArrayList;
     import java.util.List;
     import org.apache.commons.lang3.StringUtils;
-...
         private final String commentStartMarker;
         private int currentLine =1;
         public FixedLenReader(FileReader reader, CSVStoreParameters parameters) {
         public FixedLenReader(InputStreamReader reader, CSVStoreParameters parameters) {
     //        this.parameters = parameters;
             this.reader = new BufferedReader(reader);
             this.fieldsDefinition = CSVStoreParameters.getFieldsDefinition(parameters);

Application: gvSIG desktop

Revision 43283