Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 74621 invoked from network); 10 Nov 2006 07:48:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Nov 2006 07:48:17 -0000 Received: (qmail 47328 invoked by uid 500); 10 Nov 2006 07:48:27 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 47273 invoked by uid 500); 10 Nov 2006 07:48:27 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 47258 invoked by uid 99); 10 Nov 2006 07:48:27 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Nov 2006 23:48:27 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Nov 2006 23:48:15 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 551191A9846; Thu, 9 Nov 2006 23:47:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r473232 - in /maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin: AbstractCompilerMojo.java CompilationFailureException.java TestCompilerMojo.java Date: Fri, 10 Nov 2006 07:47:47 -0000 To: commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061110074747.551191A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Thu Nov 9 23:47:46 2006 New Revision: 473232 URL: http://svn.apache.org/viewvc?view=rev&rev=473232 Log: reformat code 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/CompilationFailureException.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?view=diff&rev=473232&r1=473231&r2=473232 ============================================================================== --- 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 Thu Nov 9 23:47:46 2006 @@ -168,10 +168,10 @@ private String executable; /** - *

+ *

* Sets the arguments to be passed to the compiler (prepending a dash) 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. *

@@ -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