You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/08/19 22:19:08 UTC
svn commit: r805960 - in
/maven/components/trunk/maven-compat/src/main/java/org/apache/maven:
artifact/repository/DefaultRepositoryRequest.java
repository/legacy/metadata/DefaultMetadataResolutionRequest.java
Author: bentmann
Date: Wed Aug 19 20:19:07 2009
New Revision: 805960
URL: http://svn.apache.org/viewvc?rev=805960&view=rev
Log:
o Refactored code
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java?rev=805960&r1=805959&r2=805960&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java Wed Aug 19 20:19:07 2009
@@ -39,6 +39,27 @@
private RepositoryCache cache;
+ /**
+ * Creates an empty repository request.
+ */
+ public DefaultRepositoryRequest()
+ {
+ // enables no-arg constructor
+ }
+
+ /**
+ * Creates a shallow copy of the specified repository request.
+ *
+ * @param repositoryRequest The repository request to copy from, must not be {@code null}.
+ */
+ public DefaultRepositoryRequest( RepositoryRequest repositoryRequest )
+ {
+ setLocalRepository( repositoryRequest.getLocalRepository() );
+ setRemoteRepositories( repositoryRequest.getRemoteRepositories() );
+ setOffline( repositoryRequest.isOffline() );
+ setCache( repositoryRequest.getCache() );
+ }
+
public boolean isOffline()
{
return offline;
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java?rev=805960&r1=805959&r2=805960&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java Wed Aug 19 20:19:07 2009
@@ -19,11 +19,11 @@
* under the License.
*/
-import java.util.ArrayList;
import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryCache;
import org.apache.maven.artifact.repository.RepositoryRequest;
@@ -38,27 +38,18 @@
private Artifact artifact;
- private ArtifactRepository localRepository;
-
- private List<ArtifactRepository> remoteRepositories;
-
- private RepositoryCache cache;
-
private boolean resolveManagedVersions;
- private boolean offline;
+ private RepositoryRequest repositoryRequest;
public DefaultMetadataResolutionRequest()
{
- // does nothing
+ repositoryRequest = new DefaultRepositoryRequest();
}
- public DefaultMetadataResolutionRequest( RepositoryRequest request )
+ public DefaultMetadataResolutionRequest( RepositoryRequest repositoryRequest )
{
- setLocalRepository( request.getLocalRepository() );
- setRemoteRepositories( request.getRemoteRepositories() );
- setCache( request.getCache() );
- setOffline( request.isOffline() );
+ this.repositoryRequest = new DefaultRepositoryRequest( repositoryRequest );
}
public Artifact getArtifact()
@@ -75,29 +66,24 @@
public ArtifactRepository getLocalRepository()
{
- return localRepository;
+ return repositoryRequest.getLocalRepository();
}
public DefaultMetadataResolutionRequest setLocalRepository( ArtifactRepository localRepository )
{
- this.localRepository = localRepository;
+ repositoryRequest.setLocalRepository( localRepository );
return this;
}
public List<ArtifactRepository> getRemoteRepositories()
{
- if ( remoteRepositories == null )
- {
- remoteRepositories = new ArrayList<ArtifactRepository>();
- }
-
- return remoteRepositories;
+ return repositoryRequest.getRemoteRepositories();
}
public DefaultMetadataResolutionRequest setRemoteRepositories( List<ArtifactRepository> remoteRepositories )
{
- this.remoteRepositories = remoteRepositories;
+ repositoryRequest.setRemoteRepositories( remoteRepositories );
return this;
}
@@ -116,24 +102,24 @@
public RepositoryCache getCache()
{
- return cache;
+ return repositoryRequest.getCache();
}
public DefaultMetadataResolutionRequest setCache( RepositoryCache cache )
{
- this.cache = cache;
+ repositoryRequest.setCache( cache );
return this;
}
public boolean isOffline()
{
- return offline;
+ return repositoryRequest.isOffline();
}
public DefaultMetadataResolutionRequest setOffline( boolean offline )
{
- this.offline = offline;
+ repositoryRequest.setOffline( offline );
return this;
}