You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/12/29 18:06:26 UTC
svn commit: r729946 - in /maven/mercury/trunk:
mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/
mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/
mercury-md/mercury-md-sat/src/main/java/org/apache/maven/...
Author: ogusakov
Date: Mon Dec 29 09:06:26 2008
New Revision: 729946
URL: http://svn.apache.org/viewvc?rev=729946&view=rev
Log:
minor beautification - removed null params in the call
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=729946&r1=729945&r2=729946&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java Mon Dec 29 09:06:26 2008
@@ -173,7 +173,7 @@
repos.add( 0, _pomRepo );
DependencyBuilder db =
- DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, repos, null, null, null );
+ DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, repos );
VirtualRepositoryReader vr = new VirtualRepositoryReader( repos );
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java?rev=729946&r1=729945&r2=729946&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java Mon Dec 29 09:06:26 2008
@@ -102,7 +102,7 @@
// RemoteRepositoryM2 centralRepo = new RemoteRepositoryM2(central);
// reps.add(centralRepo);
- depBuilder = DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, reps, null, null, null );
+ depBuilder = DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, reps );
depBuilder.register( new DumbListener() );
vReader = new VirtualRepositoryReader( reps );
@@ -231,7 +231,7 @@
remoteRepo.setUpdatePolicy( RepositoryUpdateIntervalPolicy.UPDATE_POLICY_NEVER );
reps.add( remoteRepo );
- depBuilder = DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, reps, null, null, null );
+ depBuilder = DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, reps );
// depBuilder.register( new DumbListener() );
ArtifactMetadata md = new ArtifactMetadata( artifactId );
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java?rev=729946&r1=729945&r2=729946&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java Mon Dec 29 09:06:26 2008
@@ -41,14 +41,23 @@
public static final String JAVA_DEPENDENCY_MODEL = "java";
public static final String OSGI_DEPENDENCY_MODEL = "osgi";
- private static final Language LANG = new DefaultLanguage( DependencyBuilderFactory.class) ;
+ private static final Language LANG = new DefaultLanguage( DependencyBuilderFactory.class);
public static final DependencyBuilder create(
- final String dependencyModel
- , final Collection<Repository> repositories
- , final Collection<MetadataTreeArtifactFilter> filters
- , final List<Comparator<MetadataTreeNode>> comparators
- , final Map<String,ArtifactListProcessor> processors
+ String dependencyModel
+ , Collection<Repository> repositories
+ )
+ throws RepositoryException
+ {
+ return create( dependencyModel, repositories, null, null, null );
+ }
+
+ public static final DependencyBuilder create(
+ String dependencyModel
+ , Collection<Repository> repositories
+ , Collection<MetadataTreeArtifactFilter> filters
+ , List<Comparator<MetadataTreeNode>> comparators
+ , Map<String,ArtifactListProcessor> processors
)
throws RepositoryException
{
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java?rev=729946&r1=729945&r2=729946&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java Mon Dec 29 09:06:26 2008
@@ -288,7 +288,7 @@
try
{
- DependencyBuilder depBuilder = DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, repos, null, null, null );
+ DependencyBuilder depBuilder = DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, repos );
ArtifactBasicMetadata a = artifacts.getMetadataList().get( 0 );