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

o Added generics 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749586 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-03-03 11:48:20 +00:00
parent 13680356a5
commit aa74529144
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
View File

@ -193,7 +193,7 @@ public class DefaultMavenExecutionRequestPopulator
request.setPluginGroups( settings.getPluginGroups() );
List settingsProfiles = settings.getProfiles();
List<org.apache.maven.settings.Profile> settingsProfiles = settings.getProfiles();
List<String> settingsActiveProfileIds = settings.getActiveProfiles();
@ -207,9 +207,9 @@ public class DefaultMavenExecutionRequestPopulator
if ( ( settingsProfiles != null ) && !settingsProfiles.isEmpty() )
{
for ( Iterator it = settings.getProfiles().iterator(); it.hasNext(); )
for ( Iterator<org.apache.maven.settings.Profile> it = settings.getProfiles().iterator(); it.hasNext(); )
{
org.apache.maven.settings.Profile rawProfile = (org.apache.maven.settings.Profile) it.next();
org.apache.maven.settings.Profile rawProfile = it.next();
Profile profile = SettingsUtils.convertFromSettingsProfile( rawProfile );
@ -217,9 +217,9 @@ public class DefaultMavenExecutionRequestPopulator
// We need to convert profile repositories to artifact repositories
for ( Iterator j = profile.getRepositories().iterator(); j.hasNext(); )
for ( Iterator<Repository> j = profile.getRepositories().iterator(); j.hasNext(); )
{
Repository r = (Repository) j.next();
Repository r = j.next();
ArtifactRepository ar;
try
@ -432,9 +432,9 @@ public class DefaultMavenExecutionRequestPopulator
repositorySystem.addProxy( proxy.getProtocol(), proxy.getHost(), proxy.getPort(), proxy.getUsername(), proxy.getPassword(), proxy.getNonProxyHosts() );
}
for ( Iterator i = settings.getServers().iterator(); i.hasNext(); )
for ( Iterator<Server> i = settings.getServers().iterator(); i.hasNext(); )
{
Server server = (Server) i.next();
Server server = i.next();
String pass;
String phrase;
@ -455,9 +455,9 @@ public class DefaultMavenExecutionRequestPopulator
RepositoryPermissions defaultPermissions = new RepositoryPermissions();
for ( Iterator i = settings.getMirrors().iterator(); i.hasNext(); )
for ( Iterator<Mirror> i = settings.getMirrors().iterator(); i.hasNext(); )
{
Mirror mirror = (Mirror) i.next();
Mirror mirror = i.next();
repositorySystem.addMirror( mirror.getId(), mirror.getMirrorOf(), mirror.getUrl() );
}
@ -469,7 +469,6 @@ public class DefaultMavenExecutionRequestPopulator
* @param settings settings to process
* @throws IOException
*/
@SuppressWarnings("unchecked")
private void decrypt( Settings settings )
throws IOException
{