svn commit: r746386 - in /maven/plugin-tools/trunk: maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/ maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/

[bentmann]

Author: bentmann
Date: Fri Feb 20 22:17:25 2009
New Revision: 746386

URL: http://svn.apache.org/viewvc?rev=746386&view=rev
Log:
o Adjusted encoding default value to follow our proposal

Modified:
    
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
    
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java
    
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java?rev=746386&r1=746385&r2=746386&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
 Fri Feb 20 22:17:25 2009
@@ -65,7 +65,7 @@
     /**
      * The file encoding of the source files.
      * 
-     * @parameter expression="${encoding}" default-value="ISO-8859-1"
+     * @parameter expression="${encoding}" 
default-value="${project.build.sourceEncoding}"
      * @since 2.5
      */
     protected String encoding;

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java?rev=746386&r1=746385&r2=746386&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java
 Fri Feb 20 22:17:25 2009
@@ -4,6 +4,7 @@
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Default implementation of {...@link PluginToolsRequest}, which is used to 
pass parameters to components used to extract
@@ -16,7 +17,7 @@
     implements PluginToolsRequest
 {
     
-    public static final String DEFAULT_ENCODING = ReaderFactory.FILE_ENCODING;
+    private static final String DEFAULT_ENCODING = ReaderFactory.FILE_ENCODING;
 
     private PluginDescriptor pluginDescriptor;
 
@@ -77,12 +78,15 @@
      */
     public PluginToolsRequest setEncoding( String encoding )
     {
-        if ( encoding == null )
+        if ( StringUtils.isNotEmpty( encoding ) )
         {
-            throw new IllegalArgumentException( "unspecified source file 
encoding" );
+            this.encoding = encoding;
         }
-        this.encoding = encoding;
-        
+        else
+        {
+            this.encoding = DEFAULT_ENCODING;
+        }
+
         return this;
     }
 

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java?rev=746386&r1=746385&r2=746386&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java
 Fri Feb 20 22:17:25 2009
@@ -43,7 +43,11 @@
     String getEncoding();
 
     /**
-     * @see PluginToolsRequest#getEncoding()
+     * Sets the file encoding of the source files.
+     * 
+     * @param encoding The file encoding of the source files, may be empty or 
<code>null</code> to use the platform's
+     *            default encoding.
+     * @return This request.
      */
     PluginToolsRequest setEncoding( String encoding );