You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/07/15 00:29:23 UTC
svn commit: r676754 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo:
DependencyManagementReport.java
dependencies/renderer/DependencyManagementRenderer.java
Author: vsiveton
Date: Mon Jul 14 15:29:22 2008
New Revision: 676754
URL: http://svn.apache.org/viewvc?rev=676754&view=rev
Log:
o minor code improvements
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java?rev=676754&r1=676753&r2=676754&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java Mon Jul 14 15:29:22 2008
@@ -89,15 +89,13 @@
/** {@inheritDoc} */
public void executeReport( Locale locale )
{
+ ManagementDependencies dependencies = new ManagementDependencies( project.getDependencyManagement()
+ .getDependencies() );
- ManagementDependencies dependencies =
- new ManagementDependencies( project.getDependencyManagement().getDependencies() );
-
- DependencyManagementRenderer r = new DependencyManagementRenderer( getSink(), locale, i18n, dependencies,
- artifactFactory, mavenProjectBuilder,
- remoteRepositories, localRepository );
-
- r.setLog( getLog() );
+ DependencyManagementRenderer r = new DependencyManagementRenderer( getSink(), locale, i18n, getLog(),
+ dependencies, artifactFactory,
+ mavenProjectBuilder, remoteRepositories,
+ localRepository );
r.render();
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.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/DependencyManagementRenderer.java?rev=676754&r1=676753&r2=676754&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java Mon Jul 14 15:29:22 2008
@@ -47,13 +47,13 @@
public class DependencyManagementRenderer
extends AbstractMavenReportRenderer
{
- private ManagementDependencies dependencies;
+ private final ManagementDependencies dependencies;
private final Locale locale;
- private I18N i18n;
+ private final I18N i18n;
- private Log log;
+ private final Log log;
private final ArtifactFactory artifactFactory;
@@ -69,30 +69,27 @@
* @param sink
* @param locale
* @param i18n
+ * @param log
* @param artifactFactory
* @param dependencies
* @param mavenProjectBuilder
* @param remoteRepositories
* @param localRepository
*/
- public DependencyManagementRenderer( Sink sink, Locale locale, I18N i18n, ManagementDependencies dependencies,
- ArtifactFactory artifactFactory, MavenProjectBuilder mavenProjectBuilder,
- List remoteRepositories, ArtifactRepository localRepository )
+ public DependencyManagementRenderer( Sink sink, Locale locale, I18N i18n, Log log,
+ ManagementDependencies dependencies, ArtifactFactory artifactFactory,
+ MavenProjectBuilder mavenProjectBuilder, List remoteRepositories,
+ ArtifactRepository localRepository )
{
super( sink );
this.locale = locale;
-
- this.dependencies = dependencies;
-
this.i18n = i18n;
-
+ this.log = log;
+ this.dependencies = dependencies;
this.artifactFactory = artifactFactory;
-
this.mavenProjectBuilder = mavenProjectBuilder;
-
this.remoteRepositories = remoteRepositories;
-
this.localRepository = localRepository;
}
@@ -100,11 +97,6 @@
// Public methods
// ----------------------------------------------------------------------
- public void setLog( Log log )
- {
- this.log = log;
- }
-
/** {@inheritDoc} */
public String getTitle()
{
@@ -132,6 +124,10 @@
renderSectionProjectDependencies();
}
+ // ----------------------------------------------------------------------
+ // Private methods
+ // ----------------------------------------------------------------------
+
private void renderSectionProjectDependencies()
{
startSection( getTitle() );
@@ -154,10 +150,6 @@
renderDependenciesForScope( Artifact.SCOPE_SYSTEM, (List) dependenciesByScope.get( Artifact.SCOPE_SYSTEM ) );
}
- // ----------------------------------------------------------------------
- // Private methods
- // ----------------------------------------------------------------------
-
private String[] getDependencyTableHeader( boolean hasClassifier )
{
String groupId = getReportString( "report.dependencyManagement.column.groupId" );
@@ -272,6 +264,7 @@
}
}
}
+
return result;
}
};