[Fudaa-svn-commit] SF.net SVN: fudaa:[7755] trunk/soft/fudaa-crue/crue-server/src/main/java/ org/fudaa/dodico/crue/io/neuf

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

Revision: 7755
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7755&view=rev
Author:   deniger
Date:     2012-10-17 20:14:30 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------
CRUE-321

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Reader.java
    trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Writer.java
    trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java

Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Reader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Reader.java	2012-10-16 22:07:07 UTC (rev 7754)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Reader.java	2012-10-17 20:14:30 UTC (rev 7755)
@@ -2,6 +2,9 @@
 
 import java.io.EOFException;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -14,6 +17,7 @@
 import java.util.logging.Logger;
 import org.fudaa.ctulu.CtuluActivity;
 import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.commun.DodicoLib;
 import org.fudaa.dodico.crue.common.BusinessMessages;
 import org.fudaa.dodico.crue.io.common.CrueData;
 import org.fudaa.dodico.crue.io.common.CrueIOResu;
@@ -158,7 +162,17 @@
     setResourceBundle(BusinessMessages.RESOURCE_BUNDLE);
     analyze_.setDesc("read.file");
     analyze_.setDescriptionArgs(_f.getAbsolutePath());
-    super.setFile(_f);
+
+    Reader r = null;
+    try {
+      r = new InputStreamReader(new FileInputStream(_f), getCrue9Charset());
+      processFile(_f);
+    } catch (final FileNotFoundException _e) {
+      analyze_.addSevereError(DodicoLib.getS("Fichier inconnu"));
+    }
+    if (r != null) {
+      setFile(r);
+    }
   }
 
   /**
@@ -195,10 +209,13 @@
       analyze_.setResource(_r.toString());
       analyze_.setDesc("read.file");
       analyze_.setDescriptionArgs(_r.toString());
-      SortedMap<String, Charset> availableCharsets = Charset.availableCharsets();
-      super.setFile(new InputStreamReader(_r.openStream(), Charset.forName("US-ASCII")));
+      super.setFile(new InputStreamReader(_r.openStream(), getCrue9Charset()));
     } catch (final IOException e) {
       Logger.getLogger(getClass().getName()).log(Level.SEVERE, "setFile " + _r, e);
     }
   }
+
+  public static Charset getCrue9Charset() {
+    return Charset.forName("Windows-1252");
+  }
 }

Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Writer.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Writer.java	2012-10-16 22:07:07 UTC (rev 7754)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/AbstractCrue9Writer.java	2012-10-17 20:14:30 UTC (rev 7755)
@@ -120,7 +120,7 @@
     analyze_.setDesc(_f.getName());
     analyze_.setDefaultResourceBundle(BusinessMessages.RESOURCE_BUNDLE);
     try {
-      out_ = new OutputStreamWriter(new FileOutputStream(_f), Charset.forName("US-ASCII"));
+      out_ = new OutputStreamWriter(new FileOutputStream(_f), AbstractCrue9Reader.getCrue9Charset());
     } catch (final IOException _e) {
       analyze_.manageException(_e);
     }

Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java	2012-10-16 22:07:07 UTC (rev 7754)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java	2012-10-17 20:14:30 UTC (rev 7755)
@@ -197,7 +197,7 @@
           final URL newReaderUrl = testAbs.isAbsolute() ? testAbs.toURL() : new URL(folder.toString() + file);
           try {
             final InputStream openStream = newReaderUrl.openStream();
-            final FortranReader newCurrent = new FortranReader(new InputStreamReader(openStream));
+            final FortranReader newCurrent = new FortranReader(new InputStreamReader(openStream, getCrue9Charset()));
             initReader(newCurrent);
             readers.add(newCurrent);
             final CompositeReader newParent = new CompositeReader(current);

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