You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2012/12/09 03:51:51 UTC
[17/30] git commit: code formatting
code formatting
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/71a8427d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/71a8427d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/71a8427d
Branch: refs/heads/slf4j-logback
Commit: 71a8427df6286955c17ce1d6701804896c2b7ec3
Parents: ab86435
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun Dec 2 12:38:12 2012 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun Dec 2 12:38:12 2012 +0100
----------------------------------------------------------------------
.../maven/lifecycle/internal/BuilderCommon.java | 7 ++++---
.../lifecycle/internal/LifecycleModuleBuilder.java | 4 ++--
.../lifecycle/internal/LifecycleWeaveBuilder.java | 11 +++++------
3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/71a8427d/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java
----------------------------------------------------------------------
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 a018737..2c228ba 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();
}
-
}
http://git-wip-us.apache.org/repos/asf/maven/blob/71a8427d/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
----------------------------------------------------------------------
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 a0056b4..c8a3cf4 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
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/71a8427d/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
----------------------------------------------------------------------
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 4b26728..9447480 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
+}