You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/08/27 19:10:54 UTC
svn commit: r1377749 - in
/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin:
AbstractCompilerMojo.java CompilerMojo.java TestCompilerMojo.java
Author: hboutemy
Date: Mon Aug 27 17:10:54 2012
New Revision: 1377749
URL: http://svn.apache.org/viewvc?rev=1377749&view=rev
Log:
code formatting
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=1377749&r1=1377748&r2=1377749&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java Mon Aug 27 17:10:54 2012
@@ -568,8 +568,8 @@ public abstract class AbstractCompilerMo
if ( ( compiler.getCompilerOutputStyle().equals( CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES )
&& !canUpdateTarget )
- || isDependencyChanged(getArtifacts())
- || isSourceChanged(compilerConfiguration, compiler) )
+ || isDependencyChanged( getArtifacts() )
+ || isSourceChanged( compilerConfiguration, compiler) )
{
getLog().info( "Recompiling the module!" );
Set<File> sources = getCompileSources( compiler, compilerConfiguration );
@@ -719,7 +719,8 @@ public abstract class AbstractCompilerMo
/**
* @return all source files for the compiler
*/
- private Set<File> getCompileSources( Compiler compiler, CompilerConfiguration compilerConfiguration ) throws MojoExecutionException, CompilerException
+ private Set<File> getCompileSources( Compiler compiler, CompilerConfiguration compilerConfiguration )
+ throws MojoExecutionException, CompilerException
{
String inputFileEnding = compiler.getInputFileEnding( compilerConfiguration );
SourceInclusionScanner scanner = getSourceInclusionScanner( inputFileEnding );
@@ -827,8 +828,8 @@ public abstract class AbstractCompilerMo
}
else
{
- if ( ( isDigits( setting.substring( 0, setting.length() - 1 ) ) ) && ( setting.toLowerCase().endsWith(
- "m" ) ) )
+ if ( ( isDigits( setting.substring( 0, setting.length() - 1 ) ) )
+ && ( setting.toLowerCase().endsWith( "m" ) ) )
{
value = setting;
}
@@ -957,7 +958,7 @@ public abstract class AbstractCompilerMo
*
* @return <code>true</code> if at least one single dependency has changed.
*/
- protected boolean isDependencyChanged(Collection<Artifact> artifacts)
+ protected boolean isDependencyChanged( Collection<Artifact> artifacts )
{
if ( mavenSession == null )
{
@@ -988,7 +989,7 @@ public abstract class AbstractCompilerMo
private boolean hasNewFile( File classPathEntry, Date buildStartTime )
{
- if ( ! classPathEntry.exists() )
+ if ( !classPathEntry.exists() )
{
return false;
}
Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java?rev=1377749&r1=1377748&r2=1377749&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java Mon Aug 27 17:10:54 2012
@@ -163,7 +163,7 @@ public class CompilerMojo
{
String includePattern = "**/*" + ( inputFileEnding.startsWith( "." ) ? "" : "." ) + inputFileEnding;
includes = Collections.singleton( includePattern );
- scanner = new SimpleSourceInclusionScanner( includes, Collections.EMPTY_SET );
+ scanner = new SimpleSourceInclusionScanner( includes, Collections.<String>emptySet() );
}
else
{
Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java?rev=1377749&r1=1377748&r2=1377749&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java Mon Aug 27 17:10:54 2012
@@ -204,7 +204,7 @@ public class TestCompilerMojo
{
String includePattern = "**/*" + ( inputFileEnding.startsWith( "." ) ? "" : "." ) + inputFileEnding;
testIncludes = Collections.singleton( includePattern );
- scanner = new SimpleSourceInclusionScanner( testIncludes, Collections.EMPTY_SET );
+ scanner = new SimpleSourceInclusionScanner( testIncludes, Collections.<String>emptySet() );
}
else
{
@@ -219,7 +219,8 @@ public class TestCompilerMojo
}
@Override
- protected Collection<Artifact> getArtifacts() {
+ protected Collection<Artifact> getArtifacts()
+ {
return testArtifacts;
}