From 71a8427df6286955c17ce1d6701804896c2b7ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sun, 2 Dec 2012 12:38:12 +0100 Subject: [PATCH] code formatting --- .../maven/lifecycle/internal/BuilderCommon.java | 7 ++++--- .../lifecycle/internal/LifecycleModuleBuilder.java | 4 ++-- .../lifecycle/internal/LifecycleWeaveBuilder.java | 11 +++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java index a0187378b6..2c228ba645 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java @@ -133,8 +133,10 @@ public class BuilderCommon return executionPlan; } - public void handleBuildError(final ReactorContext buildContext, final MavenSession rootSession, final MavenSession currentSession, - final MavenProject mavenProject, Exception e, final long buildStartTime) { + public void handleBuildError( final ReactorContext buildContext, final MavenSession rootSession, + final MavenSession currentSession, final MavenProject mavenProject, Exception e, + final long buildStartTime ) + { if ( e instanceof RuntimeException ) { e = new InternalErrorException( "Internal error: " + e, e ); @@ -185,5 +187,4 @@ public class BuilderCommon return project.getGroupId() + ':' + project.getArtifactId() + ':' + project.getVersion(); } - } diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java index a0056b42a9..c8a3cf4a2d 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java @@ -92,7 +92,7 @@ public class LifecycleModuleBuilder } catch ( Exception e ) { - builderCommon.handleBuildError(reactorContext, rootSession, session, currentProject, e, buildStartTime); + builderCommon.handleBuildError( reactorContext, rootSession, session, currentProject, e, buildStartTime ); } finally { @@ -101,4 +101,4 @@ public class LifecycleModuleBuilder Thread.currentThread().setContextClassLoader( reactorContext.getOriginalContextClassLoader() ); } } -} \ No newline at end of file +} diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java index 4b267282fe..9447480817 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java @@ -375,13 +375,14 @@ public class LifecycleWeaveBuilder return null; } - private static boolean isThreadLockedAndEmpty(Artifact artifact){ - return artifact instanceof ThreadLockedArtifact && !((ThreadLockedArtifact) artifact).hasReal(); + private static boolean isThreadLockedAndEmpty( Artifact artifact ) + { + return artifact instanceof ThreadLockedArtifact && !( (ThreadLockedArtifact) artifact ).hasReal(); } private static Artifact findDependency( MavenProject project, Artifact upStreamArtifact ) { - if ( upStreamArtifact == null || isThreadLockedAndEmpty(upStreamArtifact)) + if ( upStreamArtifact == null || isThreadLockedAndEmpty( upStreamArtifact ) ) { return null; } @@ -483,8 +484,6 @@ public class LifecycleWeaveBuilder artifactInThis.setFile( upstream.getFile() ); artifactInThis.setRepository( upstream.getRepository() ); artifactInThis.setResolved( true ); // Or maybe upstream.isResolved().... - } } - -} \ No newline at end of file +}