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/25 20:39:44 UTC
svn commit: r1517363 - in /maven/plugins/trunk:
maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/
maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/
maven-project-info-reports-plugin/src/main/java/org/apache/maven/rep...
Author: krosenvold
Date: Sun Aug 25 18:39:43 2013
New Revision: 1517363
URL: http://svn.apache.org/r1517363
Log:
More java5
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.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/it/IT_BadDependencyPoms.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/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/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Sun Aug 25 18:39:43 2013
@@ -904,7 +904,7 @@ public abstract class AbstractInvokerMoj
dirs.add( projectPath );
}
- boolean filter = false;
+ boolean filter;
// clone project directories
try
@@ -2208,7 +2208,7 @@ public abstract class AbstractInvokerMoj
Map<String, Object> composite = getInterpolationValueSource();
reader = new BufferedReader( new InterpolationFilterReader( newReader( tokenFile ), composite ) );
- String line = null;
+ String line;
while ( ( line = reader.readLine() ) != null )
{
result.addAll( collectListFromCSV( line ) );
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java Sun Aug 25 18:39:43 2013
@@ -595,12 +595,10 @@ public class InstallMojo
Artifact originatingArtifact = project.getArtifact();
- for ( int i = 0; i < extraArtifacts.length; i++ )
- {
- String[] gav = extraArtifacts[i].split( ":" );
- if ( gav.length < 3 || gav.length > 5 )
- {
- throw new MojoExecutionException( "Invalid artifact " + extraArtifacts[i] );
+ for (String extraArtifact : extraArtifacts) {
+ String[] gav = extraArtifact.split(":");
+ if (gav.length < 3 || gav.length > 5) {
+ throw new MojoExecutionException("Invalid artifact " + extraArtifact);
}
String groupId = gav[0];
@@ -608,52 +606,42 @@ public class InstallMojo
String version = gav[2];
String type = "jar";
- if ( gav.length > 3 )
- {
+ if (gav.length > 3) {
type = gav[3];
}
String classifier = null;
- if ( gav.length == 5 )
- {
+ if (gav.length == 5) {
classifier = gav[4];
}
List<ArtifactRepository> remoteRepositories;
- if ( "maven-plugin".equals( type ) )
- {
+ if ("maven-plugin".equals(type)) {
remoteRepositories = this.remotePluginRepositories;
- }
- else
- {
+ } else {
remoteRepositories = this.remoteArtifactRepositories;
}
Artifact artifact = null;
- try
- {
- artifact = artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type, classifier );
+ try {
+ artifact = artifactFactory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
ArtifactResolutionResult arr =
- resolver.resolveTransitively( Collections.singleton( artifact ), originatingArtifact,
- remoteRepositories, localRepository, artifactMetadataSource );
+ resolver.resolveTransitively(Collections.singleton(artifact), originatingArtifact,
+ remoteRepositories, localRepository, artifactMetadataSource);
- if ( !groupId.equals( artifact.getGroupId() ) || !artifactId.equals( artifact.getArtifactId() )
- || !version.equals( artifact.getVersion() ) )
- {
+ if (!groupId.equals(artifact.getGroupId()) || !artifactId.equals(artifact.getArtifactId())
+ || !version.equals(artifact.getVersion())) {
artifact =
- artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type, classifier );
- copyPoms( artifact, testRepository );
+ artifactFactory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
+ copyPoms(artifact, testRepository);
}
- for ( Artifact arrArtifact : (Set<Artifact>) arr.getArtifacts() )
- {
- copyArtifact( arrArtifact, testRepository );
+ for (Artifact arrArtifact : (Set<Artifact>) arr.getArtifacts()) {
+ copyArtifact(arrArtifact, testRepository);
}
- }
- catch ( Exception e )
- {
- throw new MojoExecutionException( "Unable to resolve dependencies for: " + artifact, e );
+ } catch (Exception e) {
+ throw new MojoExecutionException("Unable to resolve dependencies for: " + artifact, e);
}
}
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java Sun Aug 25 18:39:43 2013
@@ -208,19 +208,19 @@ class InvokerProperties
String nonRecursive = get( InvocationProperty.NON_RECURSIVE, index );
if ( nonRecursive != null )
{
- request.setRecursive( !Boolean.valueOf( nonRecursive ).booleanValue() );
+ request.setRecursive( !Boolean.valueOf(nonRecursive));
}
String offline = get( InvocationProperty.OFFLINE, index );
if ( offline != null )
{
- request.setOffline( Boolean.valueOf( offline ).booleanValue() );
+ request.setOffline(Boolean.valueOf(offline));
}
String debug = get( InvocationProperty.DEBUG, index );
if ( debug != null )
{
- request.setDebug( Boolean.valueOf( debug ).booleanValue() );
+ request.setDebug(Boolean.valueOf(debug));
}
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java Sun Aug 25 18:39:43 2013
@@ -98,9 +98,8 @@ class MetadataUtils
{
Xpp3Dom[] children = versions.getChildren( "version" );
- for ( int i = 0; i < children.length; i++ )
- {
- allVersions.add( children[i].getValue() );
+ for (Xpp3Dom aChildren : children) {
+ allVersions.add(aChildren.getValue());
}
}
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java Sun Aug 25 18:39:43 2013
@@ -46,17 +46,13 @@ class SelectorUtils
{
String[] tokens = ( list != null ) ? StringUtils.split( list, "," ) : new String[0];
- for ( int i = 0; i < tokens.length; i++ )
- {
- String token = tokens[i].trim();
+ for (String token1 : tokens) {
+ String token = token1.trim();
- if ( token.startsWith( "!" ) )
- {
- excludes.add( token.substring( 1 ) );
- }
- else
- {
- includes.add( token );
+ if (token.startsWith("!")) {
+ excludes.add(token.substring(1));
+ } else {
+ includes.add(token);
}
}
}
@@ -247,9 +243,8 @@ class SelectorUtils
List<Integer> numbers = new ArrayList<Integer>();
- for ( int i = 0; i < tokens.length; i++ )
- {
- numbers.add( Integer.valueOf( tokens[i] ) );
+ for (String token : tokens) {
+ numbers.add(Integer.valueOf(token));
}
return numbers;
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=1517363&r1=1517362&r2=1517363&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 Sun Aug 25 18:39:43 2013
@@ -94,7 +94,7 @@ public class InterpolationTest
throws Exception
{
Reader reader = null;
- File interpolatedPomFile = null;
+ File interpolatedPomFile;
try
{
InvokerMojo invokerMojo = new InvokerMojo();
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Sun Aug 25 18:39:43 2013
@@ -480,7 +480,7 @@ public abstract class AbstractProjectInf
value = i18nOriginal.getString( bundleName, locale, key );
}
- if ( value.indexOf( "${" ) < 0 )
+ if (!value.contains("${"))
{
return value;
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java Sun Aug 25 18:39:43 2013
@@ -539,19 +539,14 @@ public class DependencyConvergenceReport
for ( MavenProject reactorProject : reactorProjects )
{
- @SuppressWarnings( "unchecked" )
- Iterator<Dependency> itdep = reactorProject.getDependencies().iterator();
- while ( itdep.hasNext() )
- {
- Dependency dep = itdep.next();
+ for (Dependency dep : (Iterable<Dependency>) reactorProject.getDependencies()) {
String key = dep.getGroupId() + ":" + dep.getArtifactId();
- List<ReverseDependencyLink> depList = dependencyMap.get( key );
- if ( depList == null )
- {
+ List<ReverseDependencyLink> depList = dependencyMap.get(key);
+ if (depList == null) {
depList = new ArrayList<ReverseDependencyLink>();
}
- depList.add( new ReverseDependencyLink( dep, reactorProject ) );
- dependencyMap.put( key, depList );
+ depList.add(new ReverseDependencyLink(dep, reactorProject));
+ dependencyMap.put(key, depList);
}
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java Sun Aug 25 18:39:43 2013
@@ -155,7 +155,7 @@ public class LicenseReport
protected static URL getLicenseURL( MavenProject project, String url )
throws IOException
{
- URL licenseUrl = null;
+ URL licenseUrl;
UrlValidator urlValidator = new UrlValidator( UrlValidator.ALLOW_ALL_SCHEMES );
// UrlValidator does not accept file URLs because the file
// URLs do not contain a valid authority (no hostname).
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java Sun Aug 25 18:39:43 2013
@@ -210,11 +210,11 @@ public class MailingListsReport
{
// For the first line
Iterator<String> it = mailingList.getOtherArchives().iterator();
- String otherArchive = it.next().toString();
+ String otherArchive = it.next();
textRow.add( createLinkPatternedText( getArchiveServer( otherArchive ), otherArchive ) );
- tableRow( textRow.toArray( EMPTY_STRING_ARRAY ) );
+ tableRow(textRow.toArray(new String[textRow.size()]));
// Other lines...
while ( it.hasNext() )
@@ -241,7 +241,7 @@ public class MailingListsReport
textRow.add( createLinkPatternedText( getArchiveServer( otherArchive ), otherArchive ) );
- tableRow( textRow.toArray( EMPTY_STRING_ARRAY ) );
+ tableRow(textRow.toArray(new String[textRow.size()]));
}
}
else
@@ -251,7 +251,7 @@ public class MailingListsReport
textRow.add( null );
}
- tableRow( textRow.toArray( EMPTY_STRING_ARRAY ) );
+ tableRow(textRow.toArray(new String[textRow.size()]));
}
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java Sun Aug 25 18:39:43 2013
@@ -313,7 +313,8 @@ public class TeamListReport
if ( member.getRoles() != null )
{
// Comma separated roles
- tableCell( StringUtils.join( member.getRoles().toArray( EMPTY_STRING_ARRAY ), ", " ) );
+ List<String> var = member.getRoles();
+ tableCell( StringUtils.join(var.toArray(new String[var.size()]), ", " ) );
}
else
{
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=1517363&r1=1517362&r2=1517363&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 Sun Aug 25 18:39:43 2013
@@ -1299,7 +1299,7 @@ public class DependenciesRenderer
Integer old = totalByRepo.get( repokey );
if ( old == null )
{
- old = new Integer( 0 );
+ old = 0;
totalByRepo.put( repokey, old );
}
@@ -1333,7 +1333,7 @@ public class DependenciesRenderer
sink.link_();
sink.tableCell_();
- totalByRepo.put( repokey, new Integer( old.intValue() + 1 ) );
+ totalByRepo.put( repokey, old.intValue() + 1);
}
else
{
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=1517363&r1=1517362&r2=1517363&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 Sun Aug 25 18:39:43 2013
@@ -665,7 +665,7 @@ public class ProcessRemoteResourcesMojo
}
getLog().debug( "Building project for " + artifact );
- MavenProject p = null;
+ MavenProject p;
try
{
p = mavenProjectBuilder.buildFromRepository( artifact, remoteRepo, localRepository );
@@ -1304,36 +1304,29 @@ public class ProcessRemoteResourcesMojo
}
List<Supplement> supplements = new ArrayList<Supplement>();
- for ( int idx = 0; idx < models.length; idx++ )
- {
- String set = models[idx];
- getLog().debug( "Preparing ruleset: " + set );
- try
- {
- File f = locator.getResourceAsFile( set, getLocationTemp( set ) );
+ for (String set : models) {
+ getLog().debug("Preparing ruleset: " + set);
+ try {
+ File f = locator.getResourceAsFile(set, getLocationTemp(set));
- if ( null == f || !f.exists() )
- {
- throw new MojoExecutionException( "Cold not resolve " + set );
+ if (null == f || !f.exists()) {
+ throw new MojoExecutionException("Cold not resolve " + set);
}
- if ( !f.canRead() )
- {
- throw new MojoExecutionException( "Supplemental data models won't be loaded. " + "File " +
- f.getAbsolutePath() +
- " cannot be read, check permissions on the file." );
+ if (!f.canRead()) {
+ throw new MojoExecutionException("Supplemental data models won't be loaded. " + "File " +
+ f.getAbsolutePath() +
+ " cannot be read, check permissions on the file.");
}
- getLog().debug( "Loading supplemental models from " + f.getAbsolutePath() );
+ getLog().debug("Loading supplemental models from " + f.getAbsolutePath());
SupplementalDataModelXpp3Reader reader = new SupplementalDataModelXpp3Reader();
- SupplementalDataModel supplementalModel = reader.read( new FileReader( f ) );
- supplements.addAll( supplementalModel.getSupplement() );
- }
- catch ( Exception e )
- {
+ SupplementalDataModel supplementalModel = reader.read(new FileReader(f));
+ supplements.addAll(supplementalModel.getSupplement());
+ } catch (Exception e) {
String msg = "Error loading supplemental data models: " + e.getMessage();
- getLog().error( msg, e );
- throw new MojoExecutionException( msg, e );
+ getLog().error(msg, e);
+ throw new MojoExecutionException(msg, e);
}
}
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=1517363&r1=1517362&r2=1517363&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 Sun Aug 25 18:39:43 2013
@@ -323,8 +323,8 @@ public class RemoteResourcesMojoTest
assertTrue( file.exists() );
String data = FileUtils.fileRead( file );
- assertTrue( data.indexOf( "2007" ) != -1 );
- assertTrue( data.indexOf( "default-filterbundles" ) != -1 );
+ assertTrue(data.contains("2007"));
+ assertTrue(data.contains("default-filterbundles"));
}
public void testFilteredBundlesWithProjectProperties()
@@ -359,8 +359,8 @@ public class RemoteResourcesMojoTest
assertTrue( file.exists() );
String data = FileUtils.fileRead( file );
- assertTrue( data.indexOf( "maven" ) != -1 );
- assertTrue( data.indexOf( "rules" ) != -1 );
+ assertTrue(data.contains("maven"));
+ assertTrue(data.contains("rules"));
}
protected void buildResourceBundle( String id,
@@ -376,12 +376,11 @@ public class RemoteResourcesMojoTest
setupDefaultProject( project );
- for ( int x = 0; x < resourceNames.length; x++ )
- {
- File resource = new File( resourceDir, resourceNames[x] );
- URL source = getClass().getResource( "/" + resourceNames[x] );
+ for (String resourceName2 : resourceNames) {
+ File resource = new File(resourceDir, resourceName2);
+ URL source = getClass().getResource("/" + resourceName2);
- FileUtils.copyURLToFile( source, resource );
+ FileUtils.copyURLToFile(source, resource);
}
mojo.execute();
@@ -390,9 +389,8 @@ public class RemoteResourcesMojoTest
assertTrue( xmlFile.exists() );
String data = FileUtils.fileRead( xmlFile );
- for ( int x = 0; x < resourceNames.length; x++ )
- {
- assertTrue( data.indexOf( resourceNames[x] ) != -1 );
+ for (String resourceName1 : resourceNames) {
+ assertTrue(data.contains(resourceName1));
}
if ( null != jarName )
@@ -402,13 +400,12 @@ public class RemoteResourcesMojoTest
jar.write( data.getBytes() );
jar.closeEntry();
- for ( int x = 0; x < resourceNames.length; x++ )
- {
- File resource = new File( resourceDir, resourceNames[x] );
- InputStream in = new FileInputStream( resource );
- jar.putNextEntry( new ZipEntry( resourceNames[x] ) );
- IOUtil.copy( in, jar );
- IOUtil.close( in );
+ for (String resourceName : resourceNames) {
+ File resource = new File(resourceDir, resourceName);
+ InputStream in = new FileInputStream(resource);
+ jar.putNextEntry(new ZipEntry(resourceName));
+ IOUtil.copy(in, jar);
+ IOUtil.close(in);
jar.closeEntry();
}
jar.close();
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java Sun Aug 25 18:39:43 2013
@@ -52,8 +52,8 @@ public class IT_BadDependencyPoms
File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" );
String content = FileUtils.fileRead( output );
- assertTrue( content.indexOf( "Dependency Id: test:missing:0.1" ) >= 0 );
- assertTrue( content.indexOf( "Dependency Id: test:pom:0.2" ) >= 0 );
+ assertTrue(content.contains("Dependency Id: test:missing:0.1"));
+ assertTrue(content.contains("Dependency Id: test:pom:0.2"));
}
}
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java Sun Aug 25 18:39:43 2013
@@ -48,7 +48,7 @@ public class IT_CustomFilterDelimiter
File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" );
String content = FileUtils.fileRead( output );
- assertTrue( content.indexOf( "Override: custom-filter-delim" ) > -1 );
+ assertTrue(content.contains("Override: custom-filter-delim"));
}
}
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java Sun Aug 25 18:39:43 2013
@@ -45,7 +45,7 @@ public class IT_FilterLocalOverride
File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" );
String content = FileUtils.fileRead( output );
- assertTrue( content.indexOf( "Override: filter-local-override" ) > -1 );
+ assertTrue(content.contains("Override: filter-local-override"));
}
}
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java Sun Aug 25 18:39:43 2013
@@ -45,7 +45,7 @@ public class IT_GenerateFromBundle
File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" );
String content = FileUtils.fileRead( output );
- assertTrue( content.indexOf( "Built-In:" ) > -1 );
+ assertTrue(content.contains("Built-In:"));
}
}
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java Sun Aug 25 18:39:43 2013
@@ -45,7 +45,7 @@ public class IT_GenerateFromBundleWithTy
File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" );
String content = FileUtils.fileRead( output );
- assertTrue( content.indexOf( "Built-In:" ) > -1 );
+ assertTrue(content.contains("Built-In:"));
}
}
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java Sun Aug 25 18:39:43 2013
@@ -45,7 +45,7 @@ public class IT_GenerateFromOverride
File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" );
String content = FileUtils.fileRead( output );
- assertTrue( content.indexOf( "Override:" ) > -1 );
+ assertTrue(content.contains("Override:"));
}
}
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java Sun Aug 25 18:39:43 2013
@@ -58,8 +58,8 @@ public class IT_GetDependencyProjects
File output = new File( dir, "project/target/maven-shared-archive-resources/DEPENDENCIES" );
String content = FileUtils.fileRead( output );
- assertTrue( content.indexOf( "Dependency Id: org.apache.maven.plugin.rresource.it.gdp:release:1.0" ) >= 0 );
- assertTrue( content.indexOf( "Dependency Id: org.apache.maven.plugin.rresource.it.gdp:snapshot:1.0-SNAPSHOT" ) >= 0 );
+ assertTrue(content.contains("Dependency Id: org.apache.maven.plugin.rresource.it.gdp:release:1.0"));
+ assertTrue(content.contains("Dependency Id: org.apache.maven.plugin.rresource.it.gdp:snapshot:1.0-SNAPSHOT"));
}
}
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java Sun Aug 25 18:39:43 2013
@@ -64,8 +64,8 @@ public class IT_RunOnlyAtExecutionRoot
String content = FileUtils.fileRead( output );
- assertTrue( content.indexOf( "Dependency Id: org.apache.maven.plugin.rresource.it.mrr41:release:1.0" ) >= 0 );
- assertTrue( content.indexOf( "Dependency Id: org.apache.maven.plugin.rresource.it.mrr41:snapshot:1.0-SNAPSHOT" ) >= 0 );
+ assertTrue(content.contains("Dependency Id: org.apache.maven.plugin.rresource.it.mrr41:release:1.0"));
+ assertTrue(content.contains("Dependency Id: org.apache.maven.plugin.rresource.it.mrr41:snapshot:1.0-SNAPSHOT"));
}
}
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java Sun Aug 25 18:39:43 2013
@@ -60,8 +60,8 @@ public class IT_SupplementalArtifact
File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" );
String content = FileUtils.fileRead( output );
- assertTrue( content.indexOf( "From: 'Deficient Tooling, Inc.' (http://www.deficient-tools.us/)" ) > -1 );
- assertTrue( content.indexOf( "Deficient Dependency (http://www.deficient-tools.us/dep) org.apache.maven.plugin.rresource.it.mrr43:deficient-dep" ) > -1 );
+ assertTrue(content.contains("From: 'Deficient Tooling, Inc.' (http://www.deficient-tools.us/)"));
+ assertTrue(content.contains("Deficient Dependency (http://www.deficient-tools.us/dep) org.apache.maven.plugin.rresource.it.mrr43:deficient-dep"));
}
}
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=1517363&r1=1517362&r2=1517363&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 Sun Aug 25 18:39:43 2013
@@ -223,20 +223,17 @@ public class MavenProjectBuildStub
{
File currentDirectory;
- for ( int nIndex = 0; nIndex < directoryList.size(); nIndex++ )
- {
- currentDirectory = new File( parent, "/" + (String) directoryList.get( nIndex ) );
+ for (String aDirectoryList : directoryList) {
+ currentDirectory = new File(parent, "/" + (String) aDirectoryList);
- if ( !currentDirectory.exists() )
- {
+ if (!currentDirectory.exists()) {
currentDirectory.mkdirs();
}
// duplicate dir structure in test resources
- currentDirectory = new File( testparent, "/" + (String) directoryList.get( nIndex ) );
+ currentDirectory = new File(testparent, "/" + (String) aDirectoryList);
- if ( !currentDirectory.exists() )
- {
+ if (!currentDirectory.exists()) {
currentDirectory.mkdirs();
}
}
@@ -276,26 +273,20 @@ public class MavenProjectBuildStub
return;
}
- for ( int nIndex = 0; nIndex < list.size(); nIndex++ )
- {
- currentFile = new File( parent, (String) list.get( nIndex ) );
+ for (String aList : list) {
+ currentFile = new File(parent, (String) aList);
// create the necessary parent directories
// before we create the files
- if ( !currentFile.getParentFile().exists() )
- {
+ if (!currentFile.getParentFile().exists()) {
currentFile.getParentFile().mkdirs();
}
- if ( !currentFile.exists() )
- {
- try
- {
+ if (!currentFile.exists()) {
+ try {
currentFile.createNewFile();
- populateFile( currentFile, RESOURCES_FILE );
- }
- catch ( IOException io )
- {
+ populateFile(currentFile, RESOURCES_FILE);
+ } catch (IOException io) {
//TODO: handle exception
}
}
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=1517363&r1=1517362&r2=1517363&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 Sun Aug 25 18:39:43 2013
@@ -135,17 +135,13 @@ public class MinijarFilter
@SuppressWarnings( "rawtypes" )
private void removePackages( Set clazzes, Set<String> packageNames )
{
- Iterator it = clazzes.iterator();
- while ( it.hasNext() )
- {
- Clazz clazz = (Clazz) it.next();
+ for (Object clazze : clazzes) {
+ Clazz clazz = (Clazz) clazze;
String name = clazz.getName();
- while ( name.contains( "." ) )
- {
- name = name.substring( 0, name.lastIndexOf( '.' ) );
- if ( packageNames.add( name ) )
- {
- removable.remove( new Clazz( name + ".package-info" ) );
+ while (name.contains(".")) {
+ name = name.substring(0, name.lastIndexOf('.'));
+ if (packageNames.add(name)) {
+ removable.remove(new Clazz(name + ".package-info"));
}
}
}
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=1517363&r1=1517362&r2=1517363&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 Sun Aug 25 18:39:43 2013
@@ -42,7 +42,7 @@ public final class RelativizePath
*/
static String convertToRelativePath( File thing, File relativeTo )
{
- StringBuilder relativePath = null;
+ StringBuilder relativePath;
if ( thing.getParentFile().equals( relativeTo.getParentFile() ) )
{
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java Sun Aug 25 18:39:43 2013
@@ -79,11 +79,7 @@ import org.jdom.output.XMLOutputter;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.ListIterator;
-import java.util.Map;
+import java.util.*;
/**
* Class MavenJDOMWriter.
@@ -1137,45 +1133,33 @@ public class MavenJDOMWriter
{
Xpp3Dom[] childs = parentDom.getChildren();
Collection domChilds = new ArrayList();
- for ( int i = 0; i < childs.length; i++ )
- {
- domChilds.add( childs[i] );
- }
+ Collections.addAll(domChilds, childs);
// int domIndex = 0;
- ListIterator it = parent.getChildren().listIterator();
- while ( it.hasNext() )
- {
- Element elem = (Element) it.next();
+ for (Object o : parent.getChildren()) {
+ Element elem = (Element) o;
Iterator it2 = domChilds.iterator();
Xpp3Dom corrDom = null;
- while ( it2.hasNext() )
- {
+ while (it2.hasNext()) {
Xpp3Dom dm = (Xpp3Dom) it2.next();
- if ( dm.getName().equals( elem.getName() ) )
- {
+ if (dm.getName().equals(elem.getName())) {
corrDom = dm;
break;
}
}
- if ( corrDom != null )
- {
- domChilds.remove( corrDom );
- replaceXpp3DOM( elem, corrDom, new Counter( counter.getDepth() + 1 ) );
+ if (corrDom != null) {
+ domChilds.remove(corrDom);
+ replaceXpp3DOM(elem, corrDom, new Counter(counter.getDepth() + 1));
counter.increaseCount();
- }
- else
- {
- parent.removeContent( elem );
+ } else {
+ parent.removeContent(elem);
}
}
- Iterator it2 = domChilds.iterator();
- while ( it2.hasNext() )
- {
- Xpp3Dom dm = (Xpp3Dom) it2.next();
- Element elem = factory.element( dm.getName(), parent.getNamespace() );
- insertAtPreferredLocation( parent, elem, counter );
+ for (Object domChild : domChilds) {
+ Xpp3Dom dm = (Xpp3Dom) domChild;
+ Element elem = factory.element(dm.getName(), parent.getNamespace());
+ insertAtPreferredLocation(parent, elem, counter);
counter.increaseCount();
- replaceXpp3DOM( elem, dm, new Counter( counter.getDepth() + 1 ) );
+ replaceXpp3DOM(elem, dm, new Counter(counter.getDepth() + 1));
}
}
else if ( parentDom.getValue() != null )
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java Sun Aug 25 18:39:43 2013
@@ -141,7 +141,7 @@ public class ApacheNoticeResourceTransfo
{
//resource-bundle 1.3 mode
if ( lineCount == 1
- && sb.toString().indexOf( "This product includes/uses software(s) developed by" ) != -1 )
+ && sb.toString().contains("This product includes/uses software(s) developed by"))
{
currentOrg = organizationEntries.get( sb.toString().trim() );
if ( currentOrg == null )
@@ -164,7 +164,7 @@ public class ApacheNoticeResourceTransfo
else
{
String ent = sb.toString();
- if ( ent.startsWith( projectName ) && ent.indexOf( "Copyright " ) != -1 )
+ if ( ent.startsWith( projectName ) && ent.contains("Copyright "))
{
copyright = ent;
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java?rev=1517363&r1=1517362&r2=1517363&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java Sun Aug 25 18:39:43 2013
@@ -87,47 +87,40 @@ public class ComponentsXmlResourceTransf
Xpp3Dom[] children = newDom.getChild( "components" ).getChildren( "component" );
- for ( int i = 0; i < children.length; i++ )
- {
- Xpp3Dom component = children[i];
-
- String role = getValue( component, "role" );
- role = getRelocatedClass( role, relocators );
- setValue( component, "role", role );
-
- String roleHint = getValue( component, "role-hint" );
-
- String impl = getValue( component, "implementation" );
- impl = getRelocatedClass( impl, relocators );
- setValue( component, "implementation", impl );
+ for (Xpp3Dom component : children) {
+ String role = getValue(component, "role");
+ role = getRelocatedClass(role, relocators);
+ setValue(component, "role", role);
+
+ String roleHint = getValue(component, "role-hint");
+
+ String impl = getValue(component, "implementation");
+ impl = getRelocatedClass(impl, relocators);
+ setValue(component, "implementation", impl);
String key = role + ':' + roleHint;
- if ( components.containsKey( key ) )
- {
+ if (components.containsKey(key)) {
// TODO: use the tools in Plexus to merge these properly. For now, I just need an all-or-nothing
// configuration carry over
- Xpp3Dom dom = components.get( key );
- if ( dom.getChild( "configuration" ) != null )
- {
- component.addChild( dom.getChild( "configuration" ) );
+ Xpp3Dom dom = components.get(key);
+ if (dom.getChild("configuration") != null) {
+ component.addChild(dom.getChild("configuration"));
}
}
- Xpp3Dom requirements = component.getChild( "requirements" );
- if ( requirements != null && requirements.getChildCount() > 0 )
- {
- for ( int r = requirements.getChildCount() - 1; r >= 0; r-- )
- {
- Xpp3Dom requirement = requirements.getChild( r );
-
- String requiredRole = getValue( requirement, "role" );
- requiredRole = getRelocatedClass( requiredRole, relocators );
- setValue( requirement, "role", requiredRole );
+ Xpp3Dom requirements = component.getChild("requirements");
+ if (requirements != null && requirements.getChildCount() > 0) {
+ for (int r = requirements.getChildCount() - 1; r >= 0; r--) {
+ Xpp3Dom requirement = requirements.getChild(r);
+
+ String requiredRole = getValue(requirement, "role");
+ requiredRole = getRelocatedClass(requiredRole, relocators);
+ setValue(requirement, "role", requiredRole);
}
}
- components.put( key, component );
+ components.put(key, component);
}
}