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 2010/07/30 00:41:34 UTC
svn commit: r980600 [1/2] - in
/maven/plugins/trunk/maven-project-info-reports-plugin: ./
src/main/java/org/apache/maven/report/projectinfo/
src/main/java/org/apache/maven/report/projectinfo/dependencies/
src/main/java/org/apache/maven/report/projectin...
Author: hboutemy
Date: Thu Jul 29 22:41:33 2010
New Revision: 980600
URL: http://svn.apache.org/viewvc?rev=980600&view=rev
Log:
[MPIR-200] updated requirements to Maven 2.2 and Java 5
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
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/LicenseReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.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/ScmReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyConvergenceStub.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject1Stub.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject2Stub.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Thu Jul 29 22:41:33 2010
@@ -77,8 +77,8 @@ under the License.
<properties>
<doxiaVersion>1.1.2</doxiaVersion>
<doxia-sitetoolsVersion>1.1.2</doxia-sitetoolsVersion>
- <mavenVersion>2.1.0</mavenVersion>
- <wagonVersion>1.0-beta-3</wagonVersion>
+ <mavenVersion>2.2.0</mavenVersion>
+ <wagonVersion>1.0-beta-6</wagonVersion>
<scmVersion>1.3</scmVersion>
<sitePluginVersion>2.1</sitePluginVersion>
</properties>
@@ -327,6 +327,21 @@ under the License.
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<reporting>
<plugins>
<plugin>
@@ -334,6 +349,7 @@ under the License.
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<requirements>
+ <jdk>1.5</jdk>
<others>
<property>
<name>Maven Site Plugin</name>
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java Thu Jul 29 22:41:33 2010
@@ -26,7 +26,6 @@ import org.apache.maven.model.Notifier;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -105,7 +104,7 @@ public class CimReport
String system = cim.getSystem();
String url = cim.getUrl();
- List notifiers = cim.getNotifiers();
+ List<Notifier> notifiers = cim.getNotifiers();
// Overview
startSection( getI18nString( "overview.title" ) );
@@ -180,10 +179,8 @@ public class CimReport
tableHeader( new String[]{type, address, configuration} );
- for ( Iterator i = notifiers.iterator(); i.hasNext(); )
+ for ( Notifier notifier : notifiers )
{
- Notifier notifier = (Notifier) i.next();
-
tableRow( new String[]{notifier.getType(),
createLinkPatternedText( notifier.getAddress(), notifier.getAddress() ),
propertiesToString( notifier.getConfiguration() )} );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java Thu Jul 29 22:41:33 2010
@@ -32,6 +32,7 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
@@ -152,7 +153,7 @@ public class DependenciesReport
* @required
* @readonly
*/
- private List remoteRepositories;
+ private List<ArtifactRepository> remoteRepositories;
/**
* Display file details for each dependency, such as: file size, number of
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java Thu Jul 29 22:41:33 2010
@@ -62,7 +62,7 @@ public class DependencyConvergenceReport
* @required
* @readonly
*/
- private List reactorProjects;
+ private List<MavenProject> reactorProjects;
// ----------------------------------------------------------------------
// Public methods
@@ -110,7 +110,7 @@ public class DependencyConvergenceReport
sink.text( getI18nString( locale, "title" ) );
sink.sectionTitle1_();
- Map dependencyMap = getDependencyMap();
+ Map<String, List<ReverseDependencyLink>> dependencyMap = getDependencyMap();
// legend
generateLegend( locale, sink );
@@ -135,13 +135,13 @@ public class DependencyConvergenceReport
// ----------------------------------------------------------------------
/**
- * Generate the convergenec table for all dependencies
+ * Generate the convergence table for all dependencies
*
* @param locale
* @param sink
* @param dependencyMap
*/
- private void generateConvergence( Locale locale, Sink sink, Map dependencyMap )
+ private void generateConvergence( Locale locale, Sink sink, Map<String, List<ReverseDependencyLink>> dependencyMap )
{
sink.section2();
@@ -149,11 +149,10 @@ public class DependencyConvergenceReport
sink.text( getI18nString( locale, "convergence.caption" ) );
sink.sectionTitle2_();
- Iterator it = dependencyMap.keySet().iterator();
- while ( it.hasNext() )
+ for ( Map.Entry<String, List<ReverseDependencyLink>> entry : dependencyMap.entrySet() )
{
- String key = (String) it.next();
- List depList = (List) dependencyMap.get( key );
+ String key = entry.getKey();
+ List<ReverseDependencyLink> depList = entry.getValue();
sink.section3();
sink.sectionTitle3();
@@ -174,11 +173,11 @@ public class DependencyConvergenceReport
* @param sink
* @param depList
*/
- private void generateDependencyDetails( Sink sink, List depList )
+ private void generateDependencyDetails( Sink sink, List<ReverseDependencyLink> depList )
{
sink.table();
- Map artifactMap = getSortedUniqueArtifactMap( depList );
+ Map<String, List<ReverseDependencyLink>> artifactMap = getSortedUniqueArtifactMap( depList );
sink.tableRow();
@@ -197,10 +196,8 @@ public class DependencyConvergenceReport
sink.table();
- Iterator it = artifactMap.keySet().iterator();
- while ( it.hasNext() )
+ for ( String version : artifactMap.keySet() )
{
- String version = (String) it.next();
sink.tableRow();
sink.tableCell( new SinkEventAttributeSet( new String[] {SinkEventAttributeSet.WIDTH, "25%"} ) );
sink.text( version );
@@ -220,15 +217,14 @@ public class DependencyConvergenceReport
sink.table_();
}
- private void generateVersionDetails( Sink sink, Map artifactMap, String version )
+ private void generateVersionDetails( Sink sink, Map<String, List<ReverseDependencyLink>> artifactMap, String version )
{
sink.numberedList( 1 ); // Use lower alpha numbering
- List depList = (List) artifactMap.get( version );
+ List<ReverseDependencyLink> depList = artifactMap.get( version );
Collections.sort( depList, new ReverseDependencyLinkComparator() );
- Iterator it = depList.iterator();
- while ( it.hasNext() )
+
+ for ( ReverseDependencyLink rdl : depList )
{
- ReverseDependencyLink rdl = (ReverseDependencyLink) it.next();
sink.numberedListItem();
if ( StringUtils.isNotEmpty( rdl.project.getUrl() ) )
{
@@ -263,19 +259,17 @@ public class DependencyConvergenceReport
*
* @return A Map of sorted unique artifacts
*/
- private Map getSortedUniqueArtifactMap( List depList )
+ private Map<String, List<ReverseDependencyLink>> getSortedUniqueArtifactMap( List<ReverseDependencyLink> depList )
{
- Map uniqueArtifactMap = new TreeMap();
+ Map<String, List<ReverseDependencyLink>> uniqueArtifactMap = new TreeMap<String, List<ReverseDependencyLink>>();
- Iterator it = depList.iterator();
- while ( it.hasNext() )
+ for ( ReverseDependencyLink rdl : depList )
{
- ReverseDependencyLink rdl = (ReverseDependencyLink) it.next();
String key = rdl.getDependency().getVersion();
- List projectList = (List) uniqueArtifactMap.get( key );
+ List<ReverseDependencyLink> projectList = uniqueArtifactMap.get( key );
if ( projectList == null )
{
- projectList = new ArrayList();
+ projectList = new ArrayList<ReverseDependencyLink>();
}
projectList.add( rdl );
uniqueArtifactMap.put( key, projectList );
@@ -331,17 +325,15 @@ public class DependencyConvergenceReport
* @param sink
* @param dependencyMap
*/
- private void generateStats( Locale locale, Sink sink, Map dependencyMap )
+ private void generateStats( Locale locale, Sink sink, Map<String, List<ReverseDependencyLink>> dependencyMap )
{
int depCount = dependencyMap.size();
int artifactCount = 0;
int snapshotCount = 0;
- Iterator it = dependencyMap.values().iterator();
- while ( it.hasNext() )
+ for ( List<ReverseDependencyLink> depList : dependencyMap.values() )
{
- List depList = (List) it.next();
- Map artifactMap = getSortedUniqueArtifactMap( depList );
+ Map<String, List<ReverseDependencyLink>> artifactMap = getSortedUniqueArtifactMap( depList );
snapshotCount += countSnapshots( artifactMap );
artifactCount += artifactMap.size();
}
@@ -449,22 +441,21 @@ public class DependencyConvergenceReport
sink.table_();
}
- private int countSnapshots( Map artifactMap )
+ private int countSnapshots( Map<String, List<ReverseDependencyLink>> artifactMap )
{
int count = 0;
- Iterator it = artifactMap.keySet().iterator();
- while ( it.hasNext() )
+ for ( Map.Entry<String, List<ReverseDependencyLink>> entry : artifactMap.entrySet() )
{
- String version = (String) it.next();
+ String version = entry.getKey();
boolean isReactorProject = false;
- Iterator iterator = ( (List) artifactMap.get( version ) ).iterator();
+ Iterator<ReverseDependencyLink> iterator = entry.getValue().iterator();
// It if enough to check just the first dependency here, because
// the dependency is the same in all the RDLs in the List. It's the
// reactorProjects that are different.
if ( iterator.hasNext() )
{
- ReverseDependencyLink rdl = (ReverseDependencyLink) iterator.next();
+ ReverseDependencyLink rdl = iterator.next();
if ( isReactorProject( rdl.getDependency() ) )
{
isReactorProject = true;
@@ -487,10 +478,8 @@ public class DependencyConvergenceReport
*/
private boolean isReactorProject( Dependency dependency )
{
- Iterator iterator = reactorProjects.iterator();
- while ( iterator.hasNext() )
+ for ( MavenProject mavenProject : reactorProjects )
{
- MavenProject mavenProject = (MavenProject) iterator.next();
if ( mavenProject.getGroupId().equals( dependency.getGroupId() )
&& mavenProject.getArtifactId().equals( dependency.getArtifactId() ) )
{
@@ -543,25 +532,21 @@ public class DependencyConvergenceReport
*
* @return A Map of relationships between dependencies and reactor projects
*/
- private Map getDependencyMap()
+ private Map<String, List<ReverseDependencyLink>> getDependencyMap()
{
- Iterator it = reactorProjects.iterator();
-
- Map dependencyMap = new TreeMap();
+ Map<String, List<ReverseDependencyLink>> dependencyMap = new TreeMap<String, List<ReverseDependencyLink>>();
- while ( it.hasNext() )
+ for ( MavenProject reactorProject : reactorProjects )
{
- MavenProject reactorProject = (MavenProject) it.next();
-
- Iterator itdep = reactorProject.getDependencies().iterator();
+ Iterator<Dependency> itdep = reactorProject.getDependencies().iterator();
while ( itdep.hasNext() )
{
Dependency dep = (Dependency) itdep.next();
String key = dep.getGroupId() + ":" + dep.getArtifactId();
- List depList = (List) dependencyMap.get( key );
+ List<ReverseDependencyLink> depList = dependencyMap.get( key );
if ( depList == null )
{
- depList = new ArrayList();
+ depList = new ArrayList<ReverseDependencyLink>();
}
depList.add( new ReverseDependencyLink( dep, reactorProject ) );
dependencyMap.put( key, depList );
@@ -607,19 +592,12 @@ public class DependencyConvergenceReport
* Internal ReverseDependencyLink comparator
*/
static class ReverseDependencyLinkComparator
- implements Comparator
+ implements Comparator<ReverseDependencyLink>
{
/** {@inheritDoc} */
- public int compare( Object o1, Object o2 )
+ public int compare( ReverseDependencyLink p1, ReverseDependencyLink p2 )
{
- if ( o1 instanceof ReverseDependencyLink && o2 instanceof ReverseDependencyLink )
- {
- ReverseDependencyLink p1 = (ReverseDependencyLink) o1;
- ReverseDependencyLink p2 = (ReverseDependencyLink) o2;
- return p1.getProject().getId().compareTo( p2.getProject().getId() );
- }
-
- return 0;
+ return p1.getProject().getId().compareTo( p2.getProject().getId() );
}
}
}
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=980600&r1=980599&r2=980600&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 Thu Jul 29 22:41:33 2010
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Locale;
import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.report.projectinfo.dependencies.ManagementDependencies;
import org.apache.maven.report.projectinfo.dependencies.renderer.DependencyManagementRenderer;
@@ -68,7 +69,7 @@ public class DependencyManagementReport
* @since 2.1
* @parameter expression="${project.remoteArtifactRepositories}"
*/
- private List remoteRepositories;
+ private List<ArtifactRepository> remoteRepositories;
/**
* Lazy instantiation for management dependencies.
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=980600&r1=980599&r2=980600&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 Thu Jul 29 22:41:33 2010
@@ -31,7 +31,6 @@ import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.regex.Matcher;
@@ -88,11 +87,8 @@ public class LicenseReport
return true;
}
- List licenses = project.getModel().getLicenses();
- for ( Iterator i = licenses.iterator(); i.hasNext(); )
+ for ( License license : project.getModel().getLicenses() )
{
- License license = (License) i.next();
-
String url = license.getUrl();
URL licenseUrl = null;
@@ -214,7 +210,7 @@ public class LicenseReport
/** {@inheritDoc} */
public void renderBody()
{
- List licenses = project.getModel().getLicenses();
+ List<License> licenses = project.getModel().getLicenses();
if ( licenses.isEmpty() )
{
@@ -237,10 +233,8 @@ public class LicenseReport
// License
startSection( getI18nString( "title" ) );
- for ( Iterator i = licenses.iterator(); i.hasNext(); )
+ for ( License license : licenses )
{
- License license = (License) i.next();
-
String name = license.getName();
String url = license.getUrl();
String comments = license.getComments();
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java Thu Jul 29 22:41:33 2010
@@ -42,8 +42,6 @@ import org.codehaus.plexus.util.StringUt
public class MailingListsReport
extends AbstractProjectInfoReport
{
-
-
/**
* This can override the header text of the mailing list(s) report
@@ -52,8 +50,8 @@ public class MailingListsReport
* @since 2.2
*/
protected String introduction;
-
-
+
+
// ----------------------------------------------------------------------
// Public methods
// ----------------------------------------------------------------------
@@ -110,7 +108,7 @@ public class MailingListsReport
/** {@inheritDoc} */
public void renderBody()
{
- List mailingLists = model.getMailingLists();
+ List<MailingList> mailingLists = model.getMailingLists();
if ( mailingLists == null || mailingLists.isEmpty() )
{
@@ -139,10 +137,8 @@ public class MailingListsReport
// To beautify the display with other archives
boolean otherArchives = false;
- for ( Iterator i = mailingLists.iterator(); i.hasNext(); )
+ for ( MailingList m : mailingLists )
{
- MailingList m = (MailingList) i.next();
-
if ( m.getOtherArchives() != null && !m.getOtherArchives().isEmpty() )
{
otherArchives = true;
@@ -165,11 +161,9 @@ public class MailingListsReport
tableHeader( new String[]{name, subscribe, unsubscribe, post, archive} );
}
- for ( Iterator i = model.getMailingLists().iterator(); i.hasNext(); )
+ for ( MailingList mailingList : model.getMailingLists() )
{
- MailingList mailingList = (MailingList) i.next();
-
- List textRow = new ArrayList();
+ List<String> textRow = new ArrayList<String>();
// Validate here subsribe/unsubsribe lists and archives?
textRow.add( mailingList.getName() );
@@ -200,7 +194,7 @@ public class MailingListsReport
if ( mailingList.getOtherArchives() != null && !mailingList.getOtherArchives().isEmpty() )
{
// For the first line
- Iterator it = mailingList.getOtherArchives().iterator();
+ Iterator<String> it = mailingList.getOtherArchives().iterator();
String otherArchive = it.next().toString();
textRow.add( createLinkPatternedText( getArchiveServer( otherArchive ), otherArchive ) );
@@ -210,10 +204,10 @@ public class MailingListsReport
// Other lines...
while ( it.hasNext() )
{
- otherArchive = (String) it.next();
+ otherArchive = it.next();
// Reinit the list to beautify the display
- textRow = new ArrayList();
+ textRow = new ArrayList<String>();
// Name
textRow.add( " " );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java Thu Jul 29 22:41:33 2010
@@ -22,7 +22,6 @@ package org.apache.maven.report.projecti
import java.io.File;
import java.io.IOException;
import java.io.Reader;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -100,7 +99,7 @@ public class ModulesReport
/** {@inheritDoc} */
public void renderBody()
{
- List modules = model.getModules();
+ List<String> modules = model.getModules();
startSection( getTitle() );
@@ -112,10 +111,8 @@ public class ModulesReport
String description = getI18nString( "header.description" );
tableHeader( new String[] {name, description} );
- for ( Iterator it = modules.iterator(); it.hasNext(); )
+ for ( String module : modules )
{
- String module = (String) it.next();
-
Model moduleModel;
File f = new File( project.getBasedir(), module + "/pom.xml" );
@@ -163,13 +160,12 @@ public class ModulesReport
private Model readModel ( File pom )
{
MavenXpp3Reader xpp3 = new MavenXpp3Reader();
- Model model = null;
Reader reader = null;
try
{
reader = ReaderFactory.newXmlReader( pom );
- model = xpp3.read( reader );
+ return xpp3.read( reader );
}
catch ( IOException io )
{
@@ -184,9 +180,6 @@ public class ModulesReport
finally
{
IOUtil.close( reader );
- reader = null;
}
-
- return model;
}
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java Thu Jul 29 22:41:33 2010
@@ -22,7 +22,6 @@ package org.apache.maven.report.projecti
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -113,7 +112,7 @@ public class PluginManagementReport
{
private final Log log;
- private final List pluginManagement;
+ private final List<Plugin> pluginManagement;
private final MavenProject project;
@@ -134,7 +133,7 @@ public class PluginManagementReport
* @param artifactFactory
* @param localRepository
*/
- public PluginManagementRenderer( Log log, Sink sink, Locale locale, I18N i18n, List plugins,
+ public PluginManagementRenderer( Log log, Sink sink, Locale locale, I18N i18n, List<Plugin> plugins,
MavenProject project, MavenProjectBuilder mavenProjectBuilder,
ArtifactFactory artifactFactory, ArtifactRepository localRepository )
{
@@ -177,9 +176,8 @@ public class PluginManagementReport
startTable();
tableHeader( tableHeader );
- for ( Iterator iterator = pluginManagement.iterator(); iterator.hasNext(); )
+ for ( Plugin plugin : pluginManagement )
{
- Plugin plugin = (Plugin) iterator.next();
VersionRange versionRange;
if ( StringUtils.isEmpty( plugin.getVersion() ) )
{
@@ -192,10 +190,10 @@ public class PluginManagementReport
Artifact pluginArtifact = artifactFactory.createParentArtifact( plugin.getGroupId(), plugin
.getArtifactId(), versionRange.toString() );
- List artifactRepositories = project.getPluginArtifactRepositories();
+ List<ArtifactRepository> artifactRepositories = project.getPluginArtifactRepositories();
if ( artifactRepositories == null )
{
- artifactRepositories = new ArrayList();
+ artifactRepositories = new ArrayList<ArtifactRepository>();
}
try
{
@@ -236,16 +234,13 @@ public class PluginManagementReport
return new String[] { groupId, artifactId, version };
}
- private Comparator getPluginComparator()
+ private Comparator<Plugin> getPluginComparator()
{
- return new Comparator()
+ return new Comparator<Plugin>()
{
/** {@inheritDoc} */
- public int compare( Object o1, Object o2 )
+ public int compare( Plugin a1, Plugin a2 )
{
- Plugin a1 = (Plugin) o1;
- Plugin a2 = (Plugin) o2;
-
int result = a1.getGroupId().compareTo( a2.getGroupId() );
if ( result == 0 )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java Thu Jul 29 22:41:33 2010
@@ -22,7 +22,6 @@ package org.apache.maven.report.projecti
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Set;
@@ -112,9 +111,9 @@ public class PluginsReport
{
private final Log log;
- private final List plugins;
+ private final List<Artifact> plugins;
- private final List reports;
+ private final List<Artifact> reports;
private final MavenProject project;
@@ -136,17 +135,17 @@ public class PluginsReport
* @param artifactFactory
* @param localRepository
*/
- public PluginsRenderer( Log log, Sink sink, Locale locale, I18N i18n, Set plugins, Set reports,
- MavenProject project, MavenProjectBuilder mavenProjectBuilder,
+ public PluginsRenderer( Log log, Sink sink, Locale locale, I18N i18n, Set<Artifact> plugins,
+ Set<Artifact> reports, MavenProject project, MavenProjectBuilder mavenProjectBuilder,
ArtifactFactory artifactFactory, ArtifactRepository localRepository )
{
super( sink, i18n, locale );
this.log = log;
- this.plugins = new ArrayList( plugins );
+ this.plugins = new ArrayList<Artifact>( plugins );
- this.reports = new ArrayList( reports );
+ this.reports = new ArrayList<Artifact>( reports );
this.project = project;
@@ -178,7 +177,7 @@ public class PluginsReport
*/
private void renderSectionPlugins( boolean isPlugins )
{
- List list = ( isPlugins ? plugins : reports );
+ List<Artifact> list = ( isPlugins ? plugins : reports );
String[] tableHeader = getPluginTableHeader();
startSection( ( isPlugins ? getI18nString( "title" )
@@ -200,10 +199,8 @@ public class PluginsReport
startTable();
tableHeader( tableHeader );
- for ( Iterator iterator = list.iterator(); iterator.hasNext(); )
+ for ( Artifact artifact : list )
{
- Artifact artifact = (Artifact) iterator.next();
-
VersionRange versionRange;
if ( StringUtils.isEmpty( artifact.getVersion() ) )
{
@@ -216,10 +213,10 @@ public class PluginsReport
Artifact pluginArtifact = artifactFactory.createParentArtifact( artifact.getGroupId(), artifact
.getArtifactId(), versionRange.toString() );
- List artifactRepositories = project.getPluginArtifactRepositories();
+ List<ArtifactRepository> artifactRepositories = project.getPluginArtifactRepositories();
if ( artifactRepositories == null )
{
- artifactRepositories = new ArrayList();
+ artifactRepositories = new ArrayList<ArtifactRepository>();
}
try
{
@@ -261,16 +258,13 @@ public class PluginsReport
return new String[] { groupId, artifactId, version };
}
- private Comparator getArtifactComparator()
+ private Comparator<Artifact> getArtifactComparator()
{
- return new Comparator()
+ return new Comparator<Artifact>()
{
/** {@inheritDoc} */
- public int compare( Object o1, Object o2 )
+ public int compare( Artifact a1, Artifact a2 )
{
- Artifact a1 = (Artifact) o1;
- Artifact a2 = (Artifact) o2;
-
int result = a1.getGroupId().compareTo( a2.getGroupId() );
if ( result == 0 )
{
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=980600&r1=980599&r2=980600&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 Thu Jul 29 22:41:33 2010
@@ -153,8 +153,8 @@ public class ProjectInfoReportUtils
* @return the artifact url or null if an error occurred.
*/
public static String getArtifactUrl( ArtifactFactory factory, Artifact artifact,
- MavenProjectBuilder mavenProjectBuilder, List remoteRepositories,
- ArtifactRepository localRepository )
+ MavenProjectBuilder mavenProjectBuilder,
+ List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
{
if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java Thu Jul 29 22:41:33 2010
@@ -37,7 +37,6 @@ import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -719,7 +718,7 @@ public class ScmReport
}
ScmRepository repo = null;
- List messages = new ArrayList();
+ List<String> messages = new ArrayList<String>();
try
{
messages.addAll( scmManager.validateScmRepository( scmUrl ) );
@@ -733,10 +732,8 @@ public class ScmReport
{
StringBuffer sb = new StringBuffer();
boolean isIntroAdded = false;
- for ( Iterator it = messages.iterator(); it.hasNext(); )
+ for ( String msg : messages )
{
- String msg = it.next().toString();
-
// Ignore NoSuchScmProviderException msg
// See impl of AbstractScmManager#validateScmRepository()
if ( msg.startsWith( "No such provider" ) )
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java Thu Jul 29 22:41:33 2010
@@ -29,7 +29,6 @@ import org.codehaus.plexus.util.StringUt
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -137,7 +136,7 @@ public class TeamListReport
paragraph( getI18nString( "intro.description2" ) );
// Developer section
- List developers = model.getDevelopers();
+ List<Developer> developers = model.getDevelopers();
startSection( getI18nString( "developers.title" ) );
@@ -152,7 +151,7 @@ public class TeamListReport
startTable();
// By default we think that all headers not required
- Map headersMap = new HashMap();
+ Map<String, Boolean> headersMap = new HashMap<String, Boolean>();
// set true for headers that are required
checkRequiredHeaders( headersMap, developers );
String[] requiredHeaders = getRequiredDevHeaderArray( headersMap );
@@ -161,10 +160,8 @@ public class TeamListReport
// To handle JS
int developersRows = 0;
- for ( Iterator i = developers.iterator(); i.hasNext(); )
+ for ( Developer developer : developers )
{
- Developer developer = (Developer) i.next();
-
renderDeveloper( developer, developersRows, headersMap, javascript );
developersRows++;
@@ -176,7 +173,7 @@ public class TeamListReport
endSection();
// contributors section
- List contributors = model.getContributors();
+ List<Contributor> contributors = model.getContributors();
startSection( getI18nString( "contributors.title" ) );
@@ -190,7 +187,7 @@ public class TeamListReport
startTable();
- Map headersMap = new HashMap();
+ Map<String, Boolean> headersMap = new HashMap<String, Boolean>();
checkRequiredHeaders( headersMap, contributors );
String[] requiredHeaders = getRequiredContrHeaderArray( headersMap );
@@ -198,10 +195,8 @@ public class TeamListReport
// To handle JS
int contributorsRows = 0;
- for ( Iterator i = contributors.iterator(); i.hasNext(); )
+ for ( Contributor contributor : contributors )
{
- Contributor contributor = (Contributor) i.next();
-
renderContributor( contributor, contributorsRows, headersMap, javascript );
contributorsRows++;
@@ -220,7 +215,8 @@ public class TeamListReport
endSection();
}
- private void renderDeveloper( Developer developer, int developerRow, Map headersMap, StringBuffer javascript )
+ private void renderDeveloper( Developer developer, int developerRow, Map<String, Boolean> headersMap,
+ StringBuffer javascript )
{
// To handle JS
sink.tableRow();
@@ -295,7 +291,7 @@ public class TeamListReport
sink.tableRow_();
}
- private void renderContributor( Contributor contributor, int contributorRow, Map headersMap,
+ private void renderContributor( Contributor contributor, int contributorRow, Map<String, Boolean> headersMap,
StringBuffer javascript )
{
sink.tableRow();
@@ -371,9 +367,9 @@ public class TeamListReport
* @param requiredHeaders
* @return
*/
- private String[] getRequiredContrHeaderArray( Map requiredHeaders )
+ private String[] getRequiredContrHeaderArray( Map<String, Boolean> requiredHeaders )
{
- List requiredArray = new ArrayList();
+ List<String> requiredArray = new ArrayList<String>();
String name = getI18nString( "contributors.name" );
String email = getI18nString( "contributors.email" );
String url = getI18nString( "contributors.url" );
@@ -400,9 +396,9 @@ public class TeamListReport
* @param requiredHeaders
* @return
*/
- private String[] getRequiredDevHeaderArray( Map requiredHeaders )
+ private String[] getRequiredDevHeaderArray( Map<String, Boolean> requiredHeaders )
{
- List requiredArray = new ArrayList();
+ List<String> requiredArray = new ArrayList<String>();
String id = getI18nString( "developers.id" );
String name = getI18nString( "developers.name" );
@@ -445,9 +441,9 @@ public class TeamListReport
* @param actualTime
* @param properties
*/
- private void setRequiredArray( Map requiredHeaders, List requiredArray, String name, String email, String url,
- String organization, String organizationUrl, String roles, String timeZone,
- String actualTime, String properties )
+ private void setRequiredArray( Map<String, Boolean> requiredHeaders, List<String> requiredArray, String name,
+ String email, String url, String organization, String organizationUrl,
+ String roles, String timeZone, String actualTime, String properties )
{
if ( requiredHeaders.get( NAME ) == Boolean.TRUE )
{
@@ -489,7 +485,7 @@ public class TeamListReport
* @param requiredHeaders
* @param units
*/
- private void checkRequiredHeaders( Map requiredHeaders, List units )
+ private void checkRequiredHeaders( Map<String, Boolean> requiredHeaders, List<?> units )
{
requiredHeaders.put( ID, Boolean.FALSE );
requiredHeaders.put( NAME, Boolean.FALSE );
@@ -501,15 +497,14 @@ public class TeamListReport
requiredHeaders.put( TIME_ZONE, Boolean.FALSE );
requiredHeaders.put( PROPERTIES, Boolean.FALSE );
- for ( Iterator i = units.iterator(); i.hasNext(); )
+ for ( Object unit : units )
{
- Object unit = i.next();
String name = null;
String email = null;
String url = null;
String organization = null;
String organizationUrl = null;
- List roles = null;
+ List<String> roles = null;
String timeZone = null;
Properties properties = null;
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java Thu Jul 29 22:41:33 2010
@@ -49,32 +49,32 @@ public class Dependencies
/**
* @since 2.1
*/
- private List projectDependencies;
+ private List<Artifact> projectDependencies;
/**
* @since 2.1
*/
- private List projectTransitiveDependencies;
+ private List<Artifact> projectTransitiveDependencies;
/**
* @since 2.1
*/
- private List allDependencies;
+ private List<Artifact> allDependencies;
/**
* @since 2.1
*/
- private Map dependenciesByScope;
+ private Map<String, List<Artifact>> dependenciesByScope;
/**
* @since 2.1
*/
- private Map transitiveDependenciesByScope;
+ private Map<String, List<Artifact>> transitiveDependenciesByScope;
/**
* @since 2.1
*/
- private Map dependencyDetails;
+ private Map<String, JarData> dependencyDetails;
/**
* Default constructor
@@ -93,11 +93,11 @@ public class Dependencies
/*
* Workaround to ensure proper File objects in the Artifacts from the ReportResolutionListener
*/
- Map projectMap = new HashMap();
- Iterator it = project.getArtifacts().iterator();
+ Map<String, Artifact> projectMap = new HashMap<String, Artifact>();
+ Iterator<Artifact> it = project.getArtifacts().iterator();
while ( it.hasNext() )
{
- Artifact artifact = (Artifact) it.next();
+ Artifact artifact = it.next();
projectMap.put( ArtifactUtils.versionlessKey( artifact ), artifact );
}
@@ -125,17 +125,17 @@ public class Dependencies
/**
* @return a list of <code>Artifact</code> from the project.
*/
- public List getProjectDependencies()
+ public List<Artifact> getProjectDependencies()
{
if ( projectDependencies != null )
{
return projectDependencies;
}
- projectDependencies = new ArrayList();
- for ( Iterator i = dependencyTreeNode.getChildren().iterator(); i.hasNext(); )
+ projectDependencies = new ArrayList<Artifact>();
+ for ( Iterator<DependencyNode> i = dependencyTreeNode.getChildren().iterator(); i.hasNext(); )
{
- DependencyNode dependencyNode = (DependencyNode) i.next();
+ DependencyNode dependencyNode = i.next();
projectDependencies.add( dependencyNode.getArtifact() );
}
@@ -146,14 +146,14 @@ public class Dependencies
/**
* @return a list of transitive <code>Artifact</code> from the project.
*/
- public List getTransitiveDependencies()
+ public List<Artifact> getTransitiveDependencies()
{
if ( projectTransitiveDependencies != null )
{
return projectTransitiveDependencies;
}
- projectTransitiveDependencies = new ArrayList( getAllDependencies() );
+ projectTransitiveDependencies = new ArrayList<Artifact>( getAllDependencies() );
projectTransitiveDependencies.removeAll( getProjectDependencies() );
return projectTransitiveDependencies;
@@ -162,17 +162,17 @@ public class Dependencies
/**
* @return a list of included <code>Artifact</code> returned by the dependency tree.
*/
- public List getAllDependencies()
+ public List<Artifact> getAllDependencies()
{
if ( allDependencies != null )
{
return allDependencies;
}
- allDependencies = new ArrayList();
- for ( Iterator i = dependencyTreeNode.getChildren().iterator(); i.hasNext(); )
+ allDependencies = new ArrayList<Artifact>();
+ for ( Iterator<DependencyNode> i = dependencyTreeNode.getChildren().iterator(); i.hasNext(); )
{
- DependencyNode dependencyNode = (DependencyNode) i.next();
+ DependencyNode dependencyNode = i.next();
if ( dependencyNode.getState() != DependencyNode.INCLUDED )
{
@@ -205,7 +205,7 @@ public class Dependencies
* @see Artifact#SCOPE_SYSTEM
* @see Artifact#SCOPE_TEST
*/
- public Map getDependenciesByScope( boolean isTransitively )
+ public Map<String, List<Artifact>> getDependenciesByScope( boolean isTransitively )
{
if ( isTransitively )
{
@@ -214,15 +214,13 @@ public class Dependencies
return transitiveDependenciesByScope;
}
- transitiveDependenciesByScope = new HashMap();
- for ( Iterator i = getTransitiveDependencies().iterator(); i.hasNext(); )
+ transitiveDependenciesByScope = new HashMap<String, List<Artifact>>();
+ for ( Artifact artifact : getTransitiveDependencies() )
{
- Artifact artifact = (Artifact) i.next();
-
- List multiValue = (List) transitiveDependenciesByScope.get( artifact.getScope() );
+ List<Artifact> multiValue = transitiveDependenciesByScope.get( artifact.getScope() );
if ( multiValue == null )
{
- multiValue = new ArrayList();
+ multiValue = new ArrayList<Artifact>();
}
if ( !multiValue.contains( artifact ) )
@@ -240,15 +238,13 @@ public class Dependencies
return dependenciesByScope;
}
- dependenciesByScope = new HashMap();
- for ( Iterator i = getProjectDependencies().iterator(); i.hasNext(); )
+ dependenciesByScope = new HashMap<String, List<Artifact>>();
+ for ( Artifact artifact : getProjectDependencies() )
{
- Artifact artifact = (Artifact) i.next();
-
- List multiValue = (List) dependenciesByScope.get( artifact.getScope() );
+ List<Artifact> multiValue = dependenciesByScope.get( artifact.getScope() );
if ( multiValue == null )
{
- multiValue = new ArrayList();
+ multiValue = new ArrayList<Artifact>();
}
if ( !multiValue.contains( artifact ) )
@@ -271,10 +267,10 @@ public class Dependencies
{
if ( dependencyDetails == null )
{
- dependencyDetails = new HashMap();
+ dependencyDetails = new HashMap<String, JarData>();
}
- JarData old = (JarData) dependencyDetails.get( artifact.getId() );
+ JarData old = dependencyDetails.get( artifact.getId() );
if ( dependencyDetails.get( artifact.getId() ) != null )
{
return old;
@@ -299,18 +295,18 @@ public class Dependencies
// Private methods
// ----------------------------------------------------------------------
- private void mapArtifactFiles( DependencyNode node, Map projectMap )
+ private void mapArtifactFiles( DependencyNode node, Map<String, Artifact> projectMap )
{
- List childs = node.getChildren();
+ List<DependencyNode> childs = node.getChildren();
if ( ( childs == null ) || childs.isEmpty() )
{
return;
}
- Iterator it = childs.iterator();
+ Iterator<DependencyNode> it = childs.iterator();
while ( it.hasNext() )
{
- DependencyNode anode = (DependencyNode) it.next();
+ DependencyNode anode = it.next();
String key = ArtifactUtils.versionlessKey( anode.getArtifact() );
Artifact projartifact = (Artifact) projectMap.get( key );
if ( projartifact != null )
@@ -339,9 +335,9 @@ public class Dependencies
return;
}
- for ( Iterator i = dependencyNode.getChildren().iterator(); i.hasNext(); )
+ for ( Iterator<DependencyNode> i = dependencyNode.getChildren().iterator(); i.hasNext(); )
{
- DependencyNode subdependencyNode = (DependencyNode) i.next();
+ DependencyNode subdependencyNode = i.next();
if ( subdependencyNode.getState() != DependencyNode.INCLUDED )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java Thu Jul 29 22:41:33 2010
@@ -21,7 +21,6 @@ package org.apache.maven.report.projecti
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -35,12 +34,12 @@ import org.apache.maven.model.Dependency
*/
public class ManagementDependencies
{
- private final List managementDependencies;
+ private final List<Dependency> managementDependencies;
/**
* @param projectDependencies the list of dependencies.
*/
- public ManagementDependencies( List projectDependencies )
+ public ManagementDependencies( List<Dependency> projectDependencies )
{
this.managementDependencies = projectDependencies;
}
@@ -56,9 +55,9 @@ public class ManagementDependencies
/**
* @return managementDependencies
*/
- public List getManagementDependencies()
+ public List<Dependency> getManagementDependencies()
{
- return new ArrayList( managementDependencies );
+ return new ArrayList<Dependency>( managementDependencies );
}
/**
@@ -69,17 +68,16 @@ public class ManagementDependencies
* @see Artifact#SCOPE_SYSTEM
* @see Artifact#SCOPE_TEST
*/
- public Map getManagementDependenciesByScope()
+ public Map<String, List<Dependency>> getManagementDependenciesByScope()
{
- Map dependenciesByScope = new HashMap();
- for ( Iterator i = getManagementDependencies().iterator(); i.hasNext(); )
+ Map<String, List<Dependency>> dependenciesByScope = new HashMap<String, List<Dependency>>();
+ for ( Dependency dependency : managementDependencies )
{
- Dependency dependency = (Dependency) i.next();
String scope = dependency.getScope() != null ? dependency.getScope() : Artifact.SCOPE_COMPILE;
- List multiValue = (List) dependenciesByScope.get( scope );
+ List<Dependency> multiValue = dependenciesByScope.get( scope );
if ( multiValue == null )
{
- multiValue = new ArrayList();
+ multiValue = new ArrayList<Dependency>();
}
multiValue.add( dependency );
dependenciesByScope.put( scope, multiValue );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java?rev=980600&r1=980599&r2=980600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java Thu Jul 29 22:41:33 2010
@@ -20,7 +20,6 @@ package org.apache.maven.report.projecti
*/
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.artifact.Artifact;
@@ -72,9 +71,9 @@ public class RepositoryUtils
private final ArtifactFactory factory;
- private final List remoteRepositories;
+ private final List<ArtifactRepository> remoteRepositories;
- private final List pluginRepositories;
+ private final List<ArtifactRepository> pluginRepositories;
private final ArtifactResolver resolver;
@@ -94,8 +93,9 @@ public class RepositoryUtils
*/
public RepositoryUtils( Log log, WagonManager wagonManager, Settings settings,
MavenProjectBuilder mavenProjectBuilder, ArtifactFactory factory,
- ArtifactResolver resolver, List remoteRepositories, List pluginRepositories,
- ArtifactRepository localRepository, RepositoryMetadataManager repositoryMetadataManager )
+ ArtifactResolver resolver, List<ArtifactRepository> remoteRepositories,
+ List<ArtifactRepository> pluginRepositories, ArtifactRepository localRepository,
+ RepositoryMetadataManager repositoryMetadataManager )
{
this.log = log;
this.wagonManager = wagonManager;
@@ -119,7 +119,7 @@ public class RepositoryUtils
/**
* @return remote artifact repo
*/
- public List getRemoteArtifactRepositories()
+ public List<ArtifactRepository> getRemoteArtifactRepositories()
{
return remoteRepositories;
}
@@ -127,7 +127,7 @@ public class RepositoryUtils
/**
* @return plugin artifact repo
*/
- public List getPluginArtifactRepositories()
+ public List<ArtifactRepository> getPluginArtifactRepositories()
{
return pluginRepositories;
}
@@ -141,7 +141,8 @@ public class RepositoryUtils
public void resolve( Artifact artifact )
throws ArtifactResolutionException, ArtifactNotFoundException
{
- List repos = new ArrayList();
+ List<ArtifactRepository> repos =
+ new ArrayList<ArtifactRepository>( pluginRepositories.size() + remoteRepositories.size() );
repos.addAll( pluginRepositories );
repos.addAll( remoteRepositories );
@@ -348,10 +349,8 @@ public class RepositoryUtils
}
}
- for ( Iterator it = artifact.getMetadataList().iterator(); it.hasNext(); )
+ for ( ArtifactMetadata m : artifact.getMetadataList() )
{
- ArtifactMetadata m = (ArtifactMetadata) it.next();
-
if ( m instanceof SnapshotArtifactRepositoryMetadata )
{
SnapshotArtifactRepositoryMetadata snapshotMetadata = (SnapshotArtifactRepositoryMetadata) m;
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=980600&r1=980599&r2=980600&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 Thu Jul 29 22:41:33 2010
@@ -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 JAR_SUBTYPE = new HashSet();
+ private static final Set<String> JAR_SUBTYPE = new HashSet<String>();
/**
* An HTML script tag with the Javascript used by the dependencies report.
@@ -116,16 +116,16 @@ public class DependenciesRenderer
/**
* Will be filled with license name / set of projects.
*/
- private Map licenseMap = new HashMap()
+ private Map<String, Object> licenseMap = new HashMap<String, Object>()
{
/** {@inheritDoc} */
- public Object put( Object key, Object value )
+ public Object put( String key, Object value )
{
// handle multiple values as a set to avoid duplicates
- SortedSet valueList = (SortedSet) get( key );
+ SortedSet<Object> valueList = (SortedSet<Object>) get( key );
if ( valueList == null )
{
- valueList = new TreeSet();
+ valueList = new TreeSet<Object>();
}
valueList.add( value );
return super.put( key, valueList );
@@ -136,7 +136,7 @@ public class DependenciesRenderer
private final MavenProjectBuilder mavenProjectBuilder;
- private final List remoteRepositories;
+ private final List<ArtifactRepository> remoteRepositories;
private final ArtifactRepository localRepository;
@@ -201,7 +201,7 @@ public class DependenciesRenderer
Dependencies dependencies, DependencyNode dependencyTreeNode,
DependenciesReportConfiguration config, RepositoryUtils repoUtils,
ArtifactFactory artifactFactory, MavenProjectBuilder mavenProjectBuilder,
- List remoteRepositories, ArtifactRepository localRepository )
+ List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
{
super( sink, i18n, locale );
@@ -431,7 +431,7 @@ public class DependenciesRenderer
startSection( getTitle() );
// collect dependencies by scope
- Map dependenciesByScope = dependencies.getDependenciesByScope( false );
+ Map<String, List<Artifact>> dependenciesByScope = dependencies.getDependenciesByScope( false );
renderDependenciesForAllScopes( dependenciesByScope, false );
@@ -447,23 +447,22 @@ public class DependenciesRenderer
* @see Artifact#SCOPE_SYSTEM
* @see Artifact#SCOPE_TEST
*/
- private void renderDependenciesForAllScopes( Map dependenciesByScope, boolean isTransitive )
+ private void renderDependenciesForAllScopes( Map<String, List<Artifact>> dependenciesByScope, boolean isTransitive )
{
- renderDependenciesForScope( Artifact.SCOPE_COMPILE,
- (List) dependenciesByScope.get( Artifact.SCOPE_COMPILE ), isTransitive );
- renderDependenciesForScope( Artifact.SCOPE_RUNTIME,
- (List) dependenciesByScope.get( Artifact.SCOPE_RUNTIME ), isTransitive );
- renderDependenciesForScope( Artifact.SCOPE_TEST, (List) dependenciesByScope.get( Artifact.SCOPE_TEST ),
+ renderDependenciesForScope( Artifact.SCOPE_COMPILE, dependenciesByScope.get( Artifact.SCOPE_COMPILE ),
+ isTransitive );
+ renderDependenciesForScope( Artifact.SCOPE_RUNTIME, dependenciesByScope.get( Artifact.SCOPE_RUNTIME ),
+ isTransitive );
+ renderDependenciesForScope( Artifact.SCOPE_TEST, dependenciesByScope.get( Artifact.SCOPE_TEST ), isTransitive );
+ renderDependenciesForScope( Artifact.SCOPE_PROVIDED, dependenciesByScope.get( Artifact.SCOPE_PROVIDED ),
+ isTransitive );
+ renderDependenciesForScope( Artifact.SCOPE_SYSTEM, dependenciesByScope.get( Artifact.SCOPE_SYSTEM ),
isTransitive );
- renderDependenciesForScope( Artifact.SCOPE_PROVIDED,
- (List) dependenciesByScope.get( Artifact.SCOPE_PROVIDED ), isTransitive );
- renderDependenciesForScope( Artifact.SCOPE_SYSTEM,
- (List) dependenciesByScope.get( Artifact.SCOPE_SYSTEM ), isTransitive );
}
private void renderSectionProjectTransitiveDependencies()
{
- Map dependenciesByScope = dependencies.getDependenciesByScope( true );
+ Map<String, List<Artifact>> dependenciesByScope = dependencies.getDependenciesByScope( true );
startSection( getI18nString( "transitive.title" ) );
@@ -509,7 +508,7 @@ public class DependenciesRenderer
{
startSection( getI18nString( "file.details.title" ) );
- List alldeps = dependencies.getAllDependencies();
+ List<Artifact> alldeps = dependencies.getAllDependencies();
Collections.sort( alldeps, getArtifactComparator() );
// i18n
@@ -552,10 +551,8 @@ public class DependenciesRenderer
tableHeader( tableHeader );
// Table rows
- for ( Iterator it = alldeps.iterator(); it.hasNext(); )
+ for ( Artifact artifact : alldeps )
{
- Artifact artifact = (Artifact) it.next();
-
if ( artifact.getFile() == null )
{
log.error( "Artifact: " + artifact.getId() + " has no file." );
@@ -664,24 +661,19 @@ public class DependenciesRenderer
"", "", "" } );
}
- private void populateRepositoryMap( Map repos, List rowRepos )
+ private void populateRepositoryMap( Map<String, ArtifactRepository> repos, List<ArtifactRepository> rowRepos )
{
- Iterator it = rowRepos.iterator();
- while ( it.hasNext() )
+ for ( ArtifactRepository repo : rowRepos )
{
- ArtifactRepository repo = (ArtifactRepository) it.next();
-
repos.put( repo.getId(), repo );
}
}
- private void blacklistRepositoryMap( Map repos, List repoUrlBlackListed )
+ private void blacklistRepositoryMap( Map<String, ArtifactRepository> repos,
+ List<String> repoUrlBlackListed )
{
- for ( Iterator it = repos.keySet().iterator(); it.hasNext(); )
+ for ( ArtifactRepository repo : repos.values() )
{
- String key = (String) it.next();
- ArtifactRepository repo = (ArtifactRepository) repos.get( key );
-
// ping repo
if ( !repo.isBlacklisted() )
{
@@ -723,16 +715,15 @@ public class DependenciesRenderer
startSection( getI18nString( "repo.locations.title" ) );
// Collect Alphabetical Dependencies
- List alldeps = dependencies.getAllDependencies();
+ List<Artifact> alldeps = dependencies.getAllDependencies();
Collections.sort( alldeps, getArtifactComparator() );
// Collect Repositories
- Map repoMap = new HashMap();
+ Map<String, ArtifactRepository> repoMap = new HashMap<String, ArtifactRepository>();
populateRepositoryMap( repoMap, repoUtils.getRemoteArtifactRepositories() );
- for ( Iterator it = alldeps.iterator(); it.hasNext(); )
+ for ( Artifact artifact : alldeps )
{
- Artifact artifact = (Artifact) it.next();
try
{
MavenProject artifactProject = repoUtils.getMavenProjectFromRepository( artifact );
@@ -744,7 +735,7 @@ public class DependenciesRenderer
}
}
- List repoUrlBlackListed = new ArrayList();
+ List<String> repoUrlBlackListed = new ArrayList<String>();
blacklistRepositoryMap( repoMap, repoUrlBlackListed );
// Render Repository List
@@ -765,7 +756,7 @@ public class DependenciesRenderer
endSection();
}
- private void renderDependenciesForScope( String scope, List artifacts, boolean isTransitive )
+ private void renderDependenciesForScope( String scope, List<Artifact> artifacts, boolean isTransitive )
{
if ( artifacts != null )
{
@@ -785,10 +776,8 @@ public class DependenciesRenderer
startTable();
tableHeader( tableHeader );
- for ( Iterator iterator = artifacts.iterator(); iterator.hasNext(); )
+ for ( Artifact artifact : artifacts )
{
- Artifact artifact = (Artifact) iterator.next();
-
renderArtifactRow( artifact, withClassifier, withOptional );
}
endTable();
@@ -797,15 +786,12 @@ public class DependenciesRenderer
}
}
- private Comparator getArtifactComparator()
+ private Comparator<Artifact> getArtifactComparator()
{
- return new Comparator()
+ return new Comparator<Artifact>()
{
- public int compare( Object o1, Object o2 )
+ public int compare( Artifact a1, Artifact a2 )
{
- Artifact a1 = (Artifact) o1;
- Artifact a2 = (Artifact) o2;
-
// put optional last
if ( a1.isOptional() && !a2.isOptional() )
{
@@ -876,10 +862,10 @@ public class DependenciesRenderer
if ( !node.getChildren().isEmpty() )
{
boolean toBeIncluded = false;
- List subList = new ArrayList();
- for ( Iterator deps = node.getChildren().iterator(); deps.hasNext(); )
+ List<DependencyNode> subList = new ArrayList<DependencyNode>();
+ for ( Iterator<DependencyNode> deps = node.getChildren().iterator(); deps.hasNext(); )
{
- DependencyNode dep = (DependencyNode) deps.next();
+ DependencyNode dep = deps.next();
if ( !dependencies.getAllDependencies().contains( dep.getArtifact() ) )
{
@@ -893,10 +879,8 @@ public class DependenciesRenderer
if ( toBeIncluded )
{
sink.list();
- for ( Iterator deps = subList.iterator(); deps.hasNext(); )
+ for ( DependencyNode dep : subList )
{
- DependencyNode dep = (DependencyNode) deps.next();
-
printDependencyListing( dep );
}
sink.list_();
@@ -924,7 +908,7 @@ public class DependenciesRenderer
String artifactDescription = artifactProject.getDescription();
String artifactUrl = artifactProject.getUrl();
String artifactName = artifactProject.getName();
- List licenses = artifactProject.getLicenses();
+ List<License> licenses = artifactProject.getLicenses();
sink.tableRow();
sink.tableHeaderCell();
@@ -974,9 +958,8 @@ public class DependenciesRenderer
sink.bold_();
if ( !licenses.isEmpty() )
{
- for ( Iterator iter = licenses.iterator(); iter.hasNext(); )
+ for ( License element : licenses )
{
- License element = (License) iter.next();
String licenseName = element.getName();
String licenseUrl = element.getUrl();
@@ -1046,9 +1029,9 @@ public class DependenciesRenderer
private void printGroupedLicenses()
{
- for ( Iterator iter = licenseMap.keySet().iterator(); iter.hasNext(); )
+ for ( Map.Entry<String, Object> entry : licenseMap.entrySet() )
{
- String licenseName = (String) iter.next();
+ String licenseName = entry.getKey();
sink.paragraph();
sink.bold();
if ( StringUtils.isEmpty( licenseName ) )
@@ -1062,11 +1045,11 @@ public class DependenciesRenderer
sink.text( ": " );
sink.bold_();
- SortedSet projects = (SortedSet) licenseMap.get( licenseName );
+ SortedSet<String> projects = (SortedSet<String>) entry.getValue();
- for ( Iterator iterator = projects.iterator(); iterator.hasNext(); )
+ for ( Iterator<String> iterator = projects.iterator(); iterator.hasNext(); )
{
- String projectName = (String) iterator.next();
+ String projectName = iterator.next();
sink.text( projectName );
if ( iterator.hasNext() )
{
@@ -1078,7 +1061,7 @@ public class DependenciesRenderer
}
}
- private void printRepositories( Map repoMap, List repoUrlBlackListed )
+ private void printRepositories( Map<String, ArtifactRepository> repoMap, List<String> repoUrlBlackListed )
{
// i18n
String repoid = getI18nString( "repo.locations.column.repoid" );
@@ -1117,11 +1100,8 @@ public class DependenciesRenderer
// Table rows
- for ( Iterator it = repoMap.keySet().iterator(); it.hasNext(); )
+ for ( ArtifactRepository repo : repoMap.values() )
{
- String key = (String) it.next();
- ArtifactRepository repo = (ArtifactRepository) repoMap.get( key );
-
sink.tableRow();
tableCell( repo.getId() );
@@ -1154,7 +1134,7 @@ public class DependenciesRenderer
endTable();
}
- private void printArtifactsLocations( Map repoMap, List alldeps )
+ private void printArtifactsLocations( Map<String, ArtifactRepository> repoMap, List<Artifact> alldeps )
{
// i18n
String artifact = getI18nString( "repo.locations.column.artifact" );
@@ -1163,12 +1143,12 @@ public class DependenciesRenderer
sink.text( getI18nString( "repo.locations.artifact.breakdown" ) );
sink.paragraph_();
- List repoIdList = new ArrayList();
+ List<String> repoIdList = new ArrayList<String>();
// removed blacklisted repo
- for ( Iterator it = repoMap.keySet().iterator(); it.hasNext(); )
+ for ( Map.Entry<String, ArtifactRepository> entry : repoMap.entrySet() )
{
- String repokey = (String) it.next();
- ArtifactRepository repo = (ArtifactRepository) repoMap.get( repokey );
+ String repokey = entry.getKey();
+ ArtifactRepository repo = entry.getValue();
if ( !repo.isBlacklisted() )
{
repoIdList.add( repokey );
@@ -1182,25 +1162,22 @@ public class DependenciesRenderer
justificationRepo[0] = Sink.JUSTIFY_LEFT;
int idnum = 1;
- for ( Iterator it = repoIdList.iterator(); it.hasNext(); )
+ for ( String id : repoIdList )
{
- String id = (String) it.next();
tableHeader[idnum] = id;
justificationRepo[idnum] = Sink.JUSTIFY_CENTER;
idnum++;
}
- Map totalByRepo = new HashMap();
+ Map<String, Integer> totalByRepo = new HashMap<String, Integer>();
TotalCell totaldeps = new TotalCell( DEFAULT_DECIMAL_FORMAT );
startTable( justificationRepo, false );
tableHeader( tableHeader );
- for ( Iterator it = alldeps.iterator(); it.hasNext(); )
+ for ( Artifact dependency : alldeps )
{
- Artifact dependency = (Artifact) it.next();
-
totaldeps.incrementTotal( dependency.getScope() );
sink.tableRow();
@@ -1209,10 +1186,9 @@ public class DependenciesRenderer
{
tableCell( dependency.getId() );
- for ( Iterator itrepo = repoIdList.iterator(); itrepo.hasNext(); )
+ for ( String repokey : repoIdList )
{
- String repokey = (String) itrepo.next();
- ArtifactRepository repo = (ArtifactRepository) repoMap.get( repokey );
+ ArtifactRepository repo = repoMap.get( repokey );
String depUrl = repoUtils.getDependencyUrlFromRepository( dependency, repo );
@@ -1265,10 +1241,8 @@ public class DependenciesRenderer
{
tableCell( dependency.getId() );
- for ( Iterator itrepo = repoIdList.iterator(); itrepo.hasNext(); )
+ for ( String repoId : repoIdList )
{
- itrepo.next();
-
tableCell( "-" );
}
}
@@ -1284,11 +1258,9 @@ public class DependenciesRenderer
String[] totalRow = new String[repoIdList.size() + 1];
totalRow[0] = totaldeps.toString();
idnum = 1;
- for ( Iterator itrepo = repoIdList.iterator(); itrepo.hasNext(); )
+ for ( String repokey : repoIdList )
{
- String repokey = (String) itrepo.next();
-
- Integer deps = (Integer) totalByRepo.get( repokey );
+ Integer deps = totalByRepo.get( repokey );
totalRow[idnum++] = deps != null ? deps.toString() : "0";
}
@@ -1301,12 +1273,10 @@ public class DependenciesRenderer
* @param artifacts not null
* @return <code>true</code> if one artifact in the list has a classifier, <code>false</code> otherwise.
*/
- private boolean hasClassifier( List artifacts )
+ private boolean hasClassifier( List<Artifact> artifacts )
{
- for ( Iterator iterator = artifacts.iterator(); iterator.hasNext(); )
+ for ( Artifact artifact : artifacts )
{
- Artifact artifact = (Artifact) iterator.next();
-
if ( StringUtils.isNotEmpty( artifact.getClassifier() ) )
{
return true;
@@ -1320,12 +1290,10 @@ public class DependenciesRenderer
* @param artifacts not null
* @return <code>true</code> if one artifact in the list is optional, <code>false</code> otherwise.
*/
- private boolean hasOptional( List artifacts )
+ private boolean hasOptional( List<Artifact> artifacts )
{
- for ( Iterator iterator = artifacts.iterator(); iterator.hasNext(); )
+ for ( Artifact artifact : artifacts )
{
- Artifact artifact = (Artifact) iterator.next();
-
if ( artifact.isOptional() )
{
return true;
@@ -1339,12 +1307,10 @@ public class DependenciesRenderer
* @param artifacts not null
* @return <code>true</code> if one artifact in the list is sealed, <code>false</code> otherwise.
*/
- private boolean hasSealed( List artifacts )
+ private boolean hasSealed( List<Artifact> artifacts )
{
- for ( Iterator it = artifacts.iterator(); it.hasNext(); )
+ for ( Artifact artifact : artifacts )
{
- Artifact artifact = (Artifact) it.next();
-
// TODO site:run Why do we need to resolve this...
if ( artifact.getFile() == null && !Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
{
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=980600&r1=980599&r2=980600&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 Thu Jul 29 22:41:33 2010
@@ -21,7 +21,6 @@ package org.apache.maven.report.projecti
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -55,7 +54,7 @@ public class DependencyManagementRendere
private final MavenProjectBuilder mavenProjectBuilder;
- private final List remoteRepositories;
+ private final List<ArtifactRepository> remoteRepositories;
private final ArtifactRepository localRepository;
@@ -74,8 +73,8 @@ public class DependencyManagementRendere
*/
public DependencyManagementRenderer( Sink sink, Locale locale, I18N i18n, Log log,
ManagementDependencies dependencies, ArtifactFactory artifactFactory,
- MavenProjectBuilder mavenProjectBuilder, List remoteRepositories,
- ArtifactRepository localRepository )
+ MavenProjectBuilder mavenProjectBuilder,
+ List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
{
super( sink, i18n, locale );
@@ -125,21 +124,20 @@ public class DependencyManagementRendere
startSection( getTitle() );
// collect dependencies by scope
- Map dependenciesByScope = dependencies.getManagementDependenciesByScope();
+ Map<String, List<Dependency>> dependenciesByScope = dependencies.getManagementDependenciesByScope();
renderDependenciesForAllScopes( dependenciesByScope );
endSection();
}
- private void renderDependenciesForAllScopes( Map dependenciesByScope )
+ private void renderDependenciesForAllScopes( Map<String, List<Dependency>> dependenciesByScope )
{
- renderDependenciesForScope( Artifact.SCOPE_COMPILE, (List) dependenciesByScope.get( Artifact.SCOPE_COMPILE ) );
- renderDependenciesForScope( Artifact.SCOPE_RUNTIME, (List) dependenciesByScope.get( Artifact.SCOPE_RUNTIME ) );
- renderDependenciesForScope( Artifact.SCOPE_TEST, (List) dependenciesByScope.get( Artifact.SCOPE_TEST ) );
- renderDependenciesForScope( Artifact.SCOPE_PROVIDED,
- (List) dependenciesByScope.get( Artifact.SCOPE_PROVIDED ) );
- renderDependenciesForScope( Artifact.SCOPE_SYSTEM, (List) dependenciesByScope.get( Artifact.SCOPE_SYSTEM ) );
+ renderDependenciesForScope( Artifact.SCOPE_COMPILE, dependenciesByScope.get( Artifact.SCOPE_COMPILE ) );
+ renderDependenciesForScope( Artifact.SCOPE_RUNTIME, dependenciesByScope.get( Artifact.SCOPE_RUNTIME ) );
+ renderDependenciesForScope( Artifact.SCOPE_TEST, dependenciesByScope.get( Artifact.SCOPE_TEST ) );
+ renderDependenciesForScope( Artifact.SCOPE_PROVIDED, dependenciesByScope.get( Artifact.SCOPE_PROVIDED ) );
+ renderDependenciesForScope( Artifact.SCOPE_SYSTEM, dependenciesByScope.get( Artifact.SCOPE_SYSTEM ) );
}
private String[] getDependencyTableHeader( boolean hasClassifier )
@@ -158,7 +156,7 @@ public class DependencyManagementRendere
return new String[] { groupId, artifactId, version, type };
}
- private void renderDependenciesForScope( String scope, List artifacts )
+ private void renderDependenciesForScope( String scope, List<Dependency> artifacts )
{
if ( artifacts != null )
{
@@ -171,9 +169,8 @@ public class DependencyManagementRendere
startTable();
boolean hasClassifier = false;
- for ( Iterator iterator = artifacts.iterator(); iterator.hasNext(); )
+ for ( Dependency dependency : artifacts )
{
- Dependency dependency = (Dependency) iterator.next();
if ( StringUtils.isNotEmpty( dependency.getClassifier() ) )
{
hasClassifier = true;
@@ -184,9 +181,8 @@ public class DependencyManagementRendere
String[] tableHeader = getDependencyTableHeader( hasClassifier );
tableHeader( tableHeader );
- for ( Iterator iterator = artifacts.iterator(); iterator.hasNext(); )
+ for ( Dependency dependency : artifacts )
{
- Dependency dependency = (Dependency) iterator.next();
tableRow( getDependencyRow( dependency, hasClassifier ) );
}
endTable();
@@ -214,15 +210,12 @@ public class DependencyManagementRendere
dependency.getType() };
}
- private Comparator getDependencyComparator()
+ private Comparator<Dependency> getDependencyComparator()
{
- return new Comparator()
+ return new Comparator<Dependency>()
{
- public int compare( Object o1, Object o2 )
+ public int compare( Dependency a1, Dependency a2 )
{
- Dependency a1 = (Dependency) o1;
- Dependency a2 = (Dependency) o2;
-
int result = a1.getGroupId().compareTo( a2.getGroupId() );
if ( result == 0 )
{