Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java
diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.16 maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.17
--- maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.16	Sun Mar 23 06:05:18 2008
+++ maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java	Sun Mar 23 20:46:14 2008
@@ -20,7 +20,6 @@
 
 import org.codelutin.i18n.I18n;
 import static org.codelutin.i18n.I18n._;
-import org.codelutin.i18n.I18nLoader;
 import org.codelutin.i18n.bundle.I18nBundleManager;
 import org.codelutin.option.ConfigKey;
 import org.codelutin.option.ConfigPropertyKey;
@@ -90,7 +89,7 @@
 
         // set extra urls (will reset i18n manager)
         I18n.setExtraURL(urls);
-        
+
         for (String bundle : getBundles()) {
 
             String pattern = getContext().getRstFilePath();
@@ -98,7 +97,7 @@
 
             Writer w = null;
             try {
-                Locale locale = I18nLoader.newLocale(bundle);
+                Locale locale = I18n.newLocale(bundle);
 
                 File rstFilePath = new File(pattern.replace("@bundle@", locale.getLanguage()) + File.separator + filename);
                 if (!rstFilePath.getParentFile().exists()) {
@@ -118,7 +117,7 @@
     }
 
     private void generateForBundle(Writer w, File rstFilePath, String prefix, List<OptionKey> optionKeys, List<ConfigKey> configKeys, Locale locale) throws IOException {
-    
+
         // init i18n with this locale
         I18n.init(locale, getEncoding());
 

Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java
diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java:1.5 maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java:1.6
--- maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java:1.5	Sun Mar 23 01:27:19 2008
+++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java	Sun Mar 23 20:46:14 2008
@@ -1,5 +1,5 @@
 /**
- * # #% Copyright (C) 2008 Code Lutin, Tony Chemit 
+ * ##% Copyright (C) 2008 Code Lutin, Tony Chemit
  * This program is free software; you
  * can redistribute it and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation; either version 2
@@ -10,7 +10,7 @@
  * should have received a copy of the GNU General Public License along with this
  * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place
  * - Suite 330, Boston, MA 02111-1307, USA. 
- * # #%
+ * ##%
  */
 package org.codelutin.option.generate;
 
@@ -188,6 +188,8 @@
         return optionKeySimpleName;
     }
 
+    @SuppressWarnings({"unchecked"})
+    @Override
     public void init(JavaGeneratorGoal goal) throws IOException, ClassNotFoundException, IllegalAccessException, InstantiationException {
 
         super.init(goal);