Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Generified code 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778408 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-05-25 12:39:30 +00:00
parent 9944592242
commit dbe356a8e6
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
View File

@ -20,7 +20,6 @@ package org.apache.maven.project.validation;
*/
import java.io.File;
import java.util.Iterator;
import java.util.List;
import org.apache.maven.artifact.Artifact;
@ -82,10 +81,8 @@ public class DefaultModelValidator
validateStringNotEmpty( "version", result, model.getVersion() );
for ( Iterator it = model.getDependencies().iterator(); it.hasNext(); )
for ( Dependency d : model.getDependencies() )
{
Dependency d = (Dependency) it.next();
validateId( "dependencies.dependency.artifactId", result, d.getArtifactId() );
validateId( "dependencies.dependency.groupId", result, d.getGroupId() );
@ -122,10 +119,8 @@ public class DefaultModelValidator
DependencyManagement mgmt = model.getDependencyManagement();
if ( mgmt != null )
{
for ( Iterator it = mgmt.getDependencies().iterator(); it.hasNext(); )
for ( Dependency d : mgmt.getDependencies() )
{
Dependency d = (Dependency) it.next();
validateSubElementStringNotEmpty( d, "dependencyManagement.dependencies.dependency.artifactId", result,
d.getArtifactId() );
@ -161,10 +156,8 @@ public class DefaultModelValidator
Build build = model.getBuild();
if ( build != null )
{
for ( Iterator it = build.getPlugins().iterator(); it.hasNext(); )
for ( Plugin p : build.getPlugins() )
{
Plugin p = (Plugin) it.next();
validateStringNotEmpty( "build.plugins.plugin.artifactId", result, p.getArtifactId() );
validateStringNotEmpty( "build.plugins.plugin.groupId", result, p.getGroupId() );
@ -177,17 +170,13 @@ public class DefaultModelValidator
*/
}
for ( Iterator it = build.getResources().iterator(); it.hasNext(); )
for ( Resource r : build.getResources() )
{
Resource r = (Resource) it.next();
validateStringNotEmpty( "build.resources.resource.directory", result, r.getDirectory() );
}
for ( Iterator it = build.getTestResources().iterator(); it.hasNext(); )
for ( Resource r : build.getTestResources() )
{
Resource r = (Resource) it.next();
validateStringNotEmpty( "build.testResources.testResource.directory", result, r.getDirectory() );
}
}
@ -195,10 +184,8 @@ public class DefaultModelValidator
Reporting reporting = model.getReporting();
if ( reporting != null )
{
for ( Iterator it = reporting.getPlugins().iterator(); it.hasNext(); )
for ( ReportPlugin p : reporting.getPlugins())
{
ReportPlugin p = (ReportPlugin) it.next();
validateStringNotEmpty( "reporting.plugins.plugin.artifactId", result, p.getArtifactId() );
validateStringNotEmpty( "reporting.plugins.plugin.groupId", result, p.getGroupId() );
@ -231,12 +218,10 @@ public class DefaultModelValidator
}
}
private void validateRepositories( ModelValidationResult result, List repositories, String prefix )
private void validateRepositories( ModelValidationResult result, List<Repository> repositories, String prefix )
{
for ( Iterator it = repositories.iterator(); it.hasNext(); )
for ( Repository repository : repositories )
{
Repository repository = (Repository) it.next();
validateStringNotEmpty( prefix + ".id", result, repository.getId() );
validateStringNotEmpty( prefix + ".url", result, repository.getUrl() );
@ -249,14 +234,12 @@ public class DefaultModelValidator
if ( build != null )
{
List plugins = build.getPlugins();
List<Plugin> plugins = build.getPlugins();
if ( plugins != null )
{
for ( Iterator it = plugins.iterator(); it.hasNext(); )
for ( Plugin plugin : plugins )
{
Plugin plugin = (Plugin) it.next();
// this will force an IllegalStateException, even if we don't have to do inheritance assembly.
try
{