maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1413335 - in /maven/maven-3/trunk: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/ maven-core/src/main/java/org/apache/maven/exception/ maven-embedder/src/main/java/org/...
Date Sun, 25 Nov 2012 11:04:19 GMT
Author: hboutemy
Date: Sun Nov 25 11:04:16 2012
New Revision: 1413335

URL: http://svn.apache.org/viewvc?rev=1413335&view=rev
Log:
fixed errors reported by Checkstyle

Modified:
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
    maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
    maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
    maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=1413335&r1=1413334&r2=1413335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
Sun Nov 25 11:04:16 2012
@@ -37,7 +37,7 @@ import org.codehaus.plexus.component.rep
  * @author Jason van Zyl
  * @todo this should probably be a component with some dynamic control of filtering
  */
-@Component(role = ArtifactFilterManager.class)
+@Component( role = ArtifactFilterManager.class )
 public class DefaultArtifactFilterManager 
     implements ArtifactFilterManager
 {
@@ -90,7 +90,7 @@ public class DefaultArtifactFilterManage
          * wagon from their plugin realm.
          */
 
-        DEFAULT_EXCLUSIONS = Collections.unmodifiableSet( artifacts);
+        DEFAULT_EXCLUSIONS = Collections.unmodifiableSet( artifacts );
     }
 
     protected Set<String> excludedArtifacts = new HashSet<String>( DEFAULT_EXCLUSIONS
);

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=1413335&r1=1413334&r2=1413335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Sun Nov
25 11:04:16 2012
@@ -1,18 +1,22 @@
 package org.apache.maven;
 
 /*
- * 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.
+ * 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.io.File;
@@ -79,26 +83,11 @@ import org.codehaus.plexus.util.xml.Xpp3
 import org.sonatype.aether.ConfigurationProperties;
 import org.sonatype.aether.RepositorySystem;
 import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.collection.DependencyGraphTransformer;
-import org.sonatype.aether.collection.DependencyManager;
-import org.sonatype.aether.collection.DependencySelector;
-import org.sonatype.aether.collection.DependencyTraverser;
 import org.sonatype.aether.repository.Authentication;
 import org.sonatype.aether.repository.LocalRepository;
 import org.sonatype.aether.repository.RepositoryPolicy;
 import org.sonatype.aether.repository.WorkspaceReader;
 import org.sonatype.aether.util.DefaultRepositorySystemSession;
-import org.sonatype.aether.util.graph.manager.ClassicDependencyManager;
-import org.sonatype.aether.util.graph.selector.AndDependencySelector;
-import org.sonatype.aether.util.graph.selector.ExclusionDependencySelector;
-import org.sonatype.aether.util.graph.selector.OptionalDependencySelector;
-import org.sonatype.aether.util.graph.selector.ScopeDependencySelector;
-import org.sonatype.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
-import org.sonatype.aether.util.graph.transformer.NearestVersionConflictResolver;
-import org.sonatype.aether.util.graph.transformer.ConflictMarker;
-import org.sonatype.aether.util.graph.transformer.JavaDependencyContextRefiner;
-import org.sonatype.aether.util.graph.transformer.JavaEffectiveScopeCalculator;
-import org.sonatype.aether.util.graph.traverser.FatArtifactTraverser;
 import org.sonatype.aether.util.repository.ChainedWorkspaceReader;
 import org.sonatype.aether.util.repository.DefaultAuthenticationSelector;
 import org.sonatype.aether.util.repository.DefaultMirrorSelector;
@@ -107,7 +96,7 @@ import org.sonatype.aether.util.reposito
 /**
  * @author Jason van Zyl
  */
-@Component(role = Maven.class)
+@Component( role = Maven.class )
 public class DefaultMaven
     implements Maven
 {

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java?rev=1413335&r1=1413334&r2=1413335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
Sun Nov 25 11:04:16 2012
@@ -42,7 +42,7 @@ import org.apache.maven.repository.Repos
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 
-@Component(role = ProjectDependenciesResolver.class)
+@Component( role = ProjectDependenciesResolver.class )
 public class DefaultProjectDependenciesResolver
     implements ProjectDependenciesResolver
 {
@@ -97,8 +97,8 @@ public class DefaultProjectDependenciesR
             return resolved;
         }
 
-        if ( ( scopesToCollect == null || scopesToCollect.isEmpty() ) &&
-            ( scopesToResolve == null || scopesToResolve.isEmpty() ) )
+        if ( ( scopesToCollect == null || scopesToCollect.isEmpty() )
+            && ( scopesToResolve == null || scopesToResolve.isEmpty() ) )
         {
             return resolved;
         }

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java?rev=1413335&r1=1413334&r2=1413335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java
Sun Nov 25 11:04:16 2012
@@ -1,5 +1,24 @@
 package org.apache.maven;
 
+/*
+ * 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 org.apache.maven.plugin.MojoFailureException;
 
 /**

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java?rev=1413335&r1=1413334&r2=1413335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java Sun Nov
25 11:04:16 2012
@@ -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() );

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java?rev=1413335&r1=1413334&r2=1413335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java
Sun Nov 25 11:04:16 2012
@@ -39,7 +39,7 @@ public interface MetadataReader
      * The key for the option to enable strict parsing. This option is of type {@link Boolean}
and defaults to {@code
      * true}. If {@code false}, unknown elements will be ignored instead of causing a failure.
      */
-    final String IS_STRICT = "org.apache.maven.artifact.repository.metadata.io.isStrict";
+    String IS_STRICT = "org.apache.maven.artifact.repository.metadata.io.isStrict";
 
     /**
      * Reads the metadata from the specified file.

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java?rev=1413335&r1=1413334&r2=1413335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
Sun Nov 25 11:04:16 2012
@@ -179,9 +179,11 @@ public class DefaultExceptionHandler
                 reference = MojoExecutionException.class.getSimpleName();
 
                 Throwable cause = exception.getCause();
-                if ( cause instanceof IOException ) {
+                if ( cause instanceof IOException )
+                {
                     cause = cause.getCause();
-                    if ( cause instanceof ConnectException ) {
+                    if ( cause instanceof ConnectException )
+                    {
                         reference = ConnectException.class.getSimpleName();
                     }
                 }

Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java?rev=1413335&r1=1413334&r2=1413335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
(original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
Sun Nov 25 11:04:16 2012
@@ -21,8 +21,6 @@ package org.apache.maven.cli;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -51,7 +49,7 @@ public final class CLIReportingUtils
 
     public static String showVersion()
     {
-        String LS = System.getProperty("line.separator");
+        final String LS = System.getProperty( "line.separator" );
         Properties properties = getBuildProperties();
         StringBuffer version = new StringBuffer();
         version.append( createMavenVersionString( properties ) ).append( LS );

Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=1413335&r1=1413334&r2=1413335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Sun
Nov 25 11:04:16 2012
@@ -283,7 +283,7 @@ public class MavenCli
 
         if ( cliRequest.commandLine.hasOption( CLIManager.VERSION ) )
         {
-            System.out.println(CLIReportingUtils.showVersion());
+            System.out.println( CLIReportingUtils.showVersion() );
             throw new ExitException( 0 );
         }
     }    
@@ -417,7 +417,7 @@ public class MavenCli
         eventSpyDispatcher.init( eventSpyContext );
 
         // refresh logger in case container got customized by spy
-        slf4jLogger = slf4jLoggerFactory.getLogger(this.getClass().getName());
+        slf4jLogger = slf4jLoggerFactory.getLogger( this.getClass().getName() );
 
         maven = container.lookup( Maven.class );
 

Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java?rev=1413335&r1=1413334&r2=1413335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
(original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
Sun Nov 25 11:04:16 2012
@@ -1,7 +1,5 @@
 package org.apache.maven.cli.transfer;
 
-import java.io.PrintStream;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,6 +19,8 @@ import java.io.PrintStream;
  * under the License.
  */
 
+import java.io.PrintStream;
+
 public class BatchModeMavenTransferListener
     extends AbstractMavenTransferListener
 {



Mime
View raw message