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

[vsiveton]

Author: vsiveton
Date: Fri Jul 11 06:46:24 2008
New Revision: 675951

URL: http://svn.apache.org/viewvc?rev=675951&view=rev
Log:
o be sure that artifact url is valid

Modified:
    
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ArtifactUtils.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/dependencies/ArtifactUtils.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ArtifactUtils.java?rev=675951&r1=675950&r2=675951&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ArtifactUtils.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ArtifactUtils.java
 Fri Jul 11 06:46:24 2008
@@ -60,7 +60,7 @@
             MavenProject pluginProject = 
mavenProjectBuilder.buildFromRepository( artifact, remoteRepositories,
                                                                                
   localRepository );
 
-            if ( URL_VALIDATOR.isValid( pluginProject.getUrl() ) )
+            if ( isArtifactUrlValid( pluginProject.getUrl() ) )
             {
                 return pluginProject.getUrl();
             }
@@ -88,4 +88,18 @@
 
         return "{" + artifactId + "," + link + "}";
     }
+
+    /**
+     * @param url not null
+     * @return <code>true</code> if the url is valid, <code>false</code> 
otherwise.
+     */
+    public static boolean isArtifactUrlValid( String url )
+    {
+        if ( StringUtils.isEmpty( url ) )
+        {
+            return false;
+        }
+
+        return URL_VALIDATOR.isValid( url );
+    }
 }

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=675951&r1=675950&r2=675951&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
 Fri Jul 11 06:46:24 2008
@@ -964,9 +964,16 @@
                     sink.bold();
                     sink.text( getReportString( 
"report.dependencies.column.url" ) + ": " );
                     sink.bold_();
-                    sink.link( artifactUrl );
-                    sink.text( artifactUrl );
-                    sink.link_();
+                    if ( ArtifactUtils.isArtifactUrlValid( artifactUrl ) )
+                    {
+                        sink.link( artifactUrl );
+                        sink.text( artifactUrl );
+                        sink.link_();
+                    }
+                    else
+                    {
+                        sink.text( artifactUrl );
+                    }
                     sink.paragraph_();
                 }