Return-Path:
+ *
+ *
* This is because the list of valid arguments passed to a Java compiler * varies based on the compiler version. * @@ -181,10 +181,10 @@ private Map compilerArguments; /** - *+ *
* Sets the unformatted argument string to be passed to the compiler if fork is set to true. * - *+ *
* This is because the list of valid arguments passed to a Java compiler * varies based on the compiler version. * @@ -310,7 +310,7 @@ compilerConfiguration.setSourceEncoding( encoding ); - if (( compilerArguments != null ) || ( compilerArgument != null )) + if ( ( compilerArguments != null ) || ( compilerArgument != null ) ) { LinkedHashMap cplrArgsCopy = new LinkedHashMap(); if ( compilerArguments != null ) @@ -320,14 +320,14 @@ Map.Entry me = (Map.Entry) i.next(); String key = (String) me.getKey(); String value = (String) me.getValue(); - if ( !key.startsWith( "-" )) + if ( !key.startsWith( "-" ) ) { key = "-" + key; } cplrArgsCopy.put( key, value ); } } - if ( !StringUtils.isEmpty( compilerArgument) ) + if ( !StringUtils.isEmpty( compilerArgument ) ) { cplrArgsCopy.put( compilerArgument, null ); } @@ -336,33 +336,33 @@ compilerConfiguration.setFork( fork ); - if( fork ) + if ( fork ) { if ( !StringUtils.isEmpty( meminitial ) ) { String value = getMemoryValue( meminitial ); - + if ( value != null ) { compilerConfiguration.setMeminitial( value ); } else { - getLog().info( "Invalid value for meminitial '" + meminitial + "'. Ignoring this option." ); + getLog().info( "Invalid value for meminitial '" + meminitial + "'. Ignoring this option." ); } } if ( !StringUtils.isEmpty( maxmem ) ) { String value = getMemoryValue( maxmem ); - + if ( value != null ) { compilerConfiguration.setMaxmem( value ); } else { - getLog().info( "Invalid value for maxmem '" + maxmem + "'. Ignoring this option." ); + getLog().info( "Invalid value for maxmem '" + maxmem + "'. Ignoring this option." ); } } } @@ -519,7 +519,7 @@ private String getMemoryValue( String setting ) { String value = null; - + // Allow '128' or '128m' if ( isDigits( setting ) ) { Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java?view=diff&rev=473232&r1=473231&r2=473232 ============================================================================== --- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java Thu Nov 9 23:47:46 2006 @@ -39,7 +39,7 @@ { StringBuffer sb = new StringBuffer(); - for ( Iterator it = messages.iterator(); it.hasNext() ; ) + for ( Iterator it = messages.iterator(); it.hasNext(); ) { CompilerError compilerError = (CompilerError) it.next(); 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?view=diff&rev=473232&r1=473231&r2=473232 ============================================================================== --- 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 Thu Nov 9 23:47:46 2006 @@ -28,7 +28,7 @@ /** * Compiles application test sources - * + * * @author Jason van Zyl * @version $Id$ * @goal testCompile