Author: rfscholte
Date: Sun Jan 8 12:59:53 2012
New Revision: 1228836
URL: http://svn.apache.org/viewvc?rev=1228836&view=rev
Log:
Add generics
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java?rev=1228836&r1=1228835&r2=1228836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
Sun Jan 8 12:59:53 2012
@@ -97,7 +97,8 @@ public abstract class AbstractEarModule
this.earExecutionContext = earExecutionContext;
}
- public void resolveArtifact( Set artifacts )
+ /** {@inheritDoc} */
+ public void resolveArtifact( Set<Artifact> artifacts )
throws EarPluginException, MojoFailureException
{
// If the artifact is already set no need to resolve it
@@ -114,7 +115,8 @@ public abstract class AbstractEarModule
// Artifact has not been found
if ( artifact == null )
{
- Set candidates = ar.getArtifacts( groupId, artifactId,
getType() );
+ @SuppressWarnings( "unchecked" )
+ Set<Artifact> candidates = ar.getArtifacts( groupId,
artifactId, getType() );
if ( candidates.size() > 1 )
{
throw new MojoFailureException( "Artifact[" + this + "]
has " + candidates.size()
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=1228836&r1=1228835&r2=1228836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
Sun Jan 8 12:59:53 2012
@@ -19,6 +19,11 @@ package org.apache.maven.plugin.ear;
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.plugin.AbstractMojo;
@@ -30,12 +35,6 @@ import org.apache.maven.project.MavenPro
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
/**
* A base class for EAR-processing related tasks.
*
@@ -141,12 +140,13 @@ public abstract class AbstractEarMojo
*/
private String mainArtifactId = "none";
- private List earModules;
+ private List<EarModule> earModules;
- private List allModules;
+ private List<EarModule> allModules;
private JbossConfiguration jbossConfiguration;
+ @SuppressWarnings( "unchecked" )
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -183,7 +183,7 @@ public abstract class AbstractEarMojo
typeMappingService );
getLog().debug( "Resolving ear modules ..." );
- allModules = new ArrayList();
+ allModules = new ArrayList<EarModule>();
try
{
if ( modules != null && modules.length > 0 )
@@ -202,11 +202,9 @@ public abstract class AbstractEarMojo
}
// Let's add other modules
- Set artifacts = project.getArtifacts();
- for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
+ Set<Artifact> artifacts = project.getArtifacts();
+ for ( Artifact artifact : artifacts )
{
- Artifact artifact = (Artifact) iter.next();
-
// If the artifact's type is POM, ignore and continue
// since it's used for transitive deps only.
if ( "pom".equals( artifact.getType() ) )
@@ -233,10 +231,9 @@ public abstract class AbstractEarMojo
}
// Now we have everything let's built modules which have not been
excluded
- earModules = new ArrayList();
- for ( Iterator iter = allModules.iterator(); iter.hasNext(); )
+ earModules = new ArrayList<EarModule>();
+ for ( EarModule earModule : allModules )
{
- EarModule earModule = (EarModule) iter.next();
if ( earModule.isExcluded() )
{
getLog().debug( "Skipping ear module[" + earModule + "]" );
@@ -249,7 +246,7 @@ public abstract class AbstractEarMojo
}
- protected List getModules()
+ protected List<EarModule> getModules()
{
if ( earModules == null )
{
@@ -273,12 +270,10 @@ public abstract class AbstractEarMojo
return jbossConfiguration;
}
- private static boolean isArtifactRegistered( Artifact a, List currentList )
+ private static boolean isArtifactRegistered( Artifact a, List<EarModule>
currentList )
{
- Iterator i = currentList.iterator();
- while ( i.hasNext() )
+ for( EarModule em : currentList )
{
- EarModule em = (EarModule) i.next();
if ( em.getArtifact().equals( a ) )
{
return true;
@@ -326,7 +321,7 @@ public abstract class AbstractEarMojo
final String jmxName = jboss.getChild(
JbossConfiguration.JMX_NAME ).getValue();
final String moduleOrder = jboss.getChild(
JbossConfiguration.MODULE_ORDER ).getValue();
- final List dataSources = new ArrayList();
+ final List<String> dataSources = new ArrayList<String>();
final PlexusConfiguration dataSourcesEl = jboss.getChild(
JbossConfiguration.DATASOURCES );
if ( dataSourcesEl != null )
{
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java?rev=1228836&r1=1228835&r2=1228836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
Sun Jan 8 12:59:53 2012
@@ -33,9 +33,9 @@ class ApplicationXmlWriterContext
private final File destinationFile;
- private final List earModules;
+ private final List<EarModule> earModules;
- private final List securityRoles;
+ private final List<SecurityRole> securityRoles;
private final String displayName;
@@ -47,7 +47,7 @@ class ApplicationXmlWriterContext
private final Boolean initializeInOrder;
- public ApplicationXmlWriterContext( File destinationFile, List earModules,
List securityRoles, String displayName,
+ public ApplicationXmlWriterContext( File destinationFile, List<EarModule>
earModules, List<SecurityRole> securityRoles, String displayName,
String description, String
libraryDirectory, String applicationName,
Boolean initializeInOrder )
{
@@ -76,7 +76,7 @@ class ApplicationXmlWriterContext
*
* @return the ear modules
*/
- public List getEarModules()
+ public List<EarModule> getEarModules()
{
return earModules;
}
@@ -86,7 +86,7 @@ class ApplicationXmlWriterContext
*
* @return the security roles
*/
- public List getSecurityRoles()
+ public List<SecurityRole> getSecurityRoles()
{
return securityRoles;
}
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java?rev=1228836&r1=1228835&r2=1228836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java
Sun Jan 8 12:59:53 2012
@@ -106,7 +106,7 @@ public interface EarModule
* @throws EarPluginException if the artifact could not be resolved
* @throws MojoFailureException if an unexpected error occurred
*/
- public void resolveArtifact( Set artifacts )
+ public void resolveArtifact( Set<Artifact> artifacts )
throws EarPluginException, MojoFailureException;
public void setEarExecutionContext( EarExecutionContext
earExecutionContext );
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java?rev=1228836&r1=1228835&r2=1228836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
Sun Jan 8 12:59:53 2012
@@ -35,11 +35,11 @@ import java.util.List;
*/
public final class EarModuleFactory
{
- public static final List standardArtifactTypes;
+ public static final List<String> standardArtifactTypes;
static
{
- List temp = new ArrayList();
+ List<String> temp = new ArrayList<String>();
temp.add( "jar" );
temp.add( "ejb" );
temp.add( "ejb3" );
@@ -138,7 +138,7 @@ public final class EarModuleFactory
*
* @return the standard artifact types
*/
- public static List getStandardArtifactTypes()
+ public static List<String> getStandardArtifactTypes()
{
return standardArtifactTypes;
}
