You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/05/15 18:58:07 UTC
svn commit: r1103458 -
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Author: hboutemy
Date: Sun May 15 16:58:07 2011
New Revision: 1103458
URL: http://svn.apache.org/viewvc?rev=1103458&view=rev
Log:
code simplification
Modified:
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/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=1103458&r1=1103457&r2=1103458&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 Sun May 15 16:58:07 2011
@@ -86,7 +86,7 @@ public class DependenciesRenderer
/** Used to format decimal values in the "Dependency File Details" table */
protected static final DecimalFormat DEFAULT_DECIMAL_FORMAT = new DecimalFormat( "#,##0" );
- private static final Set<String> JAR_SUBTYPE = new HashSet<String>();
+ private static final Set<String> JAR_SUBTYPE;
/**
* An HTML script tag with the Javascript used by the dependencies report.
@@ -145,13 +145,15 @@ public class DependenciesRenderer
static
{
- JAR_SUBTYPE.add( "jar" );
- JAR_SUBTYPE.add( "war" );
- JAR_SUBTYPE.add( "ear" );
- JAR_SUBTYPE.add( "sar" );
- JAR_SUBTYPE.add( "rar" );
- JAR_SUBTYPE.add( "par" );
- JAR_SUBTYPE.add( "ejb" );
+ Set<String> jarSubtype = new HashSet<String>();
+ jarSubtype.add( "jar" );
+ jarSubtype.add( "war" );
+ jarSubtype.add( "ear" );
+ jarSubtype.add( "sar" );
+ jarSubtype.add( "rar" );
+ jarSubtype.add( "par" );
+ jarSubtype.add( "ejb" );
+ JAR_SUBTYPE = Collections.unmodifiableSet( jarSubtype );
try
{
@@ -1204,22 +1206,28 @@ public class DependenciesRenderer
sink.tableRow();
- if ( !Artifact.SCOPE_SYSTEM.equals( dependency.getScope() ) )
- {
- tableCell( dependency.getId() );
+ tableCell( dependency.getId() );
+ if ( Artifact.SCOPE_SYSTEM.equals( dependency.getScope() ) )
+ {
+ for ( @SuppressWarnings( "unused" ) String repoId : repoIdList )
+ {
+ tableCell( "-" );
+ }
+ }
+ else
+ {
for ( String repokey : repoIdList )
{
ArtifactRepository repo = repoMap.get( repokey );
String depUrl = repoUtils.getDependencyUrlFromRepository( dependency, repo );
- @SuppressWarnings( "cast" )
- Integer old = (Integer) totalByRepo.get( repokey );
+ Integer old = totalByRepo.get( repokey );
if ( old == null )
{
- totalByRepo.put( repokey, new Integer( 0 ) );
old = new Integer( 0 );
+ totalByRepo.put( repokey, old );
}
boolean dependencyExists = false;
@@ -1260,15 +1268,6 @@ public class DependenciesRenderer
}
}
}
- else
- {
- tableCell( dependency.getId() );
-
- for ( @SuppressWarnings( "unused" ) String repoId : repoIdList )
- {
- tableCell( "-" );
- }
- }
sink.tableRow_();
}