svn commit: r983198 - in /maven/maven-3/trunk: maven-model-builder/src/main/java/org/apache/maven/model/profile/ maven-model-builder/src/main/java/org/apache/maven/model/resolution/ maven-settings-builder/src/main/java/org/apache/maven/settings/building/

[be...@apache.org]

Author: bentmann
Date: Sat Aug  7 10:29:09 2010
New Revision: 983198

URL: http://svn.apache.org/viewvc?rev=983198&view=rev
Log:
o Fixed javadoc

Modified:
    maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java
    maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
    maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
    maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java

Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java?rev=983198&r1=983197&r2=983198&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java Sat Aug  7 10:29:09 2010
@@ -103,7 +103,7 @@ public class DefaultProfileActivationCon
      * 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 executionProperties The execution properties, may be {@code null}.
+     * @param systemProperties The system properties, may be {@code null}.
      * @return This context, never {@code null}.
      */
     @SuppressWarnings( "unchecked" )
@@ -125,7 +125,7 @@ public class DefaultProfileActivationCon
      * 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 executionProperties The execution properties, may be {@code null}.
+     * @param systemProperties The system properties, may be {@code null}.
      * @return This context, never {@code null}.
      */
     public DefaultProfileActivationContext setSystemProperties( Map<String, String> systemProperties )

Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java?rev=983198&r1=983197&r2=983198&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java Sat Aug  7 10:29:09 2010
@@ -23,9 +23,9 @@ import org.apache.maven.model.Repository
 import org.apache.maven.model.building.ModelSource;
 
 /**
- * Resolves a POM from its coordinates. During the build process, the {@link ModelBuilder} will add any relevant
- * repositories to the model resolver. In other words, the model resolver is stateful and should not be reused across
- * multiple model building requests.
+ * Resolves a POM from its coordinates. During the build process, the
+ * {@link org.apache.maven.model.building.ModelBuilder} will add any relevant repositories to the model resolver. In
+ * other words, the model resolver is stateful and should not be reused across multiple model building requests.
  *
  * @author Benjamin Bentmann
  */

Modified: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java?rev=983198&r1=983197&r2=983198&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java (original)
+++ maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java Sat Aug  7 10:29:09 2010
@@ -46,7 +46,8 @@ public class DefaultSettingsProblem
      * Creates a new problem with the specified message and exception.
      * 
      * @param message The message describing the problem, may be {@code null}.
-     * @param severity The severity level of the problem, may be {@code null} to default to {@link Severity#ERROR}.
+     * @param severity The severity level of the problem, may be {@code null} to default to
+     *            {@link SettingsProblem.Severity#ERROR}.
      * @param source A hint about the source of the problem like a file path, may be {@code null}.
      * @param lineNumber The one-based index of the line containing the problem or {@code -1} if unknown.
      * @param columnNumber The one-based index of the column containing the problem or {@code -1} if unknown.

Modified: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java?rev=983198&r1=983197&r2=983198&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java (original)
+++ maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java Sat Aug  7 10:29:09 2010
@@ -40,7 +40,6 @@ public class SettingsBuildingException
     /**
      * Creates a new exception with the specified problems.
      * 
-     * @param modelId The identifier of the model that could not be built, may be {@code null}.
      * @param problems The problems that causes this exception, may be {@code null}.
      */
     public SettingsBuildingException( List<SettingsProblem> problems )