You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/26 17:49:35 UTC
svn commit: r1517569 [1/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...
Author: krosenvold
Date: Mon Aug 26 15:49:32 2013
New Revision: 1517569
URL: http://svn.apache.org/r1517569
Log:
Further code analysis improvements
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/MockManager.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerMultiSourceTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MultiMavenProjectStub.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestSkip.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDepMgt.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDuplicateMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/tree/TestTreeMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseLaunchConfigurationWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseHibernateWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15WriterTest.java
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk5-test/jdk5/test/MyAnnotationType.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReportGenerator.java
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectResourcesStub.java
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/testutil/TestInputHandler.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaFilter.java
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project001Stub.java
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project003Stub.java
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project005Stub.java
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project007Stub.java
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project009Stub.java
maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java Mon Aug 26 15:49:32 2013
@@ -172,7 +172,7 @@ public class AntBuildWriter
if ( project.getBuild().getResources() != null )
{
List<Resource> var = project.getBuild().getResources();
- Resource[] array = (Resource[]) var.toArray(new Resource[var.size()]);
+ Resource[] array = var.toArray(new Resource[var.size()]);
for ( int i = 0; i < array.length; i++ )
{
addProperty( properties, "maven.build.resourceDir." + i, AntBuildWriterUtil.toRelative( project.getBasedir(),
@@ -199,7 +199,7 @@ public class AntBuildWriter
if ( project.getBuild().getTestResources() != null )
{
List<Resource> var = project.getBuild().getTestResources();
- Resource[] array = (Resource[]) var.toArray(new Resource[var.size()]);
+ Resource[] array = var.toArray(new Resource[var.size()]);
for ( int i = 0; i < array.length; i++ )
{
addProperty( properties, "maven.build.testResourceDir." + i, AntBuildWriterUtil
@@ -476,7 +476,7 @@ public class AntBuildWriter
if ( project.getBuild().getResources() != null )
{
- Resource[] array = (Resource[]) project.getBuild().getResources().toArray( new Resource[0] );
+ Resource[] array = project.getBuild().getResources().toArray( new Resource[0] );
for ( int i = 0; i < array.length; i++ )
{
writer.startElement( "property" );
@@ -507,7 +507,7 @@ public class AntBuildWriter
if ( project.getBuild().getTestResources() != null )
{
- Resource[] array = (Resource[]) project.getBuild().getTestResources().toArray( new Resource[0] );
+ Resource[] array = project.getBuild().getTestResources().toArray( new Resource[0] );
for ( int i = 0; i < array.length; i++ )
{
writer.startElement( "property" );
@@ -635,8 +635,7 @@ public class AntBuildWriter
}
for (Profile profile : project.getOriginalModel().getProfiles()) {
- for (Iterator it = profile.getDependencies().iterator(); it.hasNext(); ) {
- Dependency dependency = (Dependency) it.next();
+ for (Dependency dependency : profile.getDependencies()) {
if (managementKey.equals(dependency.getManagementKey())) {
return dependency.getSystemPath();
}
@@ -1308,8 +1307,8 @@ public class AntBuildWriter
writer.endElement(); // mkdir
}
- for (Iterator j = project.getRepositories().iterator(); j.hasNext(); ) {
- Repository repository = (Repository) j.next();
+ for (Object o1 : project.getRepositories()) {
+ Repository repository = (Repository) o1;
String url = repository.getUrl();
String localDir = getProjectRepoDirectory(url, basedir);
Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java Mon Aug 26 15:49:32 2013
@@ -26,7 +26,6 @@ import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java Mon Aug 26 15:49:32 2013
@@ -328,7 +328,7 @@ public class AntRunMojo
catch ( BuildException e )
{
StringBuilder sb = new StringBuilder();
- sb.append( "An Ant BuildException has occured: " + e.getMessage() );
+ sb.append("An Ant BuildException has occured: ").append(e.getMessage());
String fragment = findFragment( e );
if ( fragment != null )
{
@@ -448,7 +448,7 @@ public class AntRunMojo
StringBuilder versionsBuffer = new StringBuilder();
for ( Artifact artifact : depArtifacts )
{
- versionsBuffer.append( artifact.getVersion() + File.pathSeparator );
+ versionsBuffer.append(artifact.getVersion()).append(File.pathSeparator);
}
antProject.setProperty( versionsPropertyName, versionsBuffer.toString() );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java Mon Aug 26 15:49:32 2013
@@ -429,8 +429,8 @@ public class DefaultAssemblyArchiver
PlexusConfiguration.class, ExpressionEvaluator.class, (Class<?>) containerRealm[1],
ConfigurationListener.class } );
- configureComponent.invoke( configurator, new Object[] { component, configuration, expressionEvaluator,
- containerRealm[0], listener } );
+ configureComponent.invoke( configurator, component, configuration, expressionEvaluator,
+ containerRealm[0], listener);
}
catch ( final NoSuchMethodException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java Mon Aug 26 15:49:32 2013
@@ -127,8 +127,7 @@ public class AssemblyInterpolator
{
final StringBuilder sb = new StringBuilder();
- sb.append( "One or more minor errors occurred while interpolating the assembly with ID: "
- + assembly.getId() + ":\n" );
+ sb.append("One or more minor errors occurred while interpolating the assembly with ID: ").append(assembly.getId()).append(":\n");
@SuppressWarnings( "unchecked" )
final List<ObjectInterpolationWarning> warnings = objectInterpolator.getWarnings();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java Mon Aug 26 15:49:32 2013
@@ -279,7 +279,6 @@ public final class AssemblyFileUtils
//noinspection StatementWithEmptyBody
while ( ( tCount += c2.transferFrom( c1, 0, size - tCount ) ) < size )
{
- ;
}
c1.close();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java Mon Aug 26 15:49:32 2013
@@ -82,7 +82,7 @@ public final class FilterUtils
for (final PatternIncludesArtifactFilter f : allFilters) {
if (f instanceof StatisticsReportingArtifactFilter) {
- ((StatisticsReportingArtifactFilter) f).reportMissedCriteria(logger);
+ f.reportMissedCriteria(logger);
}
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java Mon Aug 26 15:49:32 2013
@@ -93,7 +93,7 @@ public final class TypeConversionUtils
{
final StringBuilder messages = new StringBuilder();
- messages.append( "The mode: " + Integer.toString( mode, 8 ) + " contains nonsensical permissions:" );
+ messages.append("The mode: ").append(Integer.toString(mode, 8)).append(" contains nonsensical permissions:");
boolean warn = false;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java Mon Aug 26 15:49:32 2013
@@ -47,7 +47,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java Mon Aug 26 15:49:32 2013
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.assembly
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/MockManager.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/MockManager.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/MockManager.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/MockManager.java Mon Aug 26 15:49:32 2013
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.assembly
import org.easymock.MockControl;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import junit.framework.AssertionFailedError;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java Mon Aug 26 15:49:32 2013
@@ -305,21 +305,7 @@ public class TrackingArchiverStub
@Override
public String toString()
{
- final StringBuilder builder = new StringBuilder();
- builder.append( "Addition (\n resource= " );
- builder.append( resource );
- builder.append( "\n directory= " );
- builder.append( directory );
- builder.append( "\n destination= " );
- builder.append( destination );
- builder.append( "\n permissions= " );
- builder.append( permissions );
- builder.append( "\n includes= " );
- builder.append( includes == null ? "-none-" : StringUtils.join( includes, ", " ) );
- builder.append( "\n excludes= " );
- builder.append( excludes == null ? "-none-" : StringUtils.join( excludes, ", " ) );
- builder.append( "\n)" );
- return builder.toString();
+ return "Addition (\n resource= " + resource + "\n directory= " + directory + "\n destination= " + destination + "\n permissions= " + permissions + "\n includes= " + (includes == null ? "-none-" : StringUtils.join(includes, ", ")) + "\n excludes= " + (excludes == null ? "-none-" : StringUtils.join(excludes, ", ")) + "\n)";
}
public final Object resource;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java Mon Aug 26 15:49:32 2013
@@ -117,8 +117,8 @@ public class FilterUtilsTest
"artifact",
"group:dependentArtifact",
null,
- Arrays.asList( new String[] { "current:project:jar:1.0",
- "group:dependentArtifact:jar:version" } ), null );
+ Arrays.asList("current:project:jar:1.0",
+ "group:dependentArtifact:jar:version"), null );
}
public void testFilterArtifacts_ShouldRemoveArtifactTransitivelyExcluded()
@@ -128,8 +128,8 @@ public class FilterUtilsTest
"artifact",
null,
"group:dependentArtifact",
- Arrays.asList( new String[] { "current:project:jar:1.0",
- "group:dependentArtifact:jar:version" } ), null );
+ Arrays.asList("current:project:jar:1.0",
+ "group:dependentArtifact:jar:version"), null );
}
public void testFilterArtifacts_ShouldRemoveArtifactDirectlyExcluded()
@@ -177,8 +177,8 @@ public class FilterUtilsTest
"artifact",
"group:dependentArtifact",
null,
- Arrays.asList( new String[] { "current:project:jar:1.0",
- "group:dependentArtifact:jar:version" } ) );
+ Arrays.asList("current:project:jar:1.0",
+ "group:dependentArtifact:jar:version") );
}
public void testFilterProjects_ShouldRemoveProjectTransitivelyExcluded()
@@ -187,8 +187,8 @@ public class FilterUtilsTest
"artifact",
null,
"group:dependentArtifact",
- Arrays.asList( new String[] { "current:project:jar:1.0",
- "group:dependentArtifact:jar:version" } ) );
+ Arrays.asList("current:project:jar:1.0",
+ "group:dependentArtifact:jar:version") );
}
public void testFilterProjects_ShouldRemoveProjectDirectlyExcluded()
Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java Mon Aug 26 15:49:32 2013
@@ -776,7 +776,7 @@ public class ChangeLogReport
Iterator<ChangeFile> iterator = files.iterator();
while (iterator.hasNext())
{
- ChangeFile changeFile = (ChangeFile)iterator.next();
+ ChangeFile changeFile = iterator.next();
String name = changeFile.getName();
if(!isIncluded(includes,name) || isExcluded(excludes, name))
{
@@ -1452,11 +1452,11 @@ public class ChangeLogReport
*/
protected void sinkAuthorDetails( Sink sink, String author )
{
- Developer developer = (Developer) developersById.get( author );
+ Developer developer = developersById.get( author );
if ( developer == null )
{
- developer = (Developer) developersByName.get( author );
+ developer = developersByName.get( author );
}
if ( developer != null )
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java Mon Aug 26 15:49:32 2013
@@ -23,7 +23,6 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
import javax.mail.internet.AddressException;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java Mon Aug 26 15:49:32 2013
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.announce
import java.security.Security;
import java.util.Date;
-import java.util.Iterator;
import java.util.Properties;
import javax.mail.Authenticator;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java Mon Aug 26 15:49:32 2013
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.changes;
import java.io.File;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.plugin.MojoExecutionException;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java Mon Aug 26 15:49:32 2013
@@ -30,7 +30,6 @@ import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java Mon Aug 26 15:49:32 2013
@@ -545,16 +545,13 @@ public class ChangesReportGenerator exte
}
sink.tableRow_();
- for (Iterator iterator = release.getActions().iterator(); iterator.hasNext();)
- {
- Action action = (Action) iterator.next();
+ for (Action action : release.getActions()) {
constructAction(sink, bundle, action);
}
- for (Iterator iterator = release.getComponents().iterator(); iterator.hasNext();)
- {
- Component component = (Component) iterator.next();
- constructComponent( sink, bundle, component );
+ for (Object o : release.getComponents()) {
+ Component component = (Component) o;
+ constructComponent(sink, bundle, component);
}
sink.table_();
@@ -595,10 +592,8 @@ public class ChangesReportGenerator exte
sink.tableRow_();
- for ( Iterator iterator = component.getActions().iterator(); iterator.hasNext(); )
- {
- Action action = (Action) iterator.next();
- constructAction( sink, bundle, action );
+ for (Action action : component.getActions()) {
+ constructAction(sink, bundle, action);
}
}
}
@@ -615,11 +610,9 @@ public class ChangesReportGenerator exte
return false;
}
- for (Iterator iterator = release.getComponents().iterator(); iterator.hasNext();)
- {
- Component component = (Component) iterator.next();
- if ( !component.getActions().isEmpty() )
- {
+ for (Object o : release.getComponents()) {
+ Component component = (Component) o;
+ if (!component.getActions().isEmpty()) {
return false;
}
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java Mon Aug 26 15:49:32 2013
@@ -115,13 +115,12 @@ public class ReleaseUtils
protected void logRelease( Release release )
{
Action action;
- for ( Iterator iterator = release.getActions().iterator(); iterator.hasNext(); )
- {
- action = (Action) iterator.next();
- getLog().debug( "o " + action.getType() );
- getLog().debug( "issue : " + action.getIssue() );
- getLog().debug( "action : " + action.getAction() );
- getLog().debug( "dueTo : " + action.getDueTo() );
+ for (Action action1 : release.getActions()) {
+ action = action1;
+ getLog().debug("o " + action.getType());
+ getLog().debug("issue : " + action.getIssue());
+ getLog().debug("action : " + action.getAction());
+ getLog().debug("dueTo : " + action.getDueTo());
}
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java Mon Aug 26 15:49:32 2013
@@ -52,7 +52,7 @@ public class IssueUtils
Issue issue;
for (Issue issue1 : issues) {
- issue = (Issue) issue1;
+ issue = issue1;
if (issue.getFixVersions() != null) {
for (String fixVersion : issue.getFixVersions()) {
@@ -100,7 +100,7 @@ public class IssueUtils
}
for (Issue issue1 : issues) {
- issue = (Issue) issue1;
+ issue = issue1;
if (issue.getFixVersions() != null && issue.getFixVersions().contains(releaseVersion)) {
isFound = true;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java Mon Aug 26 15:49:32 2013
@@ -245,7 +245,7 @@ public class JqlQueryBuilder
query.append( " AND " );
}
- query.append( key + " in (" );
+ query.append(key).append(" in (");
String[] valuesArr = values.split( "," );
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java Mon Aug 26 15:49:32 2013
@@ -50,7 +50,7 @@ public class UrlBuilder
{
query.append( QUESTION_MARK );
}
- query.append( key + "=" + value );
+ query.append(key).append("=").append(value);
}
return this;
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java Mon Aug 26 15:49:32 2013
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.changes;
*/
import java.io.File;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.plugin.logging.Log;
@@ -150,10 +149,10 @@ public class ChangesXMLTest
for (Object release1 : releases) {
Release release = (Release) release1;
if ("1.0".equals(release.getVersion())) {
- Action action = (Action) release.getActions().get(0);
+ Action action = release.getActions().get(0);
assertEquals(2, action.getFixedIssues().size());
- assertEquals("JIRA-XXX", ((FixedIssue) action.getFixedIssues().get(0)).getIssue());
- assertEquals("JIRA-YYY", ((FixedIssue) action.getFixedIssues().get(1)).getIssue());
+ assertEquals("JIRA-XXX", action.getFixedIssues().get(0).getIssue());
+ assertEquals("JIRA-YYY", action.getFixedIssues().get(1).getIssue());
assertEquals(2, action.getDueTos().size());
}
}
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java Mon Aug 26 15:49:32 2013
@@ -46,7 +46,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Calendar;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java Mon Aug 26 15:49:32 2013
@@ -381,7 +381,7 @@ public class CheckstyleReport
{
if ( "config/sun_checks.xml".equals( configLocation ) && !"sun".equals( format ) )
{
- configLocation = (String) FORMAT_TO_CONFIG_LOCATION.get( format );
+ configLocation = FORMAT_TO_CONFIG_LOCATION.get( format );
}
if ( StringUtils.isEmpty( propertiesLocation ) )
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java Mon Aug 26 15:49:32 2013
@@ -461,15 +461,7 @@ public class CheckstyleViolationCheckMoj
{
if ( logViolationsToConsole )
{
- StringBuilder stb = new StringBuilder();
- stb.append( file );
- stb.append( '[' );
- stb.append( xpp.getAttributeValue( "", "line" ) );
- stb.append( ':' );
- stb.append( xpp.getAttributeValue( "", "column" ) );
- stb.append( "] " );
- stb.append( xpp.getAttributeValue( "", "message" ) );
- getLog().error( stb.toString() );
+ getLog().error(file + '[' + xpp.getAttributeValue("", "line") + ':' + xpp.getAttributeValue("", "column") + "] " + xpp.getAttributeValue("", "message"));
}
count++;
}
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java Mon Aug 26 15:49:32 2013
@@ -159,7 +159,7 @@ public class DefaultCheckstyleExecutor
}
}
- URLClassLoader projectClassLoader = new URLClassLoader( (URL[]) urls.toArray( new URL[urls.size()] ), null );
+ URLClassLoader projectClassLoader = new URLClassLoader(urls.toArray( new URL[urls.size()] ), null );
checker.setClassloader( projectClassLoader );
checker.setModuleClassLoader( Thread.currentThread().getContextClassLoader() );
@@ -289,7 +289,7 @@ public class DefaultCheckstyleExecutor
// MCHECKSTYLE-173 Only add the "charset" attribute if it has not been set
try
{
- if ( ( (DefaultConfiguration) config ).getAttribute( "charset" ) == null )
+ if ( config.getAttribute("charset") == null )
{
( (DefaultConfiguration) config ).addAttribute( "charset", effectiveEncoding );
}
@@ -312,7 +312,7 @@ public class DefaultCheckstyleExecutor
if (module instanceof DefaultConfiguration) {
//MCHECKSTYLE-132 DefaultConfiguration addAttribute has changed in checkstyle 5.3
try {
- if (((DefaultConfiguration) module).getAttribute("cacheFile") == null) {
+ if (module.getAttribute("cacheFile") == null) {
((DefaultConfiguration) module).addAttribute("cacheFile", request.getCacheFile());
}
} catch (CheckstyleException ex) {
@@ -505,7 +505,7 @@ public class DefaultCheckstyleExecutor
getLogger().debug( "Added " + files.size() + " files to process." );
- return (File[]) files.toArray(new File[files.size()]);
+ return files.toArray(new File[files.size()]);
}
private void addFilesToProcess( CheckstyleExecutorRequest request, StringBuilder excludesStr, File sourceDirectory,
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerMultiSourceTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerMultiSourceTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerMultiSourceTest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerMultiSourceTest.java Mon Aug 26 15:49:32 2013
@@ -102,7 +102,7 @@ public class CheckstyleReportListenerMul
fireAuditFinished( null );
- CheckstyleReportListener listener = (CheckstyleReportListener) listenerMap.get( SeverityLevel.INFO );
+ CheckstyleReportListener listener = listenerMap.get( SeverityLevel.INFO );
CheckstyleResults results = listener.getResults();
assertEquals( "Test total files", 4, results.getFiles().size() );
assertEquals( "Test file count", 4, results.getFileCount() );
@@ -112,7 +112,7 @@ public class CheckstyleReportListenerMul
assertEquals( "test file severities", 0, results.getSeverityCount( "file1", SeverityLevel.ERROR ) );
assertEquals( "test file severities", 0, results.getSeverityCount( "file1", SeverityLevel.IGNORE ) );
- listener = (CheckstyleReportListener) listenerMap.get( SeverityLevel.WARNING );
+ listener = listenerMap.get( SeverityLevel.WARNING );
results = listener.getResults();
assertEquals( "Test total files", 4, results.getFiles().size() );
assertEquals( "Test file count", 4, results.getFileCount() );
@@ -122,7 +122,7 @@ public class CheckstyleReportListenerMul
assertEquals( "test file severities", 0, results.getSeverityCount( "file2", SeverityLevel.ERROR ) );
assertEquals( "test file severities", 0, results.getSeverityCount( "file2", SeverityLevel.IGNORE ) );
- listener = (CheckstyleReportListener) listenerMap.get( SeverityLevel.ERROR );
+ listener = listenerMap.get( SeverityLevel.ERROR );
results = listener.getResults();
assertEquals( "Test total files", 4, results.getFiles().size() );
assertEquals( "Test file count", 4, results.getFileCount() );
@@ -132,7 +132,7 @@ public class CheckstyleReportListenerMul
assertEquals( "test file severities", 3, results.getSeverityCount( "file3", SeverityLevel.ERROR ) );
assertEquals( "test file severities", 0, results.getSeverityCount( "file3", SeverityLevel.IGNORE ) );
- listener = (CheckstyleReportListener) listenerMap.get( SeverityLevel.IGNORE );
+ listener = listenerMap.get( SeverityLevel.IGNORE );
results = listener.getResults();
assertEquals( "Test total files", 4, results.getFiles().size() );
assertEquals( "Test file count", 4, results.getFileCount() );
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java Mon Aug 26 15:49:32 2013
@@ -96,7 +96,7 @@ public class CheckstyleReportListenerTes
fireAuditFinished( null );
- CheckstyleReportListener listener = (CheckstyleReportListener) listenerMap.get( SeverityLevel.INFO );
+ CheckstyleReportListener listener = listenerMap.get( SeverityLevel.INFO );
CheckstyleResults results = listener.getResults();
assertEquals( "Test total files", 4, results.getFiles().size() );
assertEquals( "Test file count", 4, results.getFileCount() );
@@ -106,7 +106,7 @@ public class CheckstyleReportListenerTes
assertEquals( "test file severities", 0, results.getSeverityCount( "file1", SeverityLevel.ERROR ) );
assertEquals( "test file severities", 0, results.getSeverityCount( "file1", SeverityLevel.IGNORE ) );
- listener = (CheckstyleReportListener) listenerMap.get( SeverityLevel.WARNING );
+ listener = listenerMap.get( SeverityLevel.WARNING );
results = listener.getResults();
assertEquals( "Test total files", 4, results.getFiles().size() );
assertEquals( "Test file count", 4, results.getFileCount() );
@@ -116,7 +116,7 @@ public class CheckstyleReportListenerTes
assertEquals( "test file severities", 0, results.getSeverityCount( "file2", SeverityLevel.ERROR ) );
assertEquals( "test file severities", 0, results.getSeverityCount( "file2", SeverityLevel.IGNORE ) );
- listener = (CheckstyleReportListener) listenerMap.get( SeverityLevel.ERROR );
+ listener = listenerMap.get( SeverityLevel.ERROR );
results = listener.getResults();
assertEquals( "Test total files", 4, results.getFiles().size() );
assertEquals( "Test file count", 4, results.getFileCount() );
@@ -126,7 +126,7 @@ public class CheckstyleReportListenerTes
assertEquals( "test file severities", 3, results.getSeverityCount( "file3", SeverityLevel.ERROR ) );
assertEquals( "test file severities", 0, results.getSeverityCount( "file3", SeverityLevel.IGNORE ) );
- listener = (CheckstyleReportListener) listenerMap.get( SeverityLevel.IGNORE );
+ listener = listenerMap.get( SeverityLevel.IGNORE );
results = listener.getResults();
assertEquals( "Test total files", 4, results.getFiles().size() );
assertEquals( "Test file count", 4, results.getFileCount() );
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java Mon Aug 26 15:49:32 2013
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.checksty
*/
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.Writer;
import java.util.Locale;
@@ -28,14 +27,9 @@ import java.util.ResourceBundle;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkFactory;
import org.apache.maven.doxia.site.decoration.DecorationModel;
-import org.apache.maven.doxia.siterenderer.DefaultSiteRenderer;
-import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
-import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.reporting.MavenReport;
import org.codehaus.plexus.util.FileUtils;
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MultiMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MultiMavenProjectStub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MultiMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MultiMavenProjectStub.java Mon Aug 26 15:49:32 2013
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.checksty
*/
import java.io.File;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java Mon Aug 26 15:49:32 2013
@@ -421,7 +421,7 @@ public class PurgeLocalRepositoryMojo
for ( int i = 1; i < pathComponents.length; ++i )
{
- path.append( "/" + pathComponents[i] );
+ path.append("/").append(pathComponents[i]);
}
return path.toString();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java Mon Aug 26 15:49:32 2013
@@ -378,9 +378,7 @@ public abstract class AbstractAnalyzeMoj
// called because artifact will set the version to -SNAPSHOT only if I do this. MNG-2961
artifact.isSnapshot();
- buf.append( scriptableFlag + ":" + pomFile + ":" + artifact.getDependencyConflictId() + ":"
- + artifact.getClassifier() + ":" + artifact.getBaseVersion() + ":" + artifact.getScope()
- + "\n" );
+ buf.append(scriptableFlag).append(":").append(pomFile).append(":").append(artifact.getDependencyConflictId()).append(":").append(artifact.getClassifier()).append(":").append(artifact.getBaseVersion()).append(":").append(artifact.getScope()).append("\n");
}
getLog().info( "\n" + buf );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java Mon Aug 26 15:49:32 2013
@@ -118,7 +118,7 @@ public class AnalyzeDuplicateMojo
{
String dup = it.next();
- sb.append( "\to " + dup );
+ sb.append("\to ").append(dup);
if ( it.hasNext() )
{
sb.append( "\n" );
@@ -138,7 +138,7 @@ public class AnalyzeDuplicateMojo
{
String dup = it.next();
- sb.append( "\to " + dup );
+ sb.append("\to ").append(dup);
if ( it.hasNext() )
{
sb.append( "\n" );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java Mon Aug 26 15:49:32 2013
@@ -230,7 +230,7 @@ public class BuildClasspathMojo
while ( i.hasNext() )
{
sb.append( isPathSepSet ? this.pathSeparator : File.pathSeparator );
- appendArtifactPath( (Artifact) i.next(), sb );
+ appendArtifactPath(i.next(), sb );
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java Mon Aug 26 15:49:32 2013
@@ -64,13 +64,7 @@ public class DOTDependencyNodeVisitor
for ( DependencyNode child : children )
{
- StringBuilder sb = new StringBuilder();
- sb.append( "\t\"" );
- sb.append( node.toNodeString() );
- sb.append( "\" -> \"" );
- sb.append( child.toNodeString() );
- sb.append( "\" ; " );
- writer.println( sb.toString() );
+ writer.println("\t\"" + node.toNodeString() + "\" -> \"" + child.toNodeString() + "\" ; ");
}
return true;
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestSkip.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestSkip.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestSkip.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestSkip.java Mon Aug 26 15:49:32 2013
@@ -293,7 +293,7 @@ public class TestSkip
private void print( String prefix, CharSequence content )
{
- sb.append( "[" + prefix + "] " ).append( content.toString() ).append( "\n" );
+ sb.append("[").append(prefix).append("] ").append(content.toString()).append( "\n" );
}
private void print( String prefix, Throwable error )
@@ -303,7 +303,7 @@ public class TestSkip
error.printStackTrace( pWriter );
- sb.append( "[" + prefix + "] " ).append( sWriter.toString() ).append( "\n" );
+ sb.append("[").append(prefix).append("] ").append(sWriter.toString()).append( "\n" );
}
private void print( String prefix, CharSequence content, Throwable error )
@@ -313,7 +313,7 @@ public class TestSkip
error.printStackTrace( pWriter );
- sb.append( "[" + prefix + "] " ).append( content.toString() ).append( "\n\n" )
+ sb.append("[").append(prefix).append("] ").append(content.toString()).append( "\n\n" )
.append( sWriter.toString() ).append( "\n" );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDepMgt.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDepMgt.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDepMgt.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDepMgt.java Mon Aug 26 15:49:32 2013
@@ -173,7 +173,7 @@ public class TestAnalyzeDepMgt
assertEquals( 1, l.size() );
- assertEquals( mojo.getExclusionKey( ex ), mojo.getExclusionKey(( Artifact) l.get( 0 ) ) );
+ assertEquals( mojo.getExclusionKey( ex ), mojo.getExclusionKey(l.get( 0 )) );
}
public void testGetMismatch()
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDuplicateMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDuplicateMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDuplicateMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDuplicateMojo.java Mon Aug 26 15:49:32 2013
@@ -190,7 +190,7 @@ public class TestAnalyzeDuplicateMojo
private void print( String prefix, CharSequence content )
{
- sb.append( "[" + prefix + "] " ).append( content.toString() ).append( "\n" );
+ sb.append("[").append(prefix).append("] ").append(content.toString()).append( "\n" );
}
private void print( String prefix, Throwable error )
@@ -200,7 +200,7 @@ public class TestAnalyzeDuplicateMojo
error.printStackTrace( pWriter );
- sb.append( "[" + prefix + "] " ).append( sWriter.toString() ).append( "\n" );
+ sb.append("[").append(prefix).append("] ").append(sWriter.toString()).append( "\n" );
}
private void print( String prefix, CharSequence content, Throwable error )
@@ -210,7 +210,7 @@ public class TestAnalyzeDuplicateMojo
error.printStackTrace( pWriter );
- sb.append( "[" + prefix + "] " ).append( content.toString() ).append( "\n\n" )
+ sb.append("[").append(prefix).append("] ").append(content.toString()).append( "\n\n" )
.append( sWriter.toString() ).append( "\n" );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java Mon Aug 26 15:49:32 2013
@@ -192,7 +192,7 @@ public class TestCopyMojo
throws Exception
{
List<ArtifactItem> list = stubFactory.getArtifactItems( stubFactory.getClassifiedArtifacts() );
- ArtifactItem item = (ArtifactItem) list.get( 0 );
+ ArtifactItem item = list.get( 0 );
item.setOutputDirectory( new File( mojo.getOutputDirectory(), "testOverride" ) );
mojo.setArtifactItems( list );
@@ -206,7 +206,7 @@ public class TestCopyMojo
throws Exception
{
List<ArtifactItem> list = stubFactory.getArtifactItems( stubFactory.getClassifiedArtifacts() );
- ArtifactItem item = (ArtifactItem) list.get( 0 );
+ ArtifactItem item = list.get( 0 );
item.setOutputDirectory( new File( mojo.getOutputDirectory(), "testOverride" ) );
mojo.setStripVersion( true );
@@ -222,7 +222,7 @@ public class TestCopyMojo
throws Exception
{
List<ArtifactItem> list = stubFactory.getArtifactItems( stubFactory.getClassifiedArtifacts() );
- ArtifactItem item = (ArtifactItem) list.get( 0 );
+ ArtifactItem item = list.get( 0 );
item.setOutputDirectory( new File( mojo.getOutputDirectory(), "testOverride" ) );
mojo.setStripClassifier( true );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java Mon Aug 26 15:49:32 2013
@@ -160,7 +160,7 @@ public class TestUnpackMojo
throws Exception
{
List<ArtifactItem> list = stubFactory.getArtifactItems( stubFactory.getClassifiedArtifacts() );
- ArtifactItem item = (ArtifactItem) list.get( 0 );
+ ArtifactItem item = list.get( 0 );
item.setOutputDirectory( new File( mojo.getOutputDirectory(), "testOverride" ) );
mojo.setArtifactItems( list );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/tree/TestTreeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/tree/TestTreeMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/tree/TestTreeMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/tree/TestTreeMojo.java Mon Aug 26 15:49:32 2013
@@ -207,7 +207,7 @@ public class TestTreeMojo
private void assertChildNodeEquals( String expectedNode, DependencyNode actualParentNode, int actualChildIndex )
{
- DependencyNode actualNode = (DependencyNode) actualParentNode.getChildren().get( actualChildIndex );
+ DependencyNode actualNode = actualParentNode.getChildren().get( actualChildIndex );
assertNodeEquals( expectedNode, actualNode );
}
Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java Mon Aug 26 15:49:32 2013
@@ -98,7 +98,7 @@ public class DeployArtifactStub
metadataMap = new HashMap<Object, ArtifactMetadata>();
}
- ArtifactMetadata m = (ArtifactMetadata) metadataMap.get( metadata.getKey() );
+ ArtifactMetadata m = metadataMap.get( metadata.getKey() );
if ( m != null )
{
m.merge( metadata );
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Mon Aug 26 15:49:32 2013
@@ -480,7 +480,7 @@ public class EarMojo
excludeList.add( "**/" + META_INF + "/application.xml" );
}
- return (String[]) excludeList.toArray( EMPTY_STRING_ARRAY );
+ return excludeList.toArray( EMPTY_STRING_ARRAY );
}
/**
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java Mon Aug 26 15:49:32 2013
@@ -142,7 +142,7 @@ public class ArtifactTypeMappingService
}
else
{
- return (String) customMappings.get( type );
+ return customMappings.get( type );
}
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java Mon Aug 26 15:49:32 2013
@@ -122,7 +122,7 @@ public class EarMavenArchiver
final Set<String> keys = config.getManifestEntries().keySet();
for ( String key : keys )
{
- String value = (String) config.getManifestEntries().get( key );
+ String value = config.getManifestEntries().get( key );
if ( "Class-Path".equals( key ) && value != null )
{
return value;
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java Mon Aug 26 15:49:32 2013
@@ -36,9 +36,7 @@ import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
/**
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java Mon Aug 26 15:49:32 2013
@@ -19,7 +19,6 @@
package org.apache.maven.plugin.eclipse;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Mon Aug 26 15:49:32 2013
@@ -26,7 +26,6 @@ import java.io.OutputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -1265,7 +1264,6 @@ public class EclipsePlugin
// Repository Id should be ignored by Wagon ...
Repository repository = new Repository("additonal-configs", endPointUrl);
Wagon wagon = wagonManager.getWagon(repository);
- ;
if (logger.isDebugEnabled()) {
Debug debug = new Debug();
wagon.addSessionListener(debug);
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java Mon Aug 26 15:49:32 2013
@@ -268,16 +268,7 @@ public class EclipseSourceDir
*/
public String toString()
{
- StringBuilder buffer = new StringBuilder();
- buffer.append( isResource ? "resource " : "source " );
- buffer.append( path );
- buffer.append( ": " );
- buffer.append( "output=" ).append( output ).append( ", " );
- buffer.append( "include=[" ).append( getIncludeAsString() ).append( "], " );
- buffer.append( "exclude=[" ).append( getExcludeAsString() ).append( "], " );
- buffer.append( "test=" ).append( test ).append( ", " );
- buffer.append( "filtering=" ).append( filtering );
- return buffer.toString();
+ return (isResource ? "resource " : "source ") + path + ": " + "output=" + output + ", " + "include=[" + getIncludeAsString() + "], " + "exclude=[" + getExcludeAsString() + "], " + "test=" + test + ", " + "filtering=" + filtering;
}
/**
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java Mon Aug 26 15:49:32 2013
@@ -57,7 +57,6 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java Mon Aug 26 15:49:32 2013
@@ -22,7 +22,6 @@ import java.io.File;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.jar.Attributes;