Index: maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java
diff -u maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java:1.2 maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java:1.3
--- maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java:1.2	Fri Nov  2 10:28:08 2007
+++ maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java	Fri Nov  2 15:02:59 2007
@@ -38,11 +38,15 @@
      * @see org.codelutin.i18n.plugin.extension.XmlParser#init()
      */
     public void init() {
-        this.events.add(new KeysModifier("=\\s*[\"\']", "[\"\']"));
         this.srcXml = srcSwixat;
         this.patternXml = patternSwixat;
         this.fileRules = rulesSwixat;
         this.outGetter = "swixat.getter";
+
+        // Événements
+        if(keysModifier) {
+            addParserEvent(new KeysModifier("=\\s*[\"\']", "[\"\']"));
+        }
     }
 
     /*

Index: maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java
diff -u maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java:1.2 maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java:1.3
--- maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java:1.2	Fri Nov  2 10:28:08 2007
+++ maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java	Fri Nov  2 15:02:59 2007
@@ -38,11 +38,15 @@
      * @see org.codelutin.i18n.plugin.extension.XmlParser#init()
      */
     public void init() {
-        this.events.add(new KeysModifier("{_(\"", "\")}"));
         this.srcXml = srcJaax;
         this.patternXml = patternJaax;
         this.fileRules = rulesJaax;
         this.outGetter = "jaxx.getter";
+
+        // Événements
+        if(keysModifier) {
+            addParserEvent(new KeysModifier("{_(\"", "\")}"));
+        }
     }
 
     /*

Index: maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserXml.java
diff -u maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserXml.java:1.2 maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserXml.java:1.3
--- maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserXml.java:1.2	Fri Nov  2 10:28:08 2007
+++ maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserXml.java	Fri Nov  2 15:02:59 2007
@@ -5,8 +5,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
 
 import javax.xml.xpath.XPath;
@@ -45,8 +43,6 @@
     protected XPath xpath;
     protected Properties result;
 
-    protected List<ParserEvent> events = new ArrayList<ParserEvent>();
-
     /**
      * Initialisation des paramètres du parser
      */

Index: maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserJava.java
diff -u maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserJava.java:1.2 maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserJava.java:1.3
--- maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserJava.java:1.2	Fri Nov  2 10:28:08 2007
+++ maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/extension/ParserJava.java	Fri Nov  2 15:02:59 2007
@@ -23,9 +23,9 @@
  * Created: Aug 16, 2004
  *
  * @author Cédric Pineau <pineau@codelutin.com>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  *
- * Last update : $Date: 2007-11-02 10:28:08 $
+ * Last update : $Date: 2007-11-02 15:02:59 $
  * by : $Author: ruchaud $
  */
 
@@ -37,8 +37,6 @@
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
 
 import org.apache.maven.plugin.MojoExecutionException;
@@ -48,6 +46,7 @@
 import org.codelutin.i18n.plugin.core.Parser;
 import org.codelutin.i18n.plugin.core.ParserEvent;
 import org.codelutin.i18n.plugin.core.ParserException;
+import org.codelutin.i18n.plugin.ui.KeysModifier;
 import org.codelutin.processor.filters.I18nFilter;
 
 /**
@@ -75,8 +74,6 @@
     protected I18nFilter filter;
     protected Properties result;
     
-    protected List<ParserEvent> events = new ArrayList<ParserEvent>();
-
     /*
      * (non-Javadoc)
      * @see org.apache.maven.plugin.AbstractMojo#execute()
@@ -84,8 +81,14 @@
     public void execute() throws MojoExecutionException, MojoFailureException {
         this.result = new Properties();
         this.filter = new I18nFilter();
-        out.mkdirs();
         
+        // Événements
+        if(keysModifier) {
+            addParserEvent(new KeysModifier("_\\(\\s*\"", "\"\\s*(\\)|,|\\+|$)"));
+        }
+
+        out.mkdirs();
+
         try {
             parse();
         } catch (ParserException e) {
@@ -128,7 +131,7 @@
      */
     public void parseFile(File srcFile) {
         try {
-            LineNumberReader lnr = new LineNumberReader(new InputStreamReader(new FileInputStream(srcFile), "UTF-8"));
+            LineNumberReader lnr = new LineNumberReader(new InputStreamReader(new FileInputStream(srcFile)));
             while (lnr.ready()) {
                 String line = lnr.readLine();
                 parseLine(srcFile, line);