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 2013/11/11 17:48:01 UTC
svn commit: r1540767 -
/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Author: hboutemy
Date: Mon Nov 11 16:48:01 2013
New Revision: 1540767
URL: http://svn.apache.org/r1540767
Log:
code formatting and typed collections
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Modified: maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1540767&r1=1540766&r2=1540767&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java (original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java Mon Nov 11 16:48:01 2013
@@ -194,30 +194,33 @@ public abstract class AbstractJarsignerM
if ( processAttachedArtifacts && !Boolean.FALSE.equals( attachments ) )
{
- Collection includes = new HashSet();
+ Collection<String> includes = new HashSet<String>();
if ( includeClassifiers != null )
{
includes.addAll( Arrays.asList( includeClassifiers ) );
}
- Collection excludes = new HashSet();
+ Collection<String> excludes = new HashSet<String>();
if ( excludeClassifiers != null )
{
excludes.addAll( Arrays.asList( excludeClassifiers ) );
}
- for (Object o : this.project.getAttachedArtifacts()) {
+ for ( Object o : this.project.getAttachedArtifacts() )
+ {
final Artifact artifact = (Artifact) o;
- if (!includes.isEmpty() && !includes.contains(artifact.getClassifier())) {
+ if ( !includes.isEmpty() && !includes.contains( artifact.getClassifier() ) )
+ {
continue;
}
- if (excludes.contains(artifact.getClassifier())) {
+ if ( excludes.contains( artifact.getClassifier() ) )
+ {
continue;
}
- processed += processArtifact(artifact) ? 1 : 0;
+ processed += processArtifact( artifact ) ? 1 : 0;
}
}
else
@@ -237,7 +240,7 @@ public abstract class AbstractJarsignerM
String includeList = ( includes != null ) ? StringUtils.join( includes, "," ) : null;
String excludeList = ( excludes != null ) ? StringUtils.join( excludes, "," ) : null;
- List jarFiles;
+ List<File> jarFiles;
try
{
jarFiles = FileUtils.getFiles( archiveDirectory, includeList, excludeList );
@@ -248,10 +251,9 @@ public abstract class AbstractJarsignerM
"Failed to scan archive directory for JARs: " + e.getMessage(), e );
}
- for (Object jarFile1 : jarFiles) {
- File jarFile = (File) jarFile1;
-
- processArchive(jarFile);
+ for ( File jarFile : jarFiles )
+ {
+ processArchive( jarFile );
processed++;
}
}