maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1517569 [2/3] - in /maven/plugins/trunk: maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/ maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/ maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/arc...
Date Mon, 26 Aug 2013 15:49:35 GMT
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java Mon Aug 26 15:49:32 2013
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.eclipse;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Resource;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java Mon Aug 26 15:49:32 2013
@@ -461,7 +461,7 @@ public class ReadWorkspaceLocations
                     String vmId = aVm.getAttribute("id").trim();
                     String classpathEntry =
                             MessageFormat.format(ReadWorkspaceLocations.CLASSPATHENTRY_FORMAT,
-                                    new Object[]{typeId, name});
+                                    typeId, name);
                     String jrePath = new File(path).getCanonicalPath();
                     File rtJarFile = new File(new File(jrePath), "jre/lib/rt.jar");
                     if (!rtJarFile.exists()) {

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java Mon Aug 26 15:49:32 2013
@@ -24,7 +24,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java Mon Aug 26 15:49:32 2013
@@ -26,7 +26,6 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseLaunchConfigurationWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseLaunchConfigurationWriter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseLaunchConfigurationWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseLaunchConfigurationWriter.java Mon Aug 26 15:49:32 2013
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.maven.plugin.MojoExecutionException;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java Mon Aug 26 15:49:32 2013
@@ -177,7 +177,7 @@ public class EclipseOSGiManifestWriter
                 }
                 else
                 {
-                    manifestSb.append( line + NEWLINE );
+                    manifestSb.append(line).append(NEWLINE);
                 }
             }
 
@@ -249,7 +249,7 @@ public class EclipseOSGiManifestWriter
 
                 log.debug("Adding artifact to manifest: " + dep.getArtifactId());
 
-                bundleClasspathSb.append(" " + dep.getFile().getName());
+                bundleClasspathSb.append(" ").append(dep.getFile().getName());
             }
         }
         // only insert the name of the property if there are local libraries

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java Mon Aug 26 15:49:32 2013
@@ -27,7 +27,6 @@ import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseHibernateWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseHibernateWriter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseHibernateWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseHibernateWriter.java Mon Aug 26 15:49:32 2013
@@ -169,10 +169,7 @@ public class MyEclipseHibernateWriter
      */
     private String makePathToHibernateConfigFile( String configFile )
     {
-        StringBuilder sb = new StringBuilder( 64 );
 
-        sb.append( "/" ).append( config.getProject().getArtifactId() ).append( "/" ).append( configFile );
-
-        return sb.toString();
+        return "/" + config.getProject().getArtifactId() + "/" + configFile;
     }
 }
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java Mon Aug 26 15:49:32 2013
@@ -7,7 +7,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.maven.plugin.MojoExecutionException;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java Mon Aug 26 15:49:32 2013
@@ -19,7 +19,6 @@
 package org.apache.maven.plugin.eclipse.writers.rad;
 
 import java.io.File;
-import java.util.Iterator;
 
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.MojoExecutionException;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java Mon Aug 26 15:49:32 2013
@@ -23,7 +23,6 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java Mon Aug 26 15:49:32 2013
@@ -23,7 +23,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.util.Iterator;
 import java.util.Map.Entry;
 
 import org.apache.maven.plugin.MojoExecutionException;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java Mon Aug 26 15:49:32 2013
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java Mon Aug 26 15:49:32 2013
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.ide;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.maven.artifact.Artifact;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java Mon Aug 26 15:49:32 2013
@@ -19,7 +19,6 @@
 package org.apache.maven.plugin.ide;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.maven.project.MavenProject;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java Mon Aug 26 15:49:32 2013
@@ -27,7 +27,6 @@ import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -708,7 +707,7 @@ public abstract class AbstractEclipsePlu
 
     protected void assertContains( String message, String full, String substring )
     {
-        if ( full == null || full.indexOf( substring ) == -1 )
+        if ( full == null || !full.contains(substring))
         {
             StringBuilder buf = new StringBuilder();
             if ( message != null )

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java Mon Aug 26 15:49:32 2013
@@ -22,7 +22,6 @@ import java.io.File;
 import java.io.IOException;
 import java.net.JarURLConnection;
 import java.net.URL;
-import java.util.Iterator;
 
 import junit.framework.TestCase;
 

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15WriterTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15WriterTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15WriterTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15WriterTest.java Mon Aug 26 15:49:32 2013
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.eclipse.
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
 
 import junit.framework.TestCase;
 

Modified: maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java Mon Aug 26 15:49:32 2013
@@ -226,14 +226,14 @@ public class MavenProjectBuildStub
         File currentDirectory;
 
         for (Object aDirectoryList : directoryList) {
-            currentDirectory = new File(parent, "/" + (String) aDirectoryList);
+            currentDirectory = new File(parent, "/" + aDirectoryList);
 
             if (!currentDirectory.exists()) {
                 currentDirectory.mkdirs();
             }
 
             // duplicate dir structure in test resources
-            currentDirectory = new File(testparent, "/" + (String) aDirectoryList);
+            currentDirectory = new File(testparent, "/" + aDirectoryList);
 
             if (!currentDirectory.exists()) {
                 currentDirectory.mkdirs();

Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java Mon Aug 26 15:49:32 2013
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.gpg;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.maven.artifact.Artifact;

Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java Mon Aug 26 15:49:32 2013
@@ -38,7 +38,6 @@ import org.apache.maven.plugins.annotati
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
-import org.apache.maven.project.artifact.AttachedArtifact;
 import org.apache.maven.project.artifact.ProjectArtifactMetadata;
 import org.apache.maven.project.validation.ModelValidationResult;
 import org.apache.maven.project.validation.ModelValidator;
@@ -54,7 +53,6 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 

Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java Mon Aug 26 15:49:32 2013
@@ -74,8 +74,8 @@ public class ActiveProfilesMojo
         if ( output != null )
         {
             StringBuilder sb = new StringBuilder();
-            sb.append( "Created by: " + getClass().getName() ).append( "\n" );
-            sb.append( "Created on: " + new Date() ).append( "\n" ).append( "\n" );
+            sb.append("Created by: ").append(getClass().getName()).append("\n");
+            sb.append("Created on: ").append(new Date()).append("\n").append( "\n" );
             sb.append( message.toString() );
 
             try
@@ -139,7 +139,7 @@ public class ActiveProfilesMojo
 
         message.append( "\n" );
 
-        message.append( "Active Profiles for Project \'" + project.getId() + "\': \n\n" );
+        message.append("Active Profiles for Project \'").append(project.getId()).append("\': \n\n");
 
         if ( activeProfileIds.isEmpty() )
         {

Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java Mon Aug 26 15:49:32 2013
@@ -397,19 +397,9 @@ public class DescribeMojo
         }
         else
         {
-            StringBuilder msg = new StringBuilder();
-            msg.append( "You must specify either: both 'groupId' and 'artifactId' parameters OR a 'plugin' parameter"
-                            + " OR a 'cmd' parameter. For instance:\n" );
-            msg.append( "  # mvn help:describe -Dcmd=install\n" );
-            msg.append( "or\n" );
-            msg.append( "  # mvn help:describe -Dcmd=help:describe\n" );
-            msg.append( "or\n" );
-            msg.append( "  # mvn help:describe -Dplugin=org.apache.maven.plugins:maven-help-plugin\n" );
-            msg.append( "or\n" );
-            msg.append( "  # mvn help:describe -DgroupId=org.apache.maven.plugins -DartifactId=maven-help-plugin\n\n" );
-            msg.append( "Try 'mvn help:help -Ddetail=true' for more information." );
 
-            throw new MojoFailureException( msg.toString() );
+            throw new MojoFailureException(("You must specify either: both 'groupId' and 'artifactId' parameters OR a 'plugin' parameter"
+                    + " OR a 'cmd' parameter. For instance:\n") + "  # mvn help:describe -Dcmd=install\n" + "or\n" + "  # mvn help:describe -Dcmd=help:describe\n" + "or\n" + "  # mvn help:describe -Dplugin=org.apache.maven.plugins:maven-help-plugin\n" + "or\n" + "  # mvn help:describe -DgroupId=org.apache.maven.plugins -DartifactId=maven-help-plugin\n\n" + "Try 'mvn help:help -Ddetail=true' for more information.");
         }
 
         if ( descriptor == null && forLookup != null )
@@ -840,7 +830,7 @@ public class DescribeMojo
 
                 if ( lifecycle.getDefaultPhases() == null )
                 {
-                    descriptionBuffer.append( "'" + cmd + "' is a phase corresponding to this plugin:\n" );
+                    descriptionBuffer.append("'").append(cmd).append("' is a phase corresponding to this plugin:\n");
                     for ( String key : phases )
                     {
                         if ( !key.equals( cmd ) )
@@ -856,13 +846,11 @@ public class DescribeMojo
                     }
 
                     descriptionBuffer.append( "\n" );
-                    descriptionBuffer.append(
-                        "It is a part of the lifecycle for the POM packaging '" + project.getPackaging()
-                            + "'. This lifecycle includes the following phases:" );
+                    descriptionBuffer.append("It is a part of the lifecycle for the POM packaging '").append(project.getPackaging()).append("'. This lifecycle includes the following phases:");
                     descriptionBuffer.append( "\n" );
                     for ( String key : phases )
                     {
-                        descriptionBuffer.append( "* " + key + ": " );
+                        descriptionBuffer.append("* ").append(key).append(": ");
                         String value = (String) lifecycleMapping.getPhases( "default" ).get( key );
                         if ( StringUtils.isNotEmpty( value ) )
                         {
@@ -888,12 +876,12 @@ public class DescribeMojo
                 }
                 else
                 {
-                    descriptionBuffer.append( "'" + cmd + "' is a lifecycle with the following phases: " );
+                    descriptionBuffer.append("'").append(cmd).append("' is a lifecycle with the following phases: ");
                     descriptionBuffer.append( "\n" );
 
                     for ( String key : phases )
                     {
-                        descriptionBuffer.append( "* " + key + ": " );
+                        descriptionBuffer.append("* ").append(key).append(": ");
                         if ( lifecycle.getDefaultPhases().get( key ) != null )
                         {
                             descriptionBuffer.append( lifecycle.getDefaultPhases().get( key ) ).append( "\n" );
@@ -920,7 +908,7 @@ public class DescribeMojo
         // goals
         MojoDescriptor mojoDescriptor = HelpUtil.getMojoDescriptor( cmd, session, project, cmd, true, false );
 
-        descriptionBuffer.append( "'" + cmd + "' is a plugin goal (aka mojo)" ).append( ".\n" );
+        descriptionBuffer.append("'").append(cmd).append("' is a plugin goal (aka mojo)").append(".\n");
         plugin = mojoDescriptor.getPluginDescriptor().getId();
         goal = mojoDescriptor.getGoal();
 

Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java Mon Aug 26 15:49:32 2013
@@ -185,11 +185,8 @@ public class EvaluateMojo
     {
         if ( expression == null && !settings.isInteractiveMode() )
         {
-            StringBuilder msg = new StringBuilder();
-            msg.append( "Maven is configured to NOT interact with the user for input. " );
-            msg.append( "This Mojo requires that 'interactiveMode' in your settings file is flag to 'true'." );
 
-            getLog().error( msg.toString() );
+            getLog().error("Maven is configured to NOT interact with the user for input. " + "This Mojo requires that 'interactiveMode' in your settings file is flag to 'true'.");
             return;
         }
 

Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java Mon Aug 26 15:49:32 2013
@@ -82,8 +82,8 @@ public class HelpUtil
                                                                     Boolean.TYPE, Boolean.TYPE } );
             m.setAccessible( true );
             MojoDescriptor mojoDescriptor =
-                (MojoDescriptor) m.invoke( lifecycleExecutor, new Object[] { task, session, project, invokedVia,
-                        canUsePrefix, isOptionalMojo} );
+                (MojoDescriptor) m.invoke( lifecycleExecutor, task, session, project, invokedVia,
+                        canUsePrefix, isOptionalMojo);
 
             if ( mojoDescriptor == null )
             {

Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java Mon Aug 26 15:49:32 2013
@@ -26,7 +26,6 @@ import org.codehaus.plexus.util.cli.Comm
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.Properties;
 
 /**

Modified: maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java Mon Aug 26 15:49:32 2013
@@ -56,7 +56,7 @@ public class HelpUtilTest
                               describe.localRepository, // ArtifactRepository localRepository,
                               null, // EventDispatcher eventDispatcher,
                               null, // ReactorManager reactorManager,
-                              Arrays.asList( new String[] { "evaluate" } ),
+                              Arrays.asList("evaluate"),
                               describe.project.getBasedir().toString(), new Properties(),
                               Calendar.getInstance().getTime() );
         HelpUtil.getMojoDescriptor( "help:evaluate", session, describe.project, "help:evaluate", true, false );

Modified: maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java Mon Aug 26 15:49:32 2013
@@ -147,7 +147,7 @@ public class InterpolationTest
 
         InvokerMojo invokerMojo = new InvokerMojo();
         setVariableValueToObject( invokerMojo, "project", buildMavenProjectStub() );
-        setVariableValueToObject( invokerMojo, "profiles", Arrays.asList( new String[] { "zloug" } ) );
+        setVariableValueToObject( invokerMojo, "profiles", Arrays.asList("zloug") );
         setVariableValueToObject( invokerMojo, "profilesFile", "emptyProfiles.txt" );
         setVariableValueToObject( invokerMojo, "settings", new Settings() );
         String dirPath = getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar
@@ -163,7 +163,7 @@ public class InterpolationTest
     {
 
         InvokerMojo invokerMojo = new InvokerMojo();
-        setVariableValueToObject( invokerMojo, "profiles", Arrays.asList( new String[] { "zloug" } ) );
+        setVariableValueToObject( invokerMojo, "profiles", Arrays.asList("zloug") );
         setVariableValueToObject( invokerMojo, "profilesFile", "zorglubProfiles.txt" );
         setVariableValueToObject( invokerMojo, "settings", new Settings() );
         String dirPath = getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar

Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java Mon Aug 26 15:49:32 2013
@@ -40,7 +40,6 @@ import org.codehaus.plexus.util.cli.Stre
 import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 

Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java Mon Aug 26 15:49:32 2013
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.jar;
 import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 

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=1517569&r1=1517568&r2=1517569&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 Aug 26 15:49:32 2013
@@ -40,7 +40,6 @@ import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.ResourceBundle;
 

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Mon Aug 26 15:49:32 2013
@@ -497,12 +497,8 @@ public abstract class AbstractFixJavadoc
      */
     protected static String getJavaMethodAsString( JavaMethod javaMethod )
     {
-        StringBuilder sb = new StringBuilder();
-
-        sb.append( javaMethod.getParentClass().getFullyQualifiedName() );
-        sb.append( "#" ).append( javaMethod.getCallSignature() );
 
-        return sb.toString();
+        return javaMethod.getParentClass().getFullyQualifiedName() + "#" + javaMethod.getCallSignature();
     }
 
     // ----------------------------------------------------------------------
@@ -2524,7 +2520,7 @@ public abstract class AbstractFixJavadoc
         }
 
         sb.append( indent ).append( " * @" ).append( PARAM_TAG ).append( " " );
-        sb.append( "<" + typeParameter.getName() + ">" );
+        sb.append("<").append(typeParameter.getName()).append(">");
         sb.append( " " );
         sb.append( getDefaultJavadocForType( typeParameter ) );
         sb.append( EOL );
@@ -3660,7 +3656,7 @@ public abstract class AbstractFixJavadoc
         private String getMessage( String paramName, String mapName )
         {
             StringBuilder msg = new StringBuilder();
-            msg.append( "No param '" ).append( paramName ).append( "' key found in " + mapName + " for the entity: " );
+            msg.append("No param '").append(paramName).append("' key found in ").append(mapName).append(" for the entity: ");
             if ( isJavaMethod )
             {
                 JavaMethod javaMethod = (JavaMethod) entity;

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Mon Aug 26 15:49:32 2013
@@ -5035,18 +5035,8 @@ public abstract class AbstractJavadocMoj
                 if ( StringUtils.isNotEmpty( output ) && StringUtils.isEmpty( err.getOutput() ) && isJavadocVMInitError(
                     output ) )
                 {
-                    StringBuilder msg = new StringBuilder();
-                    msg.append( output );
-                    msg.append( '\n' ).append( '\n' );
-                    msg.append( JavadocUtil.ERROR_INIT_VM ).append( '\n' );
-                    msg.append( "Or, try to reduce the Java heap size for the Javadoc goal using " );
-                    msg.append( "-Dminmemory=<size> and -Dmaxmemory=<size>." ).append( '\n' ).append( '\n' );
-
-                    msg.append( "Command line was: " ).append( cmdLine ).append( '\n' ).append( '\n' );
-                    msg.append( "Refer to the generated Javadoc files in '" ).append( javadocOutputDirectory ).append(
-                        "' dir.\n" );
 
-                    throw new MavenReportException( msg.toString() );
+                    throw new MavenReportException(output + '\n' + '\n' + JavadocUtil.ERROR_INIT_VM + '\n' + "Or, try to reduce the Java heap size for the Javadoc goal using " + "-Dminmemory=<size> and -Dmaxmemory=<size>." + '\n' + '\n' + "Command line was: " + cmdLine + '\n' + '\n' + "Refer to the generated Javadoc files in '" + javadocOutputDirectory + "' dir.\n");
                 }
 
                 if ( StringUtils.isNotEmpty( output ) )

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java Mon Aug 26 15:49:32 2013
@@ -421,7 +421,7 @@ public class JavadocUtil
                 if (excludeName.length > 1) {
                     int u = 0;
                     while (include && u < excludeName.length) {
-                        if (!"".equals(excludeName[u].trim()) && aFileList.indexOf(excludeName[u]) != -1) {
+                        if (!"".equals(excludeName[u].trim()) && aFileList.contains(excludeName[u])) {
                             include = false;
                         }
                         u++;
@@ -434,7 +434,7 @@ public class JavadocUtil
                             File currentPackage = new File(packageName);
                             File excludedPackage = new File(sourceDirectory, excludeName[0]);
                             if (currentPackage.equals(excludedPackage)
-                                    && aFileList.substring(i).indexOf(".java") != -1) {
+                                    && aFileList.substring(i).contains(".java")) {
                                 include = true;
                             } else {
                                 include = false;
@@ -467,13 +467,13 @@ public class JavadocUtil
         List<String> files = new ArrayList<String>();
         for (String excludePackagename : excludePackagenames) {
             String[] fileList = FileUtils.getFilesFromExtension(sourceDirectory, new String[]{"java"});
-            for (int j = 0; j < fileList.length; j++) {
+            for (String aFileList : fileList) {
                 String[] excludeName = excludePackagename.split("[*]");
                 int u = 0;
                 while (u < excludeName.length) {
-                    if (!"".equals(excludeName[u].trim()) && fileList[j].contains(excludeName[u])
+                    if (!"".equals(excludeName[u].trim()) && aFileList.contains(excludeName[u])
                             && !sourceDirectory.contains(excludeName[u])) {
-                        files.add(fileList[j]);
+                        files.add(aFileList);
                     }
                     u++;
                 }

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java Mon Aug 26 15:49:32 2013
@@ -61,11 +61,11 @@ public final class ResourceResolver
     public static final String TEST_SOURCES_CLASSIFIER = "test-sources";
 
     private static final List<String> SOURCE_VALID_CLASSIFIERS =
-        Arrays.asList( new String[] { SOURCES_CLASSIFIER, TEST_SOURCES_CLASSIFIER } );
+        Arrays.asList(SOURCES_CLASSIFIER, TEST_SOURCES_CLASSIFIER);
 
     private static final List<String> RESOURCE_VALID_CLASSIFIERS =
-        Arrays.asList( new String[] { AbstractJavadocMojo.JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER,
-            AbstractJavadocMojo.TEST_JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER } );
+        Arrays.asList(AbstractJavadocMojo.JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER,
+                AbstractJavadocMojo.TEST_JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER);
 
     private ResourceResolver()
     {

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk5-test/jdk5/test/MyAnnotationType.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk5-test/jdk5/test/MyAnnotationType.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk5-test/jdk5/test/MyAnnotationType.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk5-test/jdk5/test/MyAnnotationType.java Mon Aug 26 15:49:32 2013
@@ -20,7 +20,7 @@ package jdk5.test;
  */
 
 import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
+
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java Mon Aug 26 15:49:32 2013
@@ -20,7 +20,7 @@ package jdk6.test;
  */
 
 import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
+
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**

Modified: maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReportGenerator.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReportGenerator.java (original)
+++ maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReportGenerator.java Mon Aug 26 15:49:32 2013
@@ -14,7 +14,6 @@
 
 package org.apache.maven.plugins.linkcheck;
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 

Modified: maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java (original)
+++ maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java Mon Aug 26 15:49:32 2013
@@ -26,7 +26,6 @@ import java.io.Writer;
 import java.util.ArrayList;
 
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 

Modified: maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java (original)
+++ maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java Mon Aug 26 15:49:32 2013
@@ -382,7 +382,7 @@ public class ApplyMojo
             {
                 StringBuilder extraFileBuffer = new StringBuilder();
 
-                extraFileBuffer.append( "Found " + limbo.size() + " unlisted patch files:" );
+                extraFileBuffer.append("Found ").append(limbo.size()).append(" unlisted patch files:");
 
                 for (Object foundPatchFile : foundPatchFiles) {
                     String patch = (String) foundPatchFile;

Modified: maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java Mon Aug 26 15:49:32 2013
@@ -23,7 +23,6 @@ package org.apache.maven.plugins.pdf;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.maven.doxia.document.DocumentAuthor;

Modified: maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java Mon Aug 26 15:49:32 2013
@@ -31,7 +31,6 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -103,7 +102,6 @@ import org.apache.maven.reporting.exec.M
 import org.apache.maven.reporting.exec.MavenReportExecutor;
 import org.apache.maven.reporting.exec.MavenReportExecutorRequest;
 import org.apache.maven.settings.Settings;
-import org.codehaus.classworlds.ClassRealm;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;

Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java Mon Aug 26 15:49:32 2013
@@ -78,12 +78,12 @@ public class DocumentModelBuilderTest
         assertEquals( "v. Test Version", cover.getCoverSubTitle() );
         assertEquals( "Test Organization", cover.getCompanyName() );
         assertEquals( 2, cover.getAuthors().size() );
-        assertFirstDocumentAuthor( (DocumentAuthor) cover.getAuthors().get( 0 ) );
+        assertFirstDocumentAuthor(cover.getAuthors().get( 0 ));
 
         DocumentMeta meta = model.getMeta();
         assertEquals( "Test Description", meta.getDescription() );
         assertEquals( 2, meta.getAuthors().size() );
-        assertFirstDocumentAuthor( (DocumentAuthor) meta.getAuthors().get( 0 ) );
+        assertFirstDocumentAuthor(meta.getAuthors().get( 0 ));
         assertEquals( "Test Name", meta.getSubject() );
         assertEquals( "Test Name", meta.getTitle() );
 
@@ -105,8 +105,8 @@ public class DocumentModelBuilderTest
 
         DocumentTOC toc = model.getToc();
         assertEquals( 1, toc.getItems().size() );
-        assertEquals( "Intro", ( (DocumentTOCItem) toc.getItems().get( 0 ) ).getName() );
-        assertEquals( "index.html", ( (DocumentTOCItem) toc.getItems().get( 0 ) ).getRef() );
+        assertEquals( "Intro", toc.getItems().get( 0 ).getName() );
+        assertEquals( "index.html", toc.getItems().get( 0 ).getRef() );
     }
 
     private void assertFirstDocumentAuthor( DocumentAuthor author )

Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java Mon Aug 26 15:49:32 2013
@@ -28,7 +28,6 @@ import org.apache.maven.model.Organizati
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
 import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
 import org.apache.commons.io.input.XmlStreamReader;
 
 /**

Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java Mon Aug 26 15:49:32 2013
@@ -37,7 +37,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java Mon Aug 26 15:49:32 2013
@@ -443,10 +443,7 @@ public class ScmReport
 
                 paragraph( getI18nString( "accessbehindfirewall.svn.intro" ) );
 
-                StringBuilder sb = new StringBuilder();
-                sb.append( "$ svn checkout " ).append( svnRepo.getUrl() );
-                sb.append( " " ).append( checkoutDirectoryName );
-                verbatimText( sb.toString() );
+                verbatimText("$ svn checkout " + svnRepo.getUrl() + " " + checkoutDirectoryName);
             }
             else if ( devRepository != null && isScmSystem( devRepository, "cvs" ) )
             {
@@ -476,12 +473,7 @@ public class ScmReport
                 paragraph( getI18nString( "accessthroughtproxy.svn.intro2" ) );
                 paragraph( getI18nString( "accessthroughtproxy.svn.intro3" ) );
 
-                StringBuilder sb = new StringBuilder();
-                sb.append( "[global]" );
-                sb.append( SystemUtils.LINE_SEPARATOR );
-                sb.append( "http-proxy-host = your.proxy.name" ).append( SystemUtils.LINE_SEPARATOR );
-                sb.append( "http-proxy-port = 3128" ).append( SystemUtils.LINE_SEPARATOR );
-                verbatimText( sb.toString() );
+                verbatimText("[global]" + SystemUtils.LINE_SEPARATOR + "http-proxy-host = your.proxy.name" + SystemUtils.LINE_SEPARATOR + "http-proxy-port = 3128" + SystemUtils.LINE_SEPARATOR);
 
                 endSection();
             }
@@ -498,10 +490,7 @@ public class ScmReport
         {
             paragraph( getI18nString( "devaccess.clearcase.intro" ) );
 
-            StringBuilder command = new StringBuilder();
-            command.append( "$ cleartool checkout " );
-
-            verbatimText( command.toString() );
+            verbatimText("$ cleartool checkout ");
         }
 
         // CVS
@@ -519,13 +508,7 @@ public class ScmReport
         {
             paragraph( getI18nString( "anonymousaccess.cvs.intro" ) );
 
-            StringBuilder command = new StringBuilder();
-            command.append( "$ cvs -d " ).append( cvsRepo.getCvsRoot() ).append( " login" );
-            command.append( SystemUtils.LINE_SEPARATOR );
-            command.append( "$ cvs -z3 -d " ).append( cvsRepo.getCvsRoot() );
-            command.append( " co " ).append( cvsRepo.getModule() );
-
-            verbatimText( command.toString() );
+            verbatimText("$ cvs -d " + cvsRepo.getCvsRoot() + " login" + SystemUtils.LINE_SEPARATOR + "$ cvs -z3 -d " + cvsRepo.getCvsRoot() + " co " + cvsRepo.getModule());
         }
 
         // Git
@@ -543,10 +526,7 @@ public class ScmReport
             linkPatternedText( getI18nString( "anonymousaccess.git.intro" ) );
             sink.paragraph_();
 
-            StringBuilder command = new StringBuilder();
-            command.append( "$ git clone " ).append( gitRepo.getFetchUrl() );
-
-            verbatimText( command.toString() );
+            verbatimText("$ git clone " + gitRepo.getFetchUrl());
         }
 
         // Mercurial
@@ -564,10 +544,7 @@ public class ScmReport
             linkPatternedText( getI18nString( "anonymousaccess.hg.intro" ) );
             sink.paragraph_();
 
-            StringBuilder command = new StringBuilder();
-            command.append( "$ hg clone " ).append( hgRepo.getURI() );
-
-            verbatimText( command.toString() );
+            verbatimText("$ hg clone " + hgRepo.getURI());
         }
 
         /**
@@ -586,12 +563,7 @@ public class ScmReport
             // Safety: remove the username if present
             String cvsRoot = StringUtils.replace( cvsRepo.getCvsRoot(), cvsRepo.getUser(), "username" );
 
-            StringBuilder command = new StringBuilder();
-            command.append( "$ cvs -d " ).append( cvsRoot ).append( " login" );
-            command.append( SystemUtils.LINE_SEPARATOR );
-            command.append( "$ cvs -z3 -d " ).append( cvsRoot ).append( " co " ).append( cvsRepo.getModule() );
-
-            verbatimText( command.toString() );
+            verbatimText("$ cvs -d " + cvsRoot + " login" + SystemUtils.LINE_SEPARATOR + "$ cvs -z3 -d " + cvsRoot + " co " + cvsRepo.getModule());
         }
 
         // Git
@@ -609,11 +581,7 @@ public class ScmReport
             linkPatternedText( getI18nString( "devaccess.git.intro" ) );
             sink.paragraph_();
 
-            StringBuilder command = new StringBuilder();
-            command.append( "$ git clone " );
-            command.append( gitRepo.getPushUrl() );
-
-            verbatimText( command.toString() );
+            verbatimText("$ git clone " + gitRepo.getPushUrl());
         }
 
         // Mercurial
@@ -631,11 +599,7 @@ public class ScmReport
             linkPatternedText( getI18nString( "devaccess.hg.intro" ) );
             sink.paragraph_();
 
-            StringBuilder command = new StringBuilder();
-            command.append( "$ hg clone " );
-            command.append( hgRepo.getURI() );
-
-            verbatimText( command.toString() );
+            verbatimText("$ hg clone " + hgRepo.getURI());
         }
 
         // Perforce
@@ -718,10 +682,7 @@ public class ScmReport
         {
             paragraph( getI18nString( "anonymousaccess.svn.intro" ) );
 
-            StringBuilder sb = new StringBuilder();
-            sb.append( "$ svn checkout " ).append( svnRepo.getUrl() ).append( " " ).append( checkoutDirectoryName );
-
-            verbatimText( sb.toString() );
+            verbatimText("$ svn checkout " + svnRepo.getUrl() + " " + checkoutDirectoryName);
         }
 
         /**
@@ -808,7 +769,7 @@ public class ScmReport
 
                     if ( !isIntroAdded )
                     {
-                        sb.append( "This SCM url '" + scmUrl + "' is invalid due to the following errors:" );
+                        sb.append("This SCM url '").append(scmUrl).append("' is invalid due to the following errors:");
                         sb.append( SystemUtils.LINE_SEPARATOR );
                         isIntroAdded = true;
                     }

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java Mon Aug 26 15:49:32 2013
@@ -154,25 +154,7 @@ public class DependenciesRenderer
         jarSubtype.add( "ejb" );
         JAR_SUBTYPE = Collections.unmodifiableSet( jarSubtype );
 
-        StringBuilder sb = new StringBuilder();
-        sb.append( "<script language=\"javascript\" type=\"text/javascript\">" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "      function toggleDependencyDetail( divId, imgId )" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "      {" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "        var div = document.getElementById( divId );" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "        var img = document.getElementById( imgId );" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "        if( div.style.display == '' )" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "        {" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "          div.style.display = 'none';" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "          img.src='" + IMG_INFO_URL + "';" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "        }" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "        else" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "        {" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "          div.style.display = '';" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "          img.src='" + IMG_CLOSE_URL + "';" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "        }" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "      }" ).append( SystemUtils.LINE_SEPARATOR );
-        sb.append( "</script>" ).append( SystemUtils.LINE_SEPARATOR );
-        JAVASCRIPT = sb.toString();
+        JAVASCRIPT = "<script language=\"javascript\" type=\"text/javascript\">" + SystemUtils.LINE_SEPARATOR + "      function toggleDependencyDetail( divId, imgId )" + SystemUtils.LINE_SEPARATOR + "      {" + SystemUtils.LINE_SEPARATOR + "        var div = document.getElementById( divId );" + SystemUtils.LINE_SEPARATOR + "        var img = document.getElementById( imgId );" + SystemUtils.LINE_SEPARATOR + "        if( div.style.display == '' )" + SystemUtils.LINE_SEPARATOR + "        {" + SystemUtils.LINE_SEPARATOR + "          div.style.display = 'none';" + SystemUtils.LINE_SEPARATOR + "          img.src='" + IMG_INFO_URL + "';" + SystemUtils.LINE_SEPARATOR + "        }" + SystemUtils.LINE_SEPARATOR + "        else" + SystemUtils.LINE_SEPARATOR + "        {" + SystemUtils.LINE_SEPARATOR + "          div.style.display = '';" + SystemUtils.LINE_SEPARATOR + "          img.src='" + IMG_CLOSE_URL + "';" + SystemUtils.LINE_SEPARATOR + "        }" + SystemUtils.LINE_SEPARATOR + "      }"
  + SystemUtils.LINE_SEPARATOR + "</script>" + SystemUtils.LINE_SEPARATOR;
     }
 
     /**

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java Mon Aug 26 15:49:32 2013
@@ -789,7 +789,7 @@ public class ProcessRemoteResourcesMojo
         {
             if ( p.getOrganization() != null && StringUtils.isNotEmpty( p.getOrganization().getName() ) )
             {
-                List<MavenProject> sortedProjects = (List<MavenProject>) organizations.get( p.getOrganization() );
+                List<MavenProject> sortedProjects = organizations.get( p.getOrganization() );
                 if ( sortedProjects == null )
                 {
                     sortedProjects = new ArrayList<MavenProject>();

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java Mon Aug 26 15:49:32 2013
@@ -490,7 +490,7 @@ public class RemoteResourcesMojoTest
                                     null, //ArtifactRepository localRepository,
                                     null, //EventDispatcher eventDispatcher,
                                     new ReactorManager(new ArrayList<MavenProject>()),
-                                    Arrays.asList( new String[] {"install"} ),
+                                    Arrays.asList("install"),
                                     project.getBasedir().toString(),
                                     new Properties(),
                                     Calendar.getInstance().getTime() );

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java Mon Aug 26 15:49:32 2013
@@ -224,14 +224,14 @@ public class MavenProjectBuildStub
         File currentDirectory;
 
         for (String aDirectoryList : directoryList) {
-            currentDirectory = new File(parent, "/" + (String) aDirectoryList);
+            currentDirectory = new File(parent, "/" + aDirectoryList);
 
             if (!currentDirectory.exists()) {
                 currentDirectory.mkdirs();
             }
 
             // duplicate dir structure in test resources
-            currentDirectory = new File(testparent, "/" + (String) aDirectoryList);
+            currentDirectory = new File(testparent, "/" + aDirectoryList);
 
             if (!currentDirectory.exists()) {
                 currentDirectory.mkdirs();
@@ -274,7 +274,7 @@ public class MavenProjectBuildStub
         }
 
         for (String aList : list) {
-            currentFile = new File(parent, (String) aList);
+            currentFile = new File(parent, aList);
 
             // create the necessary parent directories
             // before we create the files
@@ -312,7 +312,7 @@ public class MavenProjectBuildStub
     private void populateFile( File file, int type )
     {
         FileOutputStream outputStream;
-        String data = (String) dataMap.get( file.getName() );
+        String data = dataMap.get( file.getName() );
 
         if ( ( data != null ) && file.exists() )
         {

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectResourcesStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectResourcesStub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectResourcesStub.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectResourcesStub.java Mon Aug 26 15:49:32 2013
@@ -39,49 +39,49 @@ public class MavenProjectResourcesStub
 
     public void addInclude( String pattern )
     {
-        ( (Resource) build.getResources().get( 0 ) ).addInclude( pattern );
+        build.getResources().get( 0 ).addInclude(pattern);
     }
 
     public void addExclude( String pattern )
     {
-        ( (Resource) build.getResources().get( 0 ) ).addExclude( pattern );
+        build.getResources().get( 0 ).addExclude(pattern);
     }
 
     public void addTestInclude( String pattern )
     {
-        ( (Resource) build.getTestResources().get( 0 ) ).addInclude( pattern );
+        build.getTestResources().get( 0 ).addInclude(pattern);
     }
 
     public void addTestExclude( String pattern )
     {
-        ( (Resource) build.getTestResources().get( 0 ) ).addExclude( pattern );
+        build.getTestResources().get( 0 ).addExclude(pattern);
     }
 
     public void setTargetPath( String path )
     {
-        ( (Resource) build.getResources().get( 0 ) ).setTargetPath( path );
+        build.getResources().get( 0 ).setTargetPath(path);
     }
 
     public void setTestTargetPath( String path )
     {
-        ( (Resource) build.getTestResources().get( 0 ) ).setTargetPath( path );
+        build.getTestResources().get( 0 ).setTargetPath(path);
     }
 
     public void setDirectory( String dir )
     {
-        ( (Resource) build.getResources().get( 0 ) ).setDirectory( dir );
+        build.getResources().get( 0 ).setDirectory(dir);
     }
 
     public void setTestDirectory( String dir )
     {
-        ( (Resource) build.getTestResources().get( 0 ) ).setDirectory( dir );
+        build.getTestResources().get( 0 ).setDirectory(dir);
     }
 
     public void setResourceFiltering( int nIndex, boolean filter )
     {
         if ( build.getResources().size() > nIndex )
         {
-            ( (Resource) build.getResources().get( nIndex ) ).setFiltering( filter );
+            build.getResources().get( nIndex ).setFiltering(filter);
         }
     }
 

Modified: maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java Mon Aug 26 15:49:32 2013
@@ -159,7 +159,7 @@ final class BundleUtils
                         continue;
                     }
                     
-                    File removed = (File) result.remove( idxs[k] -1 );
+                    File removed = result.remove( idxs[k] -1 );
                     log.info( "Removed: " + removed.getName() );
                 }
             }

Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/testutil/TestInputHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/testutil/TestInputHandler.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/testutil/TestInputHandler.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/testutil/TestInputHandler.java Mon Aug 26 15:49:32 2013
@@ -38,7 +38,7 @@ public class TestInputHandler
     public String readLine()
         throws IOException
     {
-        return (String) ( lineResponses == null || lineResponses.isEmpty() ? null : lineResponses.pop() );
+        return lineResponses == null || lineResponses.isEmpty() ? null : lineResponses.pop();
     }
 
     public List<String> readMultipleLines()
@@ -50,7 +50,7 @@ public class TestInputHandler
     public String readPassword()
         throws IOException
     {
-        return (String) ( passwordResponses == null || passwordResponses.isEmpty() ? null : passwordResponses.pop() );
+        return passwordResponses == null || passwordResponses.isEmpty() ? null : passwordResponses.pop();
     }
 
     public void setLineResponses( Stack<String> responses )

Modified: maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java Mon Aug 26 15:49:32 2013
@@ -25,7 +25,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.Properties;
 
 /**

Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java Mon Aug 26 15:49:32 2013
@@ -219,7 +219,6 @@ public class ResourcesMojoTest
         ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom );
         MavenProjectResourcesStub project = new MavenProjectResourcesStub( "resourceExclude" );
         List resources = project.getBuild().getResources();
-        ;
 
         assertNotNull( mojo );
 

Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java Mon Aug 26 15:49:32 2013
@@ -294,7 +294,7 @@ public class MavenProjectBuildStub
     private void populateFile( File file )
     {
         FileOutputStream outputStream;
-        String data = (String) dataMap.get( file.getName() );
+        String data = dataMap.get( file.getName() );
 
         if ( ( data != null ) && file.exists() )
         {

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java Mon Aug 26 15:49:32 2013
@@ -206,7 +206,7 @@ public class MinijarFilter
     {
         int classesTotal = classesRemoved + classesKept;
         log.info(
-            "Minimized " + classesTotal + " -> " + classesKept + " (" + (int) ( 100 * classesKept / classesTotal )
+            "Minimized " + classesTotal + " -> " + classesKept + " (" + 100 * classesKept / classesTotal
                 + "%)" );
     }
 }

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java Mon Aug 26 15:49:32 2013
@@ -83,7 +83,7 @@ public final class RelativizePath
             // now add down from the common point to the actual 'thing' item. 
             for ( index = lastCommonRoot + 1; index < thingDirectories.size(); index++ ) 
             {
-                relativePath.append( thingDirectories.get( index ) + '/' );
+                relativePath.append(thingDirectories.get(index)).append('/');
             }
             relativePath.append( thing.getName() );
             return relativePath.toString();

Modified: maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java Mon Aug 26 15:49:32 2013
@@ -81,7 +81,7 @@ public class ShadeMojoTest
 
         List<Relocator> relocators = new ArrayList<Relocator>();
         relocators.add( new SimpleRelocator( "org.codehaus.plexus.util", "hidden", null, Arrays.asList(
-            new String[]{ "org.codehaus.plexus.util.xml.Xpp3Dom", "org.codehaus.plexus.util.xml.pull.*" } ) ) );
+                "org.codehaus.plexus.util.xml.Xpp3Dom", "org.codehaus.plexus.util.xml.pull.*") ) );
 
         List<ResourceTransformer> resourceTransformers = new ArrayList<ResourceTransformer>();
 
@@ -174,7 +174,7 @@ public class ShadeMojoTest
         // invoke getFilters()
         Method getFilters = ShadeMojo.class.getDeclaredMethod( "getFilters", new Class[0] );
         getFilters.setAccessible( true );
-        List<Filter> filters = (List<Filter>) getFilters.invoke( mojo, new Object[0] );
+        List<Filter> filters = (List<Filter>) getFilters.invoke( mojo);
 
         // assertions - there must be one filter
         assertEquals( 1, filters.size() );
@@ -199,7 +199,7 @@ public class ShadeMojoTest
         List<Relocator> relocators = new ArrayList<Relocator>();
 
         relocators.add( new SimpleRelocator( "org/codehaus/plexus/util", shadedPattern, null, Arrays.asList(
-            new String[]{ "org/codehaus/plexus/util/xml/Xpp3Dom", "org/codehaus/plexus/util/xml/pull.*" } ) ) );
+                "org/codehaus/plexus/util/xml/Xpp3Dom", "org/codehaus/plexus/util/xml/pull.*") ) );
 
         List<ResourceTransformer> resourceTransformers = new ArrayList<ResourceTransformer>();
 

Modified: maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java Mon Aug 26 15:49:32 2013
@@ -29,7 +29,7 @@ public class SimpleRelocatorTest
         assertEquals( false, relocator.canRelocatePath( "org/Foo/Class.class" ) );
 
         relocator = new SimpleRelocator( "org.foo", null, null, Arrays.asList(
-            new String[]{ "org.foo.Excluded", "org.foo.public.*", "org.foo.Public*Stuff" } ) );
+                "org.foo.Excluded", "org.foo.public.*", "org.foo.Public*Stuff") );
         assertEquals( true, relocator.canRelocatePath( "org/foo/Class" ) );
         assertEquals( true, relocator.canRelocatePath( "org/foo/Class.class" ) );
         assertEquals( true, relocator.canRelocatePath( "org/foo/excluded" ) );
@@ -58,7 +58,7 @@ public class SimpleRelocatorTest
         assertEquals( false, relocator.canRelocateClass( "org.Foo.Class" ) );
 
         relocator = new SimpleRelocator( "org.foo", null, null, Arrays.asList(
-            new String[]{ "org.foo.Excluded", "org.foo.public.*", "org.foo.Public*Stuff" } ) );
+                "org.foo.Excluded", "org.foo.public.*", "org.foo.Public*Stuff") );
         assertEquals( true, relocator.canRelocateClass( "org.foo.Class" ) );
         assertEquals( true, relocator.canRelocateClass( "org.foo.excluded" ) );
         assertEquals( false, relocator.canRelocateClass( "org.foo.Excluded" ) );

Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaFilter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaFilter.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaFilter.java Mon Aug 26 15:49:32 2013
@@ -141,7 +141,7 @@ public class DoxiaFilter
         {
             try
             {
-                DocumentRenderer renderer = (DocumentRenderer) documents.get( path );
+                DocumentRenderer renderer = documents.get( path );
                 renderer.renderDocument( servletResponse.getWriter(), siteRenderer, context );
 
                 if ( renderer instanceof ReportDocumentRenderer )
@@ -175,7 +175,7 @@ public class DoxiaFilter
 
                 if ( locateDocuments.containsKey( path ) )
                 {
-                    DocumentRenderer renderer = (DocumentRenderer) locateDocuments.get( path );
+                    DocumentRenderer renderer = locateDocuments.get( path );
                     renderer.renderDocument( servletResponse.getWriter(), siteRenderer, context );
                 }
             }

Modified: maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project001Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project001Stub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project001Stub.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project001Stub.java Mon Aug 26 15:49:32 2013
@@ -23,7 +23,6 @@ import org.apache.maven.plugin.testing.s
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.artifact.Artifact;
 import org.codehaus.plexus.util.ReaderFactory;
 
 import java.util.List;

Modified: maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project003Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project003Stub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project003Stub.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project003Stub.java Mon Aug 26 15:49:32 2013
@@ -23,7 +23,6 @@ import org.apache.maven.plugin.testing.s
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.artifact.Artifact;
 import org.codehaus.plexus.util.ReaderFactory;
 
 import java.util.List;



Mime
View raw message