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/08 22:40:20 UTC
svn commit: r1100809 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies:
./ renderer/
Author: hboutemy
Date: Sun May 8 20:40:20 2011
New Revision: 1100809
URL: http://svn.apache.org/viewvc?rev=1100809&view=rev
Log:
code simplification
Modified:
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/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
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=1100809&r1=1100808&r2=1100809&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 Sun May 8 20:40:20 2011
@@ -22,7 +22,6 @@ package org.apache.maven.report.projecti
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -118,12 +117,11 @@ public class Dependencies
}
projectDependencies = new ArrayList<Artifact>();
- for ( @SuppressWarnings( "unchecked" )
- Iterator<DependencyNode> i = dependencyTreeNode.getChildren().iterator(); i.hasNext(); )
+ @SuppressWarnings( "unchecked" )
+ List<DependencyNode> deps = dependencyTreeNode.getChildren();
+ for ( DependencyNode dep : deps )
{
- DependencyNode dependencyNode = i.next();
-
- projectDependencies.add( dependencyNode.getArtifact() );
+ projectDependencies.add( dep.getArtifact() );
}
return projectDependencies;
@@ -268,11 +266,10 @@ public class Dependencies
*/
private void addAllChildrenDependencies( DependencyNode dependencyNode )
{
- for ( @SuppressWarnings( "unchecked" )
- Iterator<DependencyNode> i = dependencyNode.getChildren().iterator(); i.hasNext(); )
+ @SuppressWarnings( "unchecked" )
+ List<DependencyNode> deps = dependencyNode.getChildren();
+ for ( DependencyNode subdependencyNode : deps )
{
- DependencyNode subdependencyNode = i.next();
-
if ( subdependencyNode.getState() != DependencyNode.INCLUDED )
{
continue;
@@ -294,6 +291,5 @@ public class Dependencies
addAllChildrenDependencies( subdependencyNode );
}
-
}
}
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=1100809&r1=1100808&r2=1100809&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 Sun May 8 20:40:20 2011
@@ -33,6 +33,7 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
+import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
@@ -341,9 +342,10 @@ public class RepositoryUtils
SnapshotArtifactRepositoryMetadata snapshotMetadata = (SnapshotArtifactRepositoryMetadata) m;
Metadata metadata = snapshotMetadata.getMetadata();
- if ( metadata.getVersioning() == null || metadata.getVersioning().getSnapshot() == null
- || metadata.getVersioning().getSnapshot().isLocalCopy()
- || metadata.getVersioning().getSnapshot().getTimestamp() == null )
+ Versioning versioning = metadata.getVersioning();
+ if ( versioning == null || versioning.getSnapshot() == null
+ || versioning.getSnapshot().isLocalCopy()
+ || versioning.getSnapshot().getTimestamp() == null )
{
continue;
}
@@ -351,8 +353,8 @@ public class RepositoryUtils
// create the version according SnapshotTransformation
String version =
StringUtils.replace( copyArtifact.getVersion(), Artifact.SNAPSHOT_VERSION,
- metadata.getVersioning().getSnapshot().getTimestamp() )
- + "-" + metadata.getVersioning().getSnapshot().getBuildNumber();
+ versioning.getSnapshot().getTimestamp() )
+ + "-" + versioning.getSnapshot().getBuildNumber();
copyArtifact.setVersion( version );
}
}
@@ -374,20 +376,21 @@ public class RepositoryUtils
*/
private ProxyInfo getProxyInfo()
{
- ProxyInfo proxyInfo = null;
- if ( settings != null && settings.getActiveProxy() != null )
+ if ( settings == null || settings.getActiveProxy() == null )
{
- Proxy settingsProxy = settings.getActiveProxy();
-
- proxyInfo = new ProxyInfo();
- proxyInfo.setHost( settingsProxy.getHost() );
- proxyInfo.setType( settingsProxy.getProtocol() );
- proxyInfo.setPort( settingsProxy.getPort() );
- proxyInfo.setNonProxyHosts( settingsProxy.getNonProxyHosts() );
- proxyInfo.setUserName( settingsProxy.getUsername() );
- proxyInfo.setPassword( settingsProxy.getPassword() );
+ return null;
}
+ Proxy settingsProxy = settings.getActiveProxy();
+
+ ProxyInfo proxyInfo = new ProxyInfo();
+ proxyInfo.setHost( settingsProxy.getHost() );
+ proxyInfo.setType( settingsProxy.getProtocol() );
+ proxyInfo.setPort( settingsProxy.getPort() );
+ proxyInfo.setNonProxyHosts( settingsProxy.getNonProxyHosts() );
+ proxyInfo.setUserName( settingsProxy.getUsername() );
+ proxyInfo.setPassword( settingsProxy.getPassword() );
+
return proxyInfo;
}
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=1100809&r1=1100808&r2=1100809&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 8 20:40:20 2011
@@ -680,9 +680,17 @@ public class DependenciesRenderer
for ( ArtifactRepository repo : repos.values() )
{
// ping repo
- if ( !repo.isBlacklisted() )
+ if ( repo.isBlacklisted() )
+ {
+ repoUrlBlackListed.add( repo.getUrl() );
+ }
+ else
{
- if ( !repoUrlBlackListed.contains( repo.getUrl() ) )
+ if ( repoUrlBlackListed.contains( repo.getUrl() ) )
+ {
+ repo.setBlacklisted( true );
+ }
+ else
{
try
{
@@ -703,14 +711,6 @@ public class DependenciesRenderer
repoUrlBlackListed.add( repo.getUrl() );
}
}
- else
- {
- repo.setBlacklisted( true );
- }
- }
- else
- {
- repoUrlBlackListed.add( repo.getUrl() );
}
}
}
@@ -839,11 +839,9 @@ public class DependenciesRenderer
artifactProject = repoUtils.getMavenProjectFromRepository( artifact );
@SuppressWarnings( "unchecked" )
List<License> licenses = artifactProject.getLicenses();
- for ( Iterator<License> iterator = licenses.iterator(); iterator.hasNext(); )
+ for ( License license : licenses )
{
- License license = iterator.next();
- String artifactIdCell2 = ProjectInfoReportUtils.getArtifactIdCell( license.getName(), license.getUrl() );
- sb.append( artifactIdCell2 );
+ sb.append( ProjectInfoReportUtils.getArtifactIdCell( license.getName(), license.getUrl() ) );
}
}
catch ( ProjectBuildingException e )
@@ -888,18 +886,15 @@ public class DependenciesRenderer
{
boolean toBeIncluded = false;
List<DependencyNode> subList = new ArrayList<DependencyNode>();
- for ( @SuppressWarnings( "unchecked" )
- Iterator<DependencyNode> deps = node.getChildren().iterator(); deps.hasNext(); )
+ @SuppressWarnings( "unchecked" )
+ List<DependencyNode> deps = node.getChildren();
+ for ( DependencyNode dep : deps )
{
- DependencyNode dep = deps.next();
-
- if ( !dependencies.getAllDependencies().contains( dep.getArtifact() ) )
+ if ( dependencies.getAllDependencies().contains( dep.getArtifact() ) )
{
- continue;
+ subList.add( dep );
+ toBeIncluded = true;
}
-
- subList.add( dep );
- toBeIncluded = true;
}
if ( toBeIncluded )
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=1100809&r1=1100808&r2=1100809&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 Sun May 8 20:40:20 2011
@@ -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;
@@ -219,9 +218,8 @@ public class DependencyManagementRendere
artifactProject = repoUtils.getMavenProjectFromRepository( artifact );
@SuppressWarnings( "unchecked" )
List<License> licenses = artifactProject.getLicenses();
- for ( Iterator<License> iterator = licenses.iterator(); iterator.hasNext(); )
+ for ( License license : licenses )
{
- License license = iterator.next();
String artifactIdCell2 = ProjectInfoReportUtils.getArtifactIdCell( license.getName(), license.getUrl() );
sb.append( artifactIdCell2 );
}
@@ -248,42 +246,49 @@ public class DependencyManagementRendere
public int compare( Dependency a1, Dependency a2 )
{
int result = a1.getGroupId().compareTo( a2.getGroupId() );
- if ( result == 0 )
+ if ( result != 0 )
{
- result = a1.getArtifactId().compareTo( a2.getArtifactId() );
- if ( result == 0 )
+ return result;
+ }
+
+ result = a1.getArtifactId().compareTo( a2.getArtifactId() );
+ if ( result != 0 )
+ {
+ return result;
+ }
+
+ result = a1.getType().compareTo( a2.getType() );
+ if ( result != 0 )
+ {
+ return result;
+ }
+
+ if ( a1.getClassifier() == null )
+ {
+ if ( a2.getClassifier() != null )
{
- result = a1.getType().compareTo( a2.getType() );
- if ( result == 0 )
- {
- if ( a1.getClassifier() == null )
- {
- if ( a2.getClassifier() != null )
- {
- result = 1;
- }
- }
- else
- {
- if ( a2.getClassifier() != null )
- {
- result = a1.getClassifier().compareTo( a2.getClassifier() );
- }
- else
- {
- result = -1;
- }
- }
- if ( result == 0 )
- {
- // We don't consider the version range in the comparison, just the resolved version
- result = a1.getVersion().compareTo( a2.getVersion() );
- }
- }
+ return 1;
}
}
+ else
+ {
+ if ( a2.getClassifier() != null )
+ {
+ result = a1.getClassifier().compareTo( a2.getClassifier() );
+ }
+ else
+ {
+ return -1;
+ }
+ }
+
+ if ( result != 0 )
+ {
+ return result;
+ }
- return result;
+ // We don't consider the version range in the comparison, just the resolved version
+ return a1.getVersion().compareTo( a2.getVersion() );
}
};
}