Author: hboutemy
Date: Tue Jun 1 20:39:34 2010
New Revision: 950240
URL: http://svn.apache.org/viewvc?rev=950240&view=rev
Log:
o removed unused import
o fixed typos
o code simplification
(no code change)
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java?rev=950240&r1=950239&r2=950240&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
Tue Jun 1 20:39:34 2010
@@ -19,7 +19,6 @@ package org.apache.maven.artifact.reposi
* under the License.
*/
-//import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -35,9 +34,9 @@ public interface RepositoryMetadata
{
int RELEASE = 1;
-
+
int SNAPSHOT = 2;
-
+
int RELEASE_OR_SNAPSHOT = RELEASE | SNAPSHOT;
/**
@@ -73,19 +72,19 @@ public interface RepositoryMetadata
*
* @return if it is a snapshot
*/
- boolean isSnapshot();
+ boolean isSnapshot();
/**
* Gets the artifact quality this metadata refers to. One of {...@link
#RELEASE}, {...@link #SNAPSHOT} or
* {...@link #RELEASE_OR_SNAPSHOT}.
- *
- * @return The artifact qualitiy this metadata refers to.
+ *
+ * @return The artifact quality this metadata refers to.
*/
int getNature();
/**
* Gets the policy that applies to this metadata regarding the specified
repository.
- *
+ *
* @param repository The repository for which to determine the policy,
must not be {...@code null}.
* @return The policy, never {...@code null}.
*/
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java?rev=950240&r1=950239&r2=950240&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
Tue Jun 1 20:39:34 2010
@@ -225,9 +225,8 @@ public class ResolutionNode
boolean success = true;
if ( filter != null )
{
- for ( Iterator i = getTrail().iterator(); i.hasNext() && success; )
+ for ( Artifact artifact : getTrail() )
{
- Artifact artifact = (Artifact) i.next();
if ( !filter.include( artifact ) )
{
success = false;
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=950240&r1=950239&r2=950240&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Tue Jun 1 20:39:34 2010
@@ -61,7 +61,7 @@ public interface MavenExecutionRequest
// Reactor Failure Mode
// ----------------------------------------------------------------------
- static final String REACTOR_FAIL_FAST = "FAIL_FAST";
+ static final String REACTOR_FAIL_FAST = "FAIL_FAST";
static final String REACTOR_FAIL_AT_END = "FAIL_AT_END";
@@ -78,7 +78,7 @@ public interface MavenExecutionRequest
static final String REACTOR_MAKE_BOTH = "make-both";
// ----------------------------------------------------------------------
- // Artifactr repository policies
+ // Artifact repository policies
// ----------------------------------------------------------------------
static final String CHECKSUM_POLICY_FAIL =
ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL;
@@ -106,7 +106,7 @@ public interface MavenExecutionRequest
/**
* Sets the system properties to use for interpolation and profile
activation. The system properties are collected
* from the runtime environment like {...@link System#getProperties()} and
environment variables.
- *
+ *
* @param systemProperties The system properties, may be {...@code null}.
* @return This request, never {...@code null}.
*/
@@ -115,7 +115,7 @@ public interface MavenExecutionRequest
/**
* Gets the system properties to use for interpolation and profile
activation. The system properties are collected
* from the runtime environment like {...@link System#getProperties()} and
environment variables.
- *
+ *
* @return The system properties, never {...@code null}.
*/
Properties getSystemProperties();
@@ -124,7 +124,7 @@ public interface MavenExecutionRequest
* Sets the user properties to use for interpolation and profile
activation. The user properties have been
* configured directly by the user on his discretion, e.g. via the
{...@code -Dkey=value} parameter on the command
* line.
- *
+ *
* @param userProperties The user properties, may be {...@code null}.
* @return This request, never {...@code null}.
*/
@@ -134,7 +134,7 @@ public interface MavenExecutionRequest
* Gets the user properties to use for interpolation and profile
activation. The user properties have been
* configured directly by the user on his discretion, e.g. via the
{...@code -Dkey=value} parameter on the command
* line.
- *
+ *
* @return The user properties, never {...@code null}.
*/
Properties getUserProperties();
@@ -251,12 +251,12 @@ public interface MavenExecutionRequest
MavenExecutionRequest addRemoteRepository( ArtifactRepository repository );
MavenExecutionRequest addPluginArtifactRepository( ArtifactRepository
repository );
-
+
/**
* Set a new list of remote repositories to use the execution request.
This is necessary if you perform
* transformations on the remote repositories being used. For example if
you replace existing repositories with
* mirrors then it's easier to just replace the whole list with a new list
of transformed repositories.
- *
+ *
* @param repositories
* @return
*/
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java?rev=950240&r1=950239&r2=950240&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
Tue Jun 1 20:39:34 2010
@@ -22,7 +22,6 @@ package org.apache.maven.execution;
import java.util.List;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.exception.ExceptionSummary;
import org.apache.maven.project.MavenProject;
/**
@@ -52,7 +51,7 @@ public interface MavenExecutionResult
/**
* Gets the build summary for the specified project.
- *
+ *
* @param project The project to get the build summary for, must not be
{...@code null}.
* @return The build summary for the project or {...@code null} if the
project has not been built (yet).
*/
@@ -60,7 +59,7 @@ public interface MavenExecutionResult
/**
* Add the specified build summary.
- *
+ *
* @param summary The build summary to add, must not be {...@code null}.
*/
void addBuildSummary( BuildSummary summary );
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=950240&r1=950239&r2=950240&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
Tue Jun 1 20:39:34 2010
@@ -21,10 +21,7 @@ package org.apache.maven.execution;
import java.io.File;
import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
import java.util.Date;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
