svn commit: r934853 - in /maven/maven-3/trunk/maven-model-builder/src: main/java/org/apache/maven/model/validation/DefaultModelValidator.java test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java

[bentmann]

Author: bentmann
Date: Fri Apr 16 12:50:18 2010
New Revision: 934853

URL: http://svn.apache.org/viewvc?rev=934853&view=rev
Log:
o Improved validation messages

Modified:
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
    
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=934853&r1=934852&r2=934853&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
 Fri Apr 16 12:50:18 2010
@@ -196,11 +196,12 @@ public class DefaultModelValidator
                     + "' is invalid. Aggregator projects " + "require 'pom' as 
packaging." );
             }
 
-            for ( String module : model.getModules() )
+            for ( int i = 0, n = model.getModules().size(); i < n; i++ )
             {
+                String module = model.getModules().get( i );
                 if ( StringUtils.isBlank( module ) )
                 {
-                    addViolation( problems, Severity.WARNING, 
"modules.module", null,
+                    addViolation( problems, Severity.WARNING, 
"modules.module[" + i + "]", null,
                                   "has been specified without a path to the 
project directory." );
                 }
             }
@@ -221,12 +222,13 @@ public class DefaultModelValidator
         if ( request.getValidationLevel() >= 
ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 )
         {
             Set<String> modules = new HashSet<String>();
-            for ( String module : model.getModules() )
+            for ( int i = 0, n = model.getModules().size(); i < n; i++ )
             {
+                String module = model.getModules().get( i );
                 if ( !modules.add( module ) )
                 {
-                    addViolation( problems, Severity.ERROR, "modules.module", 
null, "specifies duplicate child module "
-                        + module );
+                    addViolation( problems, Severity.ERROR, "modules.module[" 
+ i + "]", null,
+                                  "specifies duplicate child module " + module 
);
                 }
             }
 

Modified: 
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java?rev=934853&r1=934852&r2=934853&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
 Fri Apr 16 12:50:18 2010
@@ -420,7 +420,7 @@ public class DefaultModelValidatorTest
 
         assertViolations( result, 0, 0, 1 );
 
-        assertTrue( result.getWarnings().get( 0 ).contains( "'modules.module' 
has been specified without a path" ) );
+        assertTrue( result.getWarnings().get( 0 ).contains( 
"'modules.module[0]' has been specified without a path" ) );
     }
 
     public void testDuplicatePlugin()