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

use Java 5 generics 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@804536 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Herve Boutemy 2009-08-15 22:17:35 +00:00
parent 3acee5c76e
commit 86ccde3549
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
View File

@ -19,7 +19,6 @@ package org.apache.maven.settings.validation;
* under the License.
*/
import java.util.Iterator;
import java.util.List;
import org.apache.maven.settings.Profile;
@ -37,28 +36,24 @@ public class DefaultSettingsValidator
public SettingsValidationResult validate( Settings model )
{
SettingsValidationResult result = new SettingsValidationResult();
List profiles = model.getProfiles();
if (profiles != null) {
Iterator it = profiles.iterator();
while (it.hasNext()) {
Profile prof = (Profile)it.next();
List<Profile> profiles = model.getProfiles();
if ( profiles != null )
{
for (Profile prof : profiles )
{
validateRepositories( result, prof.getRepositories(), "repositories.repository" );
validateRepositories( result, prof.getPluginRepositories(), "pluginRepositories.pluginRepository" );
}
}
return result;
}
private void validateRepositories( SettingsValidationResult result, List repositories, String prefix )
private void validateRepositories( SettingsValidationResult 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() );
@ -106,7 +101,6 @@ public class DefaultSettingsValidator
result.addMessage( "'" + fieldName + "' is missing." );
}
return false;
}