svn commit: r813423 - in /maven/maven-2/branches/maven-2.2.x/maven-settings/src/main/java/org/apache/maven/settings: DefaultMavenSettingsBuilder.java RuntimeInfo.java

[hboutemy]

Author: hboutemy
Date: Thu Sep 10 13:20:16 2009
New Revision: 813423

URL: http://svn.apache.org/viewvc?rev=813423&view=rev
Log:
use Java 5 generics

Modified:
    
maven/maven-2/branches/maven-2.2.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
    
maven/maven-2/branches/maven-2.2.x/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java

Modified: 
maven/maven-2/branches/maven-2.2.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=813423&r1=813422&r2=813423&view=diff
==============================================================================
--- 
maven/maven-2/branches/maven-2.2.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 (original)
+++ 
maven/maven-2/branches/maven-2.2.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 Thu Sep 10 13:20:16 2009
@@ -34,7 +34,6 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -189,9 +188,8 @@
     {
         List<String> activeProfiles = settings.getActiveProfiles();
 
-        for ( Iterator profiles = settings.getProfiles().iterator(); 
profiles.hasNext(); )
+        for ( Profile profile : settings.getProfiles() )
         {
-            Profile profile = (Profile) profiles.next();
             if ( profile.getActivation() != null && 
profile.getActivation().isActiveByDefault()
                 && !activeProfiles.contains( profile.getId() ) )
             {

Modified: 
maven/maven-2/branches/maven-2.2.x/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java
URL: 
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java?rev=813423&r1=813422&r2=813423&view=diff
==============================================================================
--- 
maven/maven-2/branches/maven-2.2.x/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java
 (original)
+++ 
maven/maven-2/branches/maven-2.2.x/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java
 Thu Sep 10 13:20:16 2009
@@ -43,11 +43,11 @@
     // using Boolean for 3VL (null for not-set, otherwise override with value)
 //    private Boolean checkLatest;
 
-    private Map activeProfileToSourceLevel = new HashMap();
+    private Map<String, String> activeProfileToSourceLevel = new 
HashMap<String, String>();
 
     private String localRepositorySourceLevel = TrackableBase.USER_LEVEL;
 
-    private Map pluginGroupIdSourceLevels = new HashMap();
+    private Map<String, String> pluginGroupIdSourceLevels = new 
HashMap<String, String>();
 
     private final Settings settings;