From d8a1cb1b9a7cc729af6e4e1cc987d8e72208f180 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 16 Apr 2010 12:50:18 +0000 Subject: [PATCH] o Improved validation messages git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934853 13f79535-47bb-0310-9956-ffa450edef68 --- .../model/validation/DefaultModelValidator.java | 12 +++++++----- .../model/validation/DefaultModelValidatorTest.java | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index 1cb1c695c8..fa262c89aa 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java @@ -196,11 +196,12 @@ public void validateEffectiveModel( Model model, ModelBuildingRequest request, M + "' 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 void validateEffectiveModel( Model model, ModelBuildingRequest request, M if ( request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 ) { Set modules = new HashSet(); - 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 ); } } diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java index 76297c6e41..456d46ebad 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java @@ -420,7 +420,7 @@ public void testEmptyModule() 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()