svn commit: r676751 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo: LicenseReport.java ProjectInfoReportUtils.java dependencies/renderer/DependenciesRenderer.java

[vs...@apache.org]

Author: vsiveton
Date: Mon Jul 14 14:57:29 2008
New Revision: 676751

URL: http://svn.apache.org/viewvc?rev=676751&view=rev
Log:
o improvement on the encoding use

Modified:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=676751&r1=676750&r2=676751&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java Mon Jul 14 14:57:29 2008
@@ -231,7 +231,7 @@
                         try
                         {
                             // All licenses are supposed in English...
-                            licenseContent = ProjectInfoReportUtils.getInputStream( licenseUrl, settings, "ISO-8859-1" );
+                            licenseContent = ProjectInfoReportUtils.getInputStream( licenseUrl, settings );
                         }
                         catch ( IOException e )
                         {

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java?rev=676751&r1=676750&r2=676751&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java Mon Jul 14 14:57:29 2008
@@ -41,11 +41,27 @@
 public class ProjectInfoReportUtils
 {
     /**
-     * Get the input stream from an URL
+     * Get the input stream using ISO-8859-1 as charset from an URL.
      *
      * @param url not null
      * @param settings not null to handle proxy settings
-     * @return the inputstream found
+     * @return the ISO-8859-1 inputstream found.
+     * @throws IOException if any
+     * @see #getInputStream(URL, Settings, String)
+     */
+    public static String getInputStream( URL url, Settings settings )
+        throws IOException
+    {
+        return getInputStream( url, settings, "ISO-8859-1" );
+    }
+
+    /**
+     * Get the input stream from an URL.
+     *
+     * @param url not null
+     * @param settings not null to handle proxy settings
+     * @param encoding the wanted encoding for the inputstream. If null, encoding will be "ISO-8859-1".
+     * @return the inputstream found depending the wanted encoding.
      * @throws IOException if any
      */
     public static String getInputStream( URL url, Settings settings, String encoding )
@@ -104,6 +120,10 @@
         {
             in = url.openStream();
 
+            if ( encoding == null )
+            {
+                return IOUtil.toString( in, "ISO-8859-1" );
+            }
             return IOUtil.toString( in, encoding );
         }
         finally

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=676751&r1=676750&r2=676751&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java Mon Jul 14 14:57:29 2008
@@ -604,7 +604,7 @@
                     try
                     {
                         URL repoUrl = new URL( repo.getUrl() );
-                        if ( ProjectInfoReportUtils.getInputStream( repoUrl, settings, "ISO-8859-1" ) == null )
+                        if ( ProjectInfoReportUtils.getInputStream( repoUrl, settings ) == null )
                         {
                             log.warn( "The repository url '" + repoUrl + "' has no stream - Repository '"
                                 + repo.getId() + "' will be blacklisted." );