Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 67865 invoked from network); 18 Sep 2008 22:19:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Sep 2008 22:19:54 -0000 Received: (qmail 68595 invoked by uid 500); 18 Sep 2008 22:19:50 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 68550 invoked by uid 500); 18 Sep 2008 22:19:50 -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 68540 invoked by uid 99); 18 Sep 2008 22:19:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2008 15:19:50 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2008 22:19:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3E19123889F7; Thu, 18 Sep 2008 15:19:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r696834 - in /maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering: DefaultMavenFileFilter.java DefaultMavenResourcesFiltering.java MavenProjectValueSource.java Date: Thu, 18 Sep 2008 22:19:33 -0000 To: commits@maven.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080918221933.3E19123889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Thu Sep 18 15:19:32 2008 New Revision: 696834 URL: http://svn.apache.org/viewvc?rev=696834&view=rev Log: fix checkstyle issues Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenProjectValueSource.java Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=696834&r1=696833&r2=696834&view=diff ============================================================================== --- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java (original) +++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java Thu Sep 18 15:19:32 2008 @@ -155,7 +155,7 @@ List defaultFilterWrappers = new ArrayList( 3 ); - if (getLogger().isDebugEnabled()) + if ( getLogger().isDebugEnabled() ) { getLogger().debug( "properties used " + filterProperties ); } @@ -174,13 +174,12 @@ StringSearchInterpolator propertiesInterpolator = new StringSearchInterpolator(); propertiesInterpolator.addValueSource( propertiesValueSource ); propertiesInterpolator.setEscapeString( escapeString ); - InterpolatorFilterReader interpolatorFilterReader = new InterpolatorFilterReader( reader, - propertiesInterpolator ); - interpolatorFilterReader.setInterpolateWithPrefixPattern( false ); - interpolatorFilterReader.setEscapeString( escapeString ); + InterpolatorFilterReader filterReader = new InterpolatorFilterReader( reader, propertiesInterpolator ); + filterReader.setInterpolateWithPrefixPattern( false ); + filterReader.setEscapeString( escapeString ); // first try it must be preserved - interpolatorFilterReader.setPreserveEscapeString( true ); - return interpolatorFilterReader; + filterReader.setPreserveEscapeString( true ); + return filterReader; } }; defaultFilterWrappers.add( one ); @@ -190,18 +189,15 @@ { public Reader getReader( Reader reader ) { - StringSearchInterpolator propertiesInterpolator = new StringSearchInterpolator( "@", - "@" ); + StringSearchInterpolator propertiesInterpolator = new StringSearchInterpolator( "@", "@" ); propertiesInterpolator.addValueSource( propertiesValueSource ); propertiesInterpolator.setEscapeString( escapeString ); - InterpolatorFilterReader interpolatorFilterReader = new InterpolatorFilterReader( - reader, - propertiesInterpolator, - "@", "@" ); - interpolatorFilterReader.setInterpolateWithPrefixPattern( false ); - interpolatorFilterReader.setEscapeString( escapeString ); - interpolatorFilterReader.setPreserveEscapeString( true ); - return interpolatorFilterReader; + InterpolatorFilterReader filterReader = new InterpolatorFilterReader( reader, propertiesInterpolator, + "@", "@" ); + filterReader.setInterpolateWithPrefixPattern( false ); + filterReader.setEscapeString( escapeString ); + filterReader.setPreserveEscapeString( true ); + return filterReader; } }; defaultFilterWrappers.add( second ); @@ -216,11 +212,10 @@ ValueSource valueSource = new MavenProjectValueSource( mavenProject, escapedBackslashesInFilePath ); mavenProjectInterpolator.addValueSource( valueSource ); mavenProjectInterpolator.setEscapeString( escapeString ); - InterpolatorFilterReader interpolatorFilterReader = new InterpolatorFilterReader( reader, - mavenProjectInterpolator ); - interpolatorFilterReader.setInterpolateWithPrefixPattern( false ); - interpolatorFilterReader.setEscapeString( escapeString ); - return interpolatorFilterReader; + InterpolatorFilterReader filterReader = new InterpolatorFilterReader( reader, mavenProjectInterpolator ); + filterReader.setInterpolateWithPrefixPattern( false ); + filterReader.setEscapeString( escapeString ); + return filterReader; } }; defaultFilterWrappers.add( third ); @@ -234,13 +229,11 @@ ValueSource valueSource = new MavenProjectValueSource( mavenProject, escapedBackslashesInFilePath ); mavenProjectInterpolator.addValueSource( valueSource ); mavenProjectInterpolator.setEscapeString( escapeString ); - InterpolatorFilterReader interpolatorFilterReader = new InterpolatorFilterReader( - reader, - mavenProjectInterpolator, - "@", "@" ); - interpolatorFilterReader.setInterpolateWithPrefixPattern( false ); - interpolatorFilterReader.setEscapeString( escapeString ); - return interpolatorFilterReader; + InterpolatorFilterReader filterReader = new InterpolatorFilterReader( reader, mavenProjectInterpolator, + "@", "@" ); + filterReader.setInterpolateWithPrefixPattern( false ); + filterReader.setEscapeString( escapeString ); + return filterReader; } }; defaultFilterWrappers.add( fourth ); Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java?rev=696834&r1=696833&r2=696834&view=diff ============================================================================== --- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java (original) +++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java Thu Sep 18 15:19:32 2008 @@ -176,7 +176,7 @@ { Resource resource = (Resource) i.next(); - if (getLogger().isDebugEnabled()) + if ( getLogger().isDebugEnabled() ) { String ls = System.getProperty( "line.separator" ); StringBuffer debugMessage = new StringBuffer( "resource with targetPath " + resource.getTargetPath() ) @@ -186,10 +186,8 @@ "excludes " + ( resource.getExcludes() == null ? " empty " : resource.getExcludes() .toString() ) ).append( ls ); - debugMessage.append( - "includes " - + ( resource.getIncludes() == null ? " empty " : resource.getIncludes() - .toString() ) ); + debugMessage.append( "includes " + + ( resource.getIncludes() == null ? " empty " : resource.getIncludes().toString() ) ); getLogger().debug( debugMessage.toString() ); } Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenProjectValueSource.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenProjectValueSource.java?rev=696834&r1=696833&r2=696834&view=diff ============================================================================== --- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenProjectValueSource.java (original) +++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenProjectValueSource.java Thu Sep 18 15:19:32 2008 @@ -80,7 +80,7 @@ Object value = null; try { - value = ReflectionValueExtractor.evaluate( "" + expression, project, IsProjectExpression( expression ) ); + value = ReflectionValueExtractor.evaluate( "" + expression, project, isProjectExpression( expression ) ); if ( escapedBackslashesInFilePath && value != null && "java.lang.String".equals( value.getClass().getName() ) ) @@ -103,7 +103,7 @@ return value; } - private boolean IsProjectExpression( String key ) + private boolean isProjectExpression( String key ) { if ( StringUtils.isEmpty( key ) ) {