Author: sletellier Date: 2012-05-22 15:33:36 +0200 (Tue, 22 May 2012) New Revision: 69 Url: http://forge.codelutin.com/repositories/revision/jmexico/69 Log: fixes #1241 : Force using UTF-8 encoding Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-05-02 09:29:30 UTC (rev 68) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-05-22 13:33:36 UTC (rev 69) @@ -41,6 +41,7 @@ import fr.reseaumexico.model.MexicoTechnicalException; import fr.reseaumexico.model.MexicoXmlConstant; import fr.reseaumexico.model.ValueType; +import java.io.UnsupportedEncodingException; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -61,7 +62,7 @@ protected Map<String, Factor> factors; - public ExperimentDesignParser(File file) throws FileNotFoundException { + public ExperimentDesignParser(File file) throws FileNotFoundException, UnsupportedEncodingException { super(file); factors = Maps.newLinkedHashMap(); } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2012-05-02 09:29:30 UTC (rev 68) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2012-05-22 13:33:36 UTC (rev 69) @@ -34,6 +34,7 @@ import fr.reseaumexico.model.Scenario; import fr.reseaumexico.model.ScenarioImpl; import fr.reseaumexico.model.ValueType; +import java.io.UnsupportedEncodingException; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -62,7 +63,7 @@ protected ExperimentDesignParser experimentDesignParser; - public InputDesignParser(File file) throws FileNotFoundException { + public InputDesignParser(File file) throws FileNotFoundException, UnsupportedEncodingException { super(file); experimentDesignParser = new ExperimentDesignParser(file); } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java 2012-05-02 09:29:30 UTC (rev 68) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java 2012-05-22 13:33:36 UTC (rev 69) @@ -30,6 +30,7 @@ import java.io.File; import java.io.FileNotFoundException; +import java.io.UnsupportedEncodingException; import java.text.ParseException; import java.util.Date; @@ -41,7 +42,7 @@ */ public abstract class MexicoXmlParser<M> extends XmlParser<M> { - public MexicoXmlParser(File file) throws FileNotFoundException { + public MexicoXmlParser(File file) throws FileNotFoundException, UnsupportedEncodingException { super(file); } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java 2012-05-02 09:29:30 UTC (rev 68) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java 2012-05-22 13:33:36 UTC (rev 69) @@ -24,15 +24,16 @@ */ package fr.reseaumexico.model.parser; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlPullParserFactory; - 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.UnsupportedEncodingException; import java.text.ParseException; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlPullParserFactory; /** * Abstract parser to get model from xml file using XPP3 @@ -41,10 +42,10 @@ * @see XmlPullParser * @since 0.1 */ -public abstract class XmlParser<M> extends FileReader { +public abstract class XmlParser<M> extends InputStreamReader { - public XmlParser(File file) throws FileNotFoundException { - super(file); + public XmlParser(File file) throws FileNotFoundException, UnsupportedEncodingException { + super(new FileInputStream(file), "UTF-8"); } public M getModel() throws XmlPullParserException, IOException, ParseException { Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java 2012-05-02 09:29:30 UTC (rev 68) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java 2012-05-22 13:33:36 UTC (rev 69) @@ -25,8 +25,9 @@ package fr.reseaumexico.model.writer; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; /** * Abstract writer to create xml files using {@link XmlNode} @@ -34,14 +35,14 @@ * @author sletellier <letellier@codelutin.com> * @since 0.1 */ -public abstract class XmlWriter<M> extends FileWriter { +public abstract class XmlWriter<M> extends OutputStreamWriter { public static final int INDENT = 2; protected M model; public XmlWriter(File file, M model) throws IOException { - super(file); + super(new FileOutputStream(file), "UTF-8"); this.model = model; }