code formatting Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/42962fa2 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/42962fa2 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/42962fa2
Branch: refs/heads/slf4j-log4j2 Commit: 42962fa281781917b5a0c0e9cb2bb33950051328 Parents: 9736737 Author: Hervé Boutemy <hbout...@apache.org> Authored: Sat Mar 30 09:37:11 2013 +0100 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Sat Mar 30 09:37:11 2013 +0100 ---------------------------------------------------------------------- .../repository/internal/MavenAetherModule.java | 19 ++++++++++ .../main/java/org/apache/maven/DefaultMaven.java | 29 +++++++-------- .../main/java/org/apache/maven/ReactorReader.java | 6 ++-- .../internal/LifecycleThreadedBuilder.java | 22 ++++++------ .../maven/plugin/PluginParameterException.java | 12 +++--- .../maven/project/ProjectBuildingRequest.java | 6 ++-- .../main/java/org/apache/maven/cli/CLIManager.java | 2 +- .../maven/cli/logging/Slf4jConfiguration.java | 5 ++- .../cli/logging/impl/Log4j2Configuration.java | 2 +- .../cli/logging/impl/LogbackConfiguration.java | 2 +- .../cli/logging/impl/Slf4jSimpleConfiguration.java | 2 +- .../profile/DefaultProfileActivationContext.java | 4 +- 12 files changed, 66 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java index 0432cdb..6f391fd 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java @@ -1,5 +1,24 @@ package org.apache.maven.repository.internal; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import java.util.Collections; import java.util.HashSet; import java.util.Set; http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-core/src/main/java/org/apache/maven/DefaultMaven.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index c80134f..82d9b61 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -171,17 +171,17 @@ public class DefaultMaven } catch ( OutOfMemoryError e ) { - result = addExceptionToResult(new DefaultMavenExecutionResult(), e); + result = addExceptionToResult( new DefaultMavenExecutionResult(), e ); } catch ( MavenExecutionRequestPopulationException e ) { - result = addExceptionToResult(new DefaultMavenExecutionResult(), e); + result = addExceptionToResult( new DefaultMavenExecutionResult(), e ); } catch ( RuntimeException e ) { result = - addExceptionToResult(new DefaultMavenExecutionResult(), - new InternalErrorException("Internal error: " + e, e)); + addExceptionToResult( new DefaultMavenExecutionResult(), + new InternalErrorException( "Internal error: " + e, e ) ); } finally { @@ -191,7 +191,6 @@ public class DefaultMaven return result; } - @SuppressWarnings({"ThrowableInstanceNeverThrown", "ThrowableResultOfMethodCallIgnored"}) private MavenExecutionResult doExecute( MavenExecutionRequest request ) { //TODO: Need a general way to inject standard properties @@ -211,7 +210,7 @@ public class DefaultMaven } catch ( LocalRepositoryNotAccessibleException e ) { - return addExceptionToResult(result, e); + return addExceptionToResult( result, e ); } DelegatingLocalArtifactRepository delegatingLocalArtifactRepository = @@ -233,7 +232,7 @@ public class DefaultMaven } catch ( MavenExecutionException e ) { - return addExceptionToResult(result, e); + return addExceptionToResult( result, e ); } eventCatapult.fire( ExecutionEvent.Type.ProjectDiscoveryStarted, session, null ); @@ -249,7 +248,7 @@ public class DefaultMaven } catch ( ProjectBuildingException e ) { - return addExceptionToResult(result, e); + return addExceptionToResult( result, e ); } session.setProjects( projects ); @@ -275,7 +274,7 @@ public class DefaultMaven } catch ( org.apache.maven.DuplicateProjectException e ) { - return addExceptionToResult(result, e); + return addExceptionToResult( result, e ); } repoSession.setReadOnly(); @@ -292,7 +291,7 @@ public class DefaultMaven } catch ( MavenExecutionException e ) { - return addExceptionToResult(result, e); + return addExceptionToResult( result, e ); } finally { @@ -315,15 +314,15 @@ public class DefaultMaven ProjectCycleException error = new ProjectCycleException( message, e ); - return addExceptionToResult(result, error); + return addExceptionToResult( result, error ); } catch ( DuplicateProjectException e ) { - return addExceptionToResult(result, e); + return addExceptionToResult( result, e ); } catch ( MavenExecutionException e ) { - return addExceptionToResult(result, e); + return addExceptionToResult( result, e ); } result.setTopologicallySortedProjects( session.getProjects() ); @@ -339,7 +338,7 @@ public class DefaultMaven if ( session.getResult().hasExceptions() ) { - return addExceptionToResult(result, session.getResult().getExceptions().get(0)); + return addExceptionToResult( result, session.getResult().getExceptions().get( 0 ) ); } return result; @@ -592,7 +591,7 @@ public class DefaultMaven return lifecycleListeners; } - private MavenExecutionResult addExceptionToResult(MavenExecutionResult result, Throwable e) + private MavenExecutionResult addExceptionToResult( MavenExecutionResult result, Throwable e ) { if ( !result.getExceptions().contains( e ) ) { http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-core/src/main/java/org/apache/maven/ReactorReader.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java index be1efb3..90d102f 100644 --- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java +++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java @@ -43,9 +43,9 @@ import java.util.Map; class ReactorReader implements WorkspaceReader { - private final static Collection<String> JAR_LIKE_TYPES = Arrays.asList( "jar", "test-jar", "ejb-client" ); + private static final Collection<String> JAR_LIKE_TYPES = Arrays.asList( "jar", "test-jar", "ejb-client" ); - private final static Collection<String> COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" ); + private static final Collection<String> COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" ); private Map<String, MavenProject> projectsByGAV; @@ -103,7 +103,7 @@ class ReactorReader } else { - String type = artifact.getProperty( "type", ""); + String type = artifact.getProperty( "type", "" ); if ( project.hasLifecyclePhase( "compile" ) && COMPILE_PHASE_TYPES.contains( type ) ) { return new File( project.getBuild().getOutputDirectory() ); http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleThreadedBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleThreadedBuilder.java index dbd3f4f..d5c7d9b 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleThreadedBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleThreadedBuilder.java @@ -67,20 +67,20 @@ public class LifecycleThreadedBuilder for ( TaskSegment taskSegment : currentTaskSegment ) { Map<MavenProject, ProjectSegment> projectBuildMap = projectBuilds.selectSegment( taskSegment ); - try - { + try + { multiThreadedProjectTaskSegmentBuild( analyzer, reactorContext, session, service, taskSegment, projectBuildMap, muxer ); - if ( reactorContext.getReactorBuildStatus().isHalted( ) ) - { - break; - } - } - catch ( Exception e ) + if ( reactorContext.getReactorBuildStatus().isHalted() ) { - session.getResult().addException(e); break; } + } + catch ( Exception e ) + { + session.getResult().addException( e ); + break; + } } } @@ -126,12 +126,12 @@ public class LifecycleThreadedBuilder } catch ( InterruptedException e ) { - rootSession.getResult().addException(e); + rootSession.getResult().addException( e ); break; } catch ( ExecutionException e ) { - rootSession.getResult().addException(e); + rootSession.getResult().addException( e ); break; } } http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java index 4027fcc..f14bfc0 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java @@ -100,29 +100,29 @@ public class PluginParameterException } } - messageBuffer.append( "Inside the definition for plugin \'"); + messageBuffer.append( "Inside the definition for plugin \'" ); messageBuffer.append( mojo.getPluginDescriptor().getArtifactId() ); messageBuffer.append( "\', specify the following:\n\n<configuration>\n ...\n" ); messageBuffer.append( " <" ).append( param.getName() ).append( '>' ); - if( isArray || isCollection ) + if ( isArray || isCollection ) { - messageBuffer.append( '\n' ); + messageBuffer.append( '\n' ); messageBuffer.append( " <item>" ); } else if ( isProperties ) { - messageBuffer.append( '\n' ); + messageBuffer.append( '\n' ); messageBuffer.append( " <property>\n" ); messageBuffer.append( " <name>KEY</name>\n" ); messageBuffer.append( " <value>" ); } else if ( isMap ) { - messageBuffer.append( '\n' ); + messageBuffer.append( '\n' ); messageBuffer.append( " <KEY>" ); } messageBuffer.append( "VALUE" ); - if( isArray || isCollection ) + if ( isArray || isCollection ) { messageBuffer.append( "</item>\n" ); messageBuffer.append( " " ); http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java index 9ed113d..2055d5e 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java @@ -122,8 +122,9 @@ public interface ProjectBuildingRequest List<String> getInactiveProfileIds(); /** - * Add a {@link org.apache.maven.model.Profile} that has come from an external source. This may be from a custom configuration - * like the MavenCLI settings.xml file, or from a custom dialog in an IDE integration like M2Eclipse. + * Add a {@link org.apache.maven.model.Profile} that has come from an external source. This may be from a custom + * configuration like the MavenCLI settings.xml file, or from a custom dialog in an IDE integration like M2Eclipse. + * * @param profile */ void addProfile( Profile profile ); @@ -143,7 +144,6 @@ public interface ProjectBuildingRequest * Sets the start time of the build. * * @param buildStartTime The start time of the build, may be {@code null}. - * @return This request, never {@code null}. */ void setBuildStartTime( Date buildStartTime ); http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index d30a16d..73a906a 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -97,7 +97,7 @@ public class CLIManager public static final String THREADS = "T"; - public static final String LEGACY_LOCAL_REPOSITORY ="llr"; + public static final String LEGACY_LOCAL_REPOSITORY = "llr"; protected Options options; http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java index 661c9e3..ca1034b 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java @@ -27,7 +27,10 @@ package org.apache.maven.cli.logging; */ public interface Slf4jConfiguration { - public static enum Level { DEBUG, INFO, ERROR } + public static enum Level + { + DEBUG, INFO, ERROR + } /** * Set root logging level. http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java index 9cec3cc..5637b64 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java @@ -43,7 +43,7 @@ public class Log4j2Configuration value = "info"; break; - case ERROR: + default: value = "error"; break; } http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java index b72940a..256478f 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java @@ -45,7 +45,7 @@ public class LogbackConfiguration value = ch.qos.logback.classic.Level.INFO; break; - case ERROR: + default: value = ch.qos.logback.classic.Level.ERROR; break; } http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java index 6a7f385..94a80a6 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java @@ -45,7 +45,7 @@ public class Slf4jSimpleConfiguration value = "info"; break; - case ERROR: + default: value = "error"; break; } http://git-wip-us.apache.org/repos/asf/maven/blob/42962fa2/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java index 5bd1c58..4fd0825 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java @@ -110,7 +110,7 @@ public class DefaultProfileActivationContext * @param systemProperties The system properties, may be {@code null}. * @return This context, never {@code null}. */ - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public DefaultProfileActivationContext setSystemProperties( Properties systemProperties ) { if ( systemProperties != null ) @@ -159,7 +159,7 @@ public class DefaultProfileActivationContext * @param userProperties The user properties, may be {@code null}. * @return This context, never {@code null}. */ - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public DefaultProfileActivationContext setUserProperties( Properties userProperties ) { if ( userProperties != null )
