[Fudaa-svn-commit] SF.net SVN: fudaa:[8300] trunk/business/fudaa-sig/src/main/java/org/fudaa/ fudaa/sig/wizard

[<de...@us...>]

Revision: 8300
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8300&view=rev
Author:   deniger
Date:     2013-02-23 00:10:08 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderCsv.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileMng.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderCsv.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderCsv.java	2013-02-22 23:35:17 UTC (rev 8299)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderCsv.java	2013-02-23 00:10:08 UTC (rev 8300)
@@ -11,50 +11,54 @@
  */
 package org.fudaa.fudaa.sig.wizard;
 
-
+import com.memoire.bu.BuFileFilter;
 import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-
 import org.fudaa.ctulu.CtuluAnalyze;
 import org.fudaa.ctulu.CtuluDoubleParser;
 import org.fudaa.ctulu.CtuluIOOperationSynthese;
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.ProgressionInterface;
 import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
 import org.fudaa.ctulu.gis.GISAttributeInterface;
 import org.fudaa.ctulu.gis.GISDataModelAttributeAdapter;
 import org.fudaa.ctulu.gis.GISPoint;
+import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
 import org.fudaa.dodico.mesure.DodicoCsvReader;
 import org.fudaa.fudaa.commun.FudaaLib;
 import org.fudaa.fudaa.sig.FSigLib;
 
-import com.memoire.bu.BuFileFilter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
-
 /**
  * @author Fred Deniger
  * @version $Id: FSigFileLoaderCsv.java,v 1.2 2007-05-04 14:00:26 deniger Exp $
  */
 public class FSigFileLoaderCsv implements FSigFileLoaderI {
-
+  
   final BuFileFilter ft_;
-
+  private GISAttributeDouble firstColonne;
+  
   public final Map getOptions() {
     return options_;
   }
-
+  
   public final void setOptions(final Map _options) {
     options_ = _options;
   }
+  
+  void setFirstColonneAttribute(GISAttributeDouble csvFirstColonne) {
+    this.firstColonne = csvFirstColonne;
+  }
 
   /**
    * @author fred deniger
    * @version $Id: FSigFileLoaderCsv.java,v 1.2 2007-05-04 14:00:26 deniger Exp $
    */
   static final class CsvFileFilter extends BuFileFilter {
+
     /**
      * @param _filters
      * @param _description
@@ -62,12 +66,12 @@
     CsvFileFilter(String[] _filters, String _description) {
       super(_filters, _description);
     }
-
+    
     @Override
     public boolean accept(final File _f) {
       return _f != null;
     }
-
+    
     @Override
     public boolean accept(final File _d, final String _fn) {
       return !new File(_fn).isDirectory();
@@ -79,20 +83,24 @@
    * @version $Id: FSigFileLoaderCsv.java,v 1.2 2007-05-04 14:00:26 deniger Exp $
    */
   public static class XYCsvReader extends DodicoCsvReader {
-
+    
     public XYCsvReader() {
       setNumeric(false);
       setBlankValid(true);
       super.minValueByLine_ = 2;
     }
-
+    
     @Override
     public String[] getName() {
-      if (reader_ == null) { return null; }
+      if (reader_ == null) {
+        return null;
+      }
       String[] names = reader_.getName();
       if (names == null) {
         names = new String[reader_.getNbValues()];
-        if (names.length < 2) { return null; }
+        if (names.length < 2) {
+          return null;
+        }
         names[0] = "X";
         names[1] = "Y";
         for (int i = 2; i < names.length; i++) {
@@ -102,58 +110,58 @@
       }
       return reader_.getName();
     }
-
+    
     public String containsError() {
       final String[][] r = getPreview();
       if (r == null || r.length == 0 || r[0].length < 2) {
         return FSigLib.getS("Le fichier doit contenir 2 champs (X,Y) au minimum");
       }
-      if (colTypes_==null || colTypes_[0]==DodicoCsvReader.COL_TYPE_STRING || 
-                             colTypes_[1]==DodicoCsvReader.COL_TYPE_STRING ) {
+      if (colTypes_ == null || colTypes_[0] == DodicoCsvReader.COL_TYPE_STRING
+              || colTypes_[1] == DodicoCsvReader.COL_TYPE_STRING) {
         return FSigLib.getS("Les champs (X,Y) doivent \xEAtre de type num\xE9rique");
       }
       
       return null;
     }
-
+    
     @Override
     protected String[][] internalRead() {
       analyze_.clear();
       final String[][] r = (String[][]) super.internalRead();
-      String error=containsError();
-      if (error!=null) {
+      String error = containsError();
+      if (error != null) {
         analyze_.addFatalError(error);
         return null;
       }
       return r;
     }
-
   }
-
+  
   public FSigFileLoaderCsv() {
-    ft_ = new CsvFileFilter(new String[] { "txt", "csv", "*" }, FudaaLib.getS("Fichier csv"));
+    ft_ = new CsvFileFilter(new String[]{"txt", "csv", "*"}, FudaaLib.getS("Fichier csv"));
   }
-
   Map options_;
-
+  
   private FSigFileLoaderCsv(final BuFileFilter _ft) {
     ft_ = _ft;
   }
-
+  
   @Override
   public FSigFileLoaderI createNew() {
-    return new FSigFileLoaderCsv(ft_);
+    final FSigFileLoaderCsv fSigFileLoaderCsv = new FSigFileLoaderCsv(ft_);
+    fSigFileLoaderCsv.setFirstColonneAttribute(firstColonne);
+    return fSigFileLoaderCsv;
   }
-
+  
   @Override
   public BuFileFilter getFileFilter() {
     return ft_;
   }
-
+  
   @Override
   public void setInResult(final FSigFileLoadResult _r, final File _f, String _fileOrigine, final ProgressionInterface _prog,
-      final CtuluAnalyze _analyze) {
-    
+          final CtuluAnalyze _analyze) {
+
     // Lecture du fichier
     final XYCsvReader reader = new XYCsvReader();
     final CtuluDoubleParser parser = new CtuluDoubleParser();
@@ -165,30 +173,31 @@
       _analyze.merge(op.getAnalyze());
       return;
     }
-    
+
     // Suppression des lignes invalides (X ou Y non Double) et conversion des
     // String en Double pour les colonnes de ce type.
-    String[][] vals=(String[][]) op.getSource();
-    if (vals.length==0) return;
+    String[][] vals = (String[][]) op.getSource();
+    if (vals.length == 0) {
+      return;
+    }
     
-    ArrayList[] lvals=new ArrayList[vals.length];
-    for (int i=0; i<lvals.length; i++) {
-      lvals[i]=new ArrayList(Arrays.asList(vals[i]));
+    ArrayList[] lvals = new ArrayList[vals.length];
+    for (int i = 0; i < lvals.length; i++) {
+      lvals[i] = new ArrayList(Arrays.asList(vals[i]));
     }
     
-    int[] colTypes=reader.getColTypes();
-    for (int i=0; i<lvals.length; i++) {
+    int[] colTypes = reader.getColTypes();
+    for (int i = 0; i < lvals.length; i++) {
       if (colTypes[i] == DodicoCsvReader.COL_TYPE_STRING) {
         continue;
       }
-
-      for (int j=0; j < lvals[i].size(); ) {
+      
+      for (int j = 0; j < lvals[i].size();) {
         try {
-          lvals[i].set(j,Double.parseDouble((String)lvals[i].get(j)));
+          lvals[i].set(j, Double.parseDouble((String) lvals[i].get(j)));
           j++;
-        }
-        catch (NumberFormatException _exc) {
-          for (int k=0; k < lvals.length; k++) {
+        } catch (NumberFormatException _exc) {
+          for (int k = 0; k < lvals.length; k++) {
             lvals[k].remove(j);
           }
         }
@@ -196,44 +205,48 @@
     }
 
     // Cr\xE9ation des points
-    final GISPoint[] pt=new GISPoint[lvals[0].size()];
-    for (int i=0; i<pt.length; i++) {
-      pt[i]=new GISPoint((Double) lvals[0].get(i), (Double) lvals[1].get(i), 0);
+    final GISPoint[] pt = new GISPoint[lvals[0].size()];
+    for (int i = 0; i < pt.length; i++) {
+      pt[i] = new GISPoint((Double) lvals[0].get(i), (Double) lvals[1].get(i), 0);
     }
 
     // Cr\xE9ation des attributs
-    List<Object[]> attVals=new ArrayList<Object[]>();
-
-    final String[] name=reader.getName();
-    GISAttributeInterface[] att=new GISAttributeInterface[lvals.length - 2];
+    List<Object[]> attVals = new ArrayList<Object[]>();
+    
+    final String[] name = reader.getName();
+    GISAttributeInterface[] att = new GISAttributeInterface[lvals.length - 2];
     if (lvals.length > 2) { // On ne prend pas le x et le y
-      for (int i=0; i < att.length; i++) {
-        final int real=i + 2;
+      for (int i = 0; i < att.length; i++) {
+        final int real = i + 2;
+        if (i == 0 && firstColonne != null) {
+          att[i] = firstColonne;
+          attVals.add(lvals[real].toArray(new Double[0]));
+          continue;
+        }
         if (colTypes[real] == DodicoCsvReader.COL_TYPE_STRING) {
-          att[i]=_r.findOrCreateAttribute(name.length > real ? name[real]
-              : "S_" + (i + 1), String.class, true);
+          att[i] = _r.findOrCreateAttribute(name.length > real ? name[real]
+                  : "S_" + (i + 1), String.class, true);
           attVals.add(lvals[real].toArray(new String[0]));
-        }
-        else {
-          att[i]=_r.findOrCreateAttribute(name.length > real ? name[real]
-              : "V_" + (i + 1), Double.class, true);
+        } else {
+          att[i] = _r.findOrCreateAttribute(name.length > real ? name[real]
+                  : "V_" + (i + 1), Double.class, true);
           attVals.add(lvals[real].toArray(new Double[0]));
         }
       }
       _r.addUsedAttributes(att);
     }
-
-    GISZoneCollectionPoint zone=new GISZoneCollectionPoint();
+    
+    GISZoneCollectionPoint zone = new GISZoneCollectionPoint();
     zone.setAttributes(att, null);
     zone.addAll(pt, attVals, null);
 
     // Ajout de l'attribut ETAT_GEOM
     _r.findOrCreateAttribute(GISAttributeConstants.ETAT_GEOM.getID(), String.class, false);
-    GISDataModelAttributeAdapter adapter=new GISDataModelAttributeAdapter(zone);
+    GISDataModelAttributeAdapter adapter = new GISDataModelAttributeAdapter(zone);
     adapter.addAttribut(GISAttributeConstants.ETAT_GEOM, _fileOrigine);
-
-    _r.nbPoint_+=pt.length;
-    _r.nbPointTotal_+=pt.length;
+    
+    _r.nbPoint_ += pt.length;
+    _r.nbPointTotal_ += pt.length;
     _r.pointModel_.add(adapter);
   }
 }

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileMng.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileMng.java	2013-02-22 23:35:17 UTC (rev 8299)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileMng.java	2013-02-23 00:10:08 UTC (rev 8300)
@@ -7,6 +7,9 @@
  */
 package org.fudaa.fudaa.sig.wizard;
 
+import com.memoire.bu.BuComboBox;
+import com.memoire.bu.BuFileFilter;
+import com.memoire.fu.FuLog;
 import java.awt.Color;
 import java.awt.Frame;
 import java.io.File;
@@ -17,14 +20,12 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import javax.swing.DefaultCellEditor;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JFileChooser;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.TableCellEditor;
-
 import org.fudaa.ctulu.CtuluAnalyze;
 import org.fudaa.ctulu.ProgressionInterface;
 import org.fudaa.ctulu.gis.GISAttributeConstants;
@@ -37,14 +38,10 @@
 import org.fudaa.dodico.ef.io.trigrid.TrigridFileFormat;
 import org.fudaa.dodico.rubar.io.RubarDATFileFormat;
 import org.fudaa.dodico.rubar.io.RubarMAIFileFormat;
+import org.fudaa.fudaa.commun.FudaaPreferences;
 import org.fudaa.fudaa.sig.FSigLib;
 import org.geotools.data.FileDataStoreFactorySpi;
 
-import com.memoire.bu.BuComboBox;
-import com.memoire.bu.BuFileFilter;
-import com.memoire.fu.FuLog;
-import org.fudaa.fudaa.commun.FudaaPreferences;
-
 /**
  * @author Fred Deniger
  * @version $Id$
@@ -56,6 +53,7 @@
    * @version $Id$
    */
   static final class FilterComparator implements Comparator {
+
     @Override
     public int compare(Object _o1, Object _o2) {
       return ((BuFileFilter) _o1).getDescription().compareTo(((BuFileFilter) _o2).getDescription());
@@ -67,6 +65,7 @@
    * @version $Id$
    */
   static final class FmtRowRenderer extends CtuluCellTextRenderer {
+
     @Override
     protected void setValue(final Object _value) {
       setForeground(_value == null ? Color.RED : Color.BLACK);
@@ -79,6 +78,7 @@
   }
 
   static final class FmtRowOrigineRenderer extends CtuluCellTextRenderer {
+
     @Override
     protected void setValue(final Object _value) {
       setForeground(_value == null ? Color.RED : Color.BLACK);
@@ -86,27 +86,25 @@
         setText(FSigLib.getS("Non d\xE9fini"));
       } else {
         String val = FSigLib.getS("Inconnu");
-        if((String) _value == GISAttributeConstants.ATT_VAL_ETAT_ORIG)
+        if ((String) _value == GISAttributeConstants.ATT_VAL_ETAT_ORIG) {
           val = FSigLib.getS("Origine");
-        else if((String) _value == GISAttributeConstants.ATT_VAL_ETAT_MODI)
+        } else if ((String) _value == GISAttributeConstants.ATT_VAL_ETAT_MODI) {
           val = FSigLib.getS("Modifi\xE9");
+        }
         setText(val);
       }
     }
   }
-  
   FSigWizardFileModel model_;
-
   FSigFileLoadResult res_;
-
-  /** Le file chooser pour tous les fichiers. En variable globale pour conserver la derniere op\xE9ration */
+  /**
+   * Le file chooser pour tous les fichiers. En variable globale pour conserver la derniere op\xE9ration
+   */
   CtuluFileChooser fileChooser_;
 
-
   public FSigWizardFileMng() {
     model_ = buildFmt();
     model_.addTableModelListener(new TableModelListener() {
-
       @Override
       public void tableChanged(final TableModelEvent _e) {
         res_ = null;
@@ -192,40 +190,41 @@
 
   /**
    * Choisit un fichier a importer.
+   *
    * @param _f Le nom du fichier en cas de modification de selection. Peut \xEAtre null.
    * @param _frame Le frame parent.
    * @return Le filtre et les fichiers selectionn\xE9s (null si pas de fichiers selectionn\xE9s).
    */
   FSigWizardFileModel.FileSelectResult startEditingFile(final File _f, final Frame _frame) {
-    if (fileChooser_==null) {
+    if (fileChooser_ == null) {
       // Recup\xE9ration du dernier format de fichier sauvegard\xE9.
-      String fltImport=FudaaPreferences.FUDAA.getStringProperty("filter.import");
-      BuFileFilter lastFlt=null;
-      fileChooser_=new CtuluFileChooser(true);
-      for (int i=0; i<model_.filters_.length; i++) {
+      String fltImport = FudaaPreferences.FUDAA.getStringProperty("filter.import");
+      BuFileFilter lastFlt = null;
+      fileChooser_ = new CtuluFileChooser(true);
+      for (int i = 0; i < model_.filters_.length; i++) {
         fileChooser_.addChoosableFileFilter(model_.filters_[i]);
         if (model_.filters_[i].getShortDescription().equals(fltImport)) {
           fileChooser_.setFileFilter(model_.filters_[i]);
-          lastFlt=model_.filters_[i];
+          lastFlt = model_.filters_[i];
         }
       }
       fileChooser_.setDialogType(JFileChooser.OPEN_DIALOG);
-      fileChooser_.setFileFilter(lastFlt!=null ? lastFlt:fileChooser_.getAcceptAllFileFilter());
+      fileChooser_.setFileFilter(lastFlt != null ? lastFlt : fileChooser_.getAcceptAllFileFilter());
     }
     if (_f != null) {
       fileChooser_.setSelectedFile(_f);
     }
     fileChooser_.setMultiSelectionEnabled(_f == null ? true : false);
     final FSigWizardFileModel.FileSelectResult r = new FSigWizardFileModel.FileSelectResult();
-    if (fileChooser_.showOpenDialog(_frame)==JFileChooser.APPROVE_OPTION) {
+    if (fileChooser_.showOpenDialog(_frame) == JFileChooser.APPROVE_OPTION) {
       r.f_ = fileChooser_.getSelectedFiles();
-      String fltImport="";
+      String fltImport = "";
       if (r.f_ != null && (fileChooser_.getFileFilter() instanceof BuFileFilter)) {
         r.ft_ = (BuFileFilter) fileChooser_.getFileFilter();
-        fltImport=((BuFileFilter)fileChooser_.getFileFilter()).getShortDescription();
+        fltImport = ((BuFileFilter) fileChooser_.getFileFilter()).getShortDescription();
       }
       // Sauvegarde du format de fichier pour une prochaine ouverture.
-      FudaaPreferences.FUDAA.putStringProperty("filter.import",fltImport);
+      FudaaPreferences.FUDAA.putStringProperty("filter.import", fltImport);
       FudaaPreferences.FUDAA.writeIniFile();
     }
     return r;
@@ -246,7 +245,7 @@
   public final CtuluCellTextRenderer getFmtRowRenderer() {
     return new FmtRowRenderer();
   }
-  
+
   public final TableCellEditor getFmtRowOrigineEditor() {
     return GISAttributeConstants.ETAT_GEOM.getEditor().createTableEditorComponent();
   }
@@ -281,6 +280,9 @@
         }
         String fileOrigine = origines.get(file.getName());
         try {
+          if (model instanceof FSigFileLoaderCsv) {
+            ((FSigFileLoaderCsv) model).setFirstColonneAttribute(getModel().getCsvFirstColonne());
+          }
           model.setInResult(res_, file, fileOrigine, _prog, _analyze);
         } catch (final Exception _e) {
           _analyze.addError(_e.getMessage(), -1);
@@ -290,5 +292,4 @@
     }
     return res_;
   }
-
 }

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java	2013-02-22 23:35:17 UTC (rev 8299)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java	2013-02-23 00:10:08 UTC (rev 8300)
@@ -1,24 +1,23 @@
 package org.fudaa.fudaa.sig.wizard;
 
+import com.memoire.bu.BuFileFilter;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
-
+import javax.swing.JFileChooser;
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
 import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluFileChooser;
+import org.fudaa.ctulu.gui.CtuluLibSwing;
 import org.fudaa.ctulu.gui.CtuluListEditorModel;
 import org.fudaa.fudaa.commun.impl.FudaaImportCsvPanel;
 import org.fudaa.fudaa.sig.FSigLib;
 
-import com.memoire.bu.BuFileFilter;
-import javax.swing.JFileChooser;
-import org.fudaa.ctulu.gui.CtuluFileChooser;
-import org.fudaa.ctulu.gui.CtuluLibSwing;
-
 /**
  * Le modele gerant le fichier.
- * 
+ *
  * @author Fred Deniger
  * @version $Id: FSigWizardFileModel.java,v 1.2 2007-04-30 14:22:39 deniger Exp $
  */
@@ -29,29 +28,24 @@
    * @version $Id: FSigWizardFileModel.java,v 1.2 2007-04-30 14:22:39 deniger Exp $
    */
   protected final static class FileSelectResult {
+
     File[] f_;
-
     BuFileFilter ft_;
   }
-
   final Map fileData_;
-
   final Map fmtLoader_;
-
   final BuFileFilter[] filters_;
-
   final BuFileFilter csv_;
-  
   // Association entre le nom du fichier et son \xE9tat (d'origine ou non)
   private HashMap<String, String> origines_;
 
   /**
    * @return Une HashMap Associant le nom du fichier et son \xE9tat (d'origine ou non)
    */
-  public HashMap<String, String> getOrigines(){
+  public HashMap<String, String> getOrigines() {
     return origines_;
   }
-  
+
   protected FSigFileLoaderI createModel(final BuFileFilter _f) {
     if (_f == null) {
       return null;
@@ -92,7 +86,17 @@
       super.addElement(_o);
     }
   }
+  private GISAttributeDouble csvFirstColonne;
 
+  public void setCsvFirstColonne(GISAttributeDouble csvFirstColonne) {
+    this.csvFirstColonne = csvFirstColonne;
+  }
+
+  public GISAttributeDouble getCsvFirstColonne() {
+    return csvFirstColonne;
+  }
+
+
   public void addFiles(final FSigWizardFileModel.FileSelectResult _r, final int _i) {
     if (_r.f_ != null && _r.f_.length > 0) {
       if (_r.ft_ == null) {
@@ -109,9 +113,9 @@
         boolean modifyData = false;
         if (!fileData_.containsKey(_r.f_[i])) {
           modifyData = true;
-          if (_i >= 0)
+          if (_i >= 0) {
             super.add(_i, _r.f_[i]);
-          else {
+          } else {
             super.addElement(_r.f_[i]);
             super.getRowCount();
           }
@@ -121,6 +125,7 @@
         if (modifyData || !((FSigFileLoaderI) fileData_.get(_r.f_[i])).getFileFilter().equals(_r.ft_)) {
           if (isCsv) {
             final FSigFileLoaderCsv csv = (FSigFileLoaderCsv) createModel(csv_);
+            csv.setFirstColonneAttribute(csvFirstColonne);
             csv.setOptions(options);
             fileData_.put(_r.f_[i], csv);
           } else {
@@ -139,16 +144,16 @@
   @Override
   public String getColumnName(final int _column) {
     switch (_column) {
-    case 0:
-      return FSigLib.getS("N\xB0");
-    case 1:
-      return FSigLib.getS("Fichier");
-    case 2:
-      return FSigLib.getS("Format");
-    case 3:
-      return FSigLib.getS(GISAttributeConstants.ETAT_GEOM.getName());
-    default:
-      return CtuluLibString.EMPTY_STRING;
+      case 0:
+        return FSigLib.getS("N\xB0");
+      case 1:
+        return FSigLib.getS("Fichier");
+      case 2:
+        return FSigLib.getS("Format");
+      case 3:
+        return FSigLib.getS(GISAttributeConstants.ETAT_GEOM.getName());
+      default:
+        return CtuluLibString.EMPTY_STRING;
     }
   }
 
@@ -167,7 +172,6 @@
   public boolean isCellEditable(final int _rowIndex, final int _columnIndex) {
     return _columnIndex > 0;
   }
-
   CtuluFileChooser fileChooser;
 
   @Override
@@ -178,14 +182,16 @@
     fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
     fileChooser.setMultiSelectionEnabled(false);
     final int r = fileChooser.showOpenDialog(CtuluLibSwing.getActiveWindow());
-    if (r == JFileChooser.APPROVE_OPTION) { return fileChooser.getSelectedFile(); }
+    if (r == JFileChooser.APPROVE_OPTION) {
+      return fileChooser.getSelectedFile();
+    }
     return null;
   }
 
   @Override
   public void setValueAt(final Object _value, final int _rowIndex, final int _columnIndex) {
     if (_columnIndex == 3) {
-        origines_.put(((File) super.getValueAt(_rowIndex, 1)).getName(), (String)_value);
+      origines_.put(((File) super.getValueAt(_rowIndex, 1)).getName(), (String) _value);
     }
     if (_columnIndex == 2) {
       final FSigFileLoaderI loader = (FSigFileLoaderI) fileData_.get(getValueAt(_rowIndex));
@@ -224,21 +230,22 @@
   public static Map loadCsv(final File _f) {
     final FSigFileLoaderCsv.XYCsvReader reader = new FSigFileLoaderCsv.XYCsvReader();
     final FudaaImportCsvPanel pn = new FudaaImportCsvPanel(_f, false) {
-
       @Override
       public boolean isDataValid() {
         reader.initFromOption(buildOption());
         final String res = reader.containsError();
-        if (res!=null) {
+        if (res != null) {
           setErrorText(res);
         }
-        return res==null;
+        return res == null;
       }
     };
 
     reader.setNumeric(false);
     pn.setReader(reader);
-    if (CtuluDialogPanel.isOkResponse(pn.afficheModale(CtuluLibSwing.getActiveWindow()))) { return pn.buildOption(); }
+    if (CtuluDialogPanel.isOkResponse(pn.afficheModale(CtuluLibSwing.getActiveWindow()))) {
+      return pn.buildOption();
+    }
     return null;
   }
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.