You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2009/08/16 00:17:35 UTC
svn commit: r804536 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
Author: hboutemy
Date: Sat Aug 15 22:17:35 2009
New Revision: 804536
URL: http://svn.apache.org/viewvc?rev=804536&view=rev
Log:
use Java 5 generics
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java?rev=804536&r1=804535&r2=804536&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java Sat Aug 15 22:17:35 2009
@@ -19,7 +19,6 @@
* under the License.
*/
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.settings.Profile;
@@ -37,28 +36,24 @@
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 @@
result.addMessage( "'" + fieldName + "' is missing." );
}
-
return false;
}