[Fudaa-svn-commit] SF.net SVN: fudaa:[8567] trunk/framework

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

Revision: 8567
          http://sourceforge.net/p/fudaa/svn/8567
Author:   deniger
Date:     2014-01-10 23:00:49 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
CRUE-619

Modified Paths:
--------------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java
    trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
    trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java	2014-01-10 23:00:37 UTC (rev 8566)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java	2014-01-10 23:00:49 UTC (rev 8567)
@@ -20,6 +20,7 @@
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.fudaa.ctulu.CtuluDoubleParser;
 import org.fudaa.ctulu.CtuluLibFile;
 
 import org.fudaa.ctulu.CtuluLibString;
@@ -68,6 +69,7 @@
       Sheet currentSheet = wb.createSheet(CtuluResource.CTULU.getString("Feuille {0}", CtuluLibString
               .getString(sheet + 1)));
       Row row = currentSheet.createRow(0);
+      CtuluDoubleParser doubleParser = new CtuluDoubleParser();
       for (int i = 0; i < table_.getMaxCol(); i++) {
         row.createCell(i).setCellValue(table_.getColumnName(i));
       }
@@ -78,7 +80,9 @@
           Object value = table_.getValue(rowIdx, i);
           if (value != null) {
             Class dataClass = value.getClass();
-            if (Number.class.isAssignableFrom(dataClass)) {
+            if (String.class.equals(dataClass) && doubleParser.isValid((String) value)) {
+              createCell.setCellValue(doubleParser.parse((String) value));
+            } else if (Number.class.isAssignableFrom(dataClass)) {
               createCell.setCellValue(((Number) value).doubleValue());
             } else if (Date.class.equals(dataClass)) {
               createCell.setCellValue(((Date) value));

Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java	2014-01-10 23:00:37 UTC (rev 8566)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java	2014-01-10 23:00:49 UTC (rev 8567)
@@ -41,7 +41,7 @@
 
   public CtuluFileChooserCsvExcel(Component parentComponent) {
     this.parentComponent = parentComponent;
-    ftCsv_ = new BuFileFilter(new String[]{"txt", "csv"}, CtuluResource.CTULU.getString("Texte CSV"));
+    ftCsv_ = new BuFileFilter(new String[]{"csv", "txt"}, CtuluResource.CTULU.getString("Texte CSV"));
     ftCsv_.setExtensionListInDescription(true);
     ftXsl_ = new BuFileFilter(new String[]{"xls"}, CtuluResource.CTULU.getString("Fichier Excel 97-2003"));
     ftXsl_.setExtensionListInDescription(true);
@@ -56,7 +56,7 @@
     setApproveButtonToolTipText(CtuluLib.getS("L'extension du fichier sera automatiquement compl\xE9t\xE9e"));
     CtuluFileChooserTestWritable tester = new CtuluFileChooserTestWritable(parentComponent);
     tester.setAppendExtension(true, null);
-    setFileFilter(ftCsv_);
+    setFileFilter(ftXslx_);
     setTester(tester);
   }
 
@@ -84,10 +84,10 @@
   }
 
   private File completeExtension(File f) {
-    final javax.swing.filechooser.FileFilter filter = getFileFilter();
+    final BuFileFilter filter = (BuFileFilter) getFileFilter();
     final String name = f.getName();
     if (name.indexOf('.') < 0) {
-      return new File(f.getAbsolutePath() + (filter == ftXsl_ ? ".xls" : ".txt"));
+      return new File(f.getAbsolutePath() + "." + filter.getFirstExt());
     }
     return f;
   }

Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java	2014-01-10 23:00:37 UTC (rev 8566)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java	2014-01-10 23:00:49 UTC (rev 8567)
@@ -101,7 +101,6 @@
             w.write(task.getStateReceiver());
           }
         } catch (final Exception e) {
-          e.printStackTrace();
           ui_.error(dest_.getName(), e.getMessage(), false);
         }
 

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