Author: khmarbaise
Date: Fri Oct 17 20:14:16 2014
New Revision: 1632661
URL: http://svn.apache.org/r1632661
Log:
[MSHARED-367]
- More clean ups of checkstyle issues reported.
- Accidently added supplemental java doc in DefaultMavenResourcesFiltering
class which confused plexus xdoclet and resulted in failing unit tests.
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
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/DefaultMavenReaderFilter.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/PropertyUtils.java
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java?rev=1632661&r1=1632660&r2=1632661&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
Fri Oct 17 20:14:16 2014
@@ -28,11 +28,11 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.shared.utils.io.FileUtils;
/**
- *
* @author Kristian Rosenvold
*/
public interface DefaultFilterInfo
{
+ // CHECKSTYLE_OFF: LineLength
/**
* Will return the default FileUtils.FilterWrappers.
* <p/>
@@ -53,6 +53,7 @@ public interface DefaultFilterInfo
* @deprecated use
* {@link
#getDefaultFilterWrappers(org.apache.maven.project.MavenProject,
java.util.List, boolean, org.apache.maven.execution.MavenSession,
org.apache.maven.shared.filtering.MavenResourcesExecution)}
*/
+ // CHECKSTYLE_ON:
@Nonnull
List<FileUtils.FilterWrapper> getDefaultFilterWrappers( MavenProject
mavenProject, List<String> filters,
boolean
escapedBackslashesInFilePath,
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=1632661&r1=1632660&r2=1632661&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
Fri Oct 17 20:14:16 2014
@@ -80,9 +80,7 @@ public class DefaultMavenFileFilter
copyFile( from, to, filtering, filterWrappers, encoding );
}
- /* (non-Javadoc)
- * @see
org.apache.maven.shared.filtering.MavenFileFilter#copyFile(org.apache.maven.shared.filtering.MavenFileFilterRequest)
- */
+ /** {@inheritDoc} */
public void copyFile( MavenFileFilterRequest mavenFileFilterRequest )
throws MavenFilteringException
{
@@ -92,9 +90,7 @@ public class DefaultMavenFileFilter
mavenFileFilterRequest.isFiltering(), filterWrappers,
mavenFileFilterRequest.getEncoding() );
}
- /* (non-Javadoc)
- * @see
org.apache.maven.shared.filtering.MavenFileFilter#copyFile(java.io.File,
java.io.File, boolean, java.util.List, java.lang.String)
- */
+ /** {@inheritDoc} */
public void copyFile( File from, File to, boolean filtering,
List<FileUtils.FilterWrapper> filterWrappers,
String encoding )
throws MavenFilteringException
@@ -103,9 +99,7 @@ public class DefaultMavenFileFilter
copyFile( from, to, filtering, filterWrappers, encoding, false );
}
- /* (non-Javadoc)
- * @see
org.apache.maven.shared.filtering.MavenFileFilter#copyFile(java.io.File,
java.io.File, boolean, java.util.List, java.lang.String, boolean)
- */
+ /** {@inheritDoc} */
public void copyFile( File from, File to, boolean filtering,
List<FileUtils.FilterWrapper> filterWrappers,
String encoding, boolean overwrite )
throws MavenFilteringException
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java?rev=1632661&r1=1632660&r2=1632661&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java
Fri Oct 17 20:14:16 2014
@@ -38,9 +38,7 @@ public class DefaultMavenReaderFilter
extends BaseFilter
implements MavenReaderFilter
{
- /* (non-Javadoc)
- * @see
org.apache.maven.shared.filtering.MavenReaderFilter#filter(java.io.Reader,
boolean, org.apache.maven.project.MavenProject, java.util.List, boolean,
org.apache.maven.execution.MavenSession)
- */
+ /** {@inheritDoc} */
@Nonnull
public Reader filter( @Nonnull Reader from, boolean filtering,
MavenProject mavenProject, List<String> filters,
boolean escapedBackslashesInFilePath, MavenSession
mavenSession )
@@ -57,9 +55,7 @@ public class DefaultMavenReaderFilter
return filter( from, filtering, filterWrappers );
}
- /* (non-Javadoc)
- * @see
org.apache.maven.shared.filtering.MavenReaderFilter#filter(org.apache.maven.shared.filtering.MavenReaderFilterRequest)
- */
+ /** {@inheritDoc} */
@Nonnull
public Reader filter( @Nonnull MavenReaderFilterRequest
mavenFileFilterRequest )
throws MavenFilteringException
@@ -68,9 +64,7 @@ public class DefaultMavenReaderFilter
return filter( mavenFileFilterRequest.getFrom(),
mavenFileFilterRequest.isFiltering(), filterWrappers );
}
- /* (non-Javadoc)
- * @see
org.apache.maven.shared.filtering.MavenReaderFilter#filter(java.io.Reader,
boolean, java.util.List)
- */
+ /** {@inheritDoc} */
@Nonnull
public Reader filter( @Nonnull Reader from, boolean filtering, @Nonnull
List<FilterWrapper> filterWrappers )
{
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=1632661&r1=1632660&r2=1632661&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
Fri Oct 17 20:14:16 2014
@@ -48,10 +48,6 @@ import org.sonatype.plexus.build.increme
* @plexus.component
role="org.apache.maven.shared.filtering.MavenResourcesFiltering"
* role-hint="default"
*/
-/**
- * @author kama
- *
- */
public class DefaultMavenResourcesFiltering
extends AbstractLogEnabled
implements MavenResourcesFiltering, Initializable
@@ -71,9 +67,7 @@ public class DefaultMavenResourcesFilter
// ------------------------------------------------
// Plexus lifecycle
// ------------------------------------------------
- /* (non-Javadoc)
- * @see
org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable#initialize()
- */
+ /** {@inheritDoc} */
public void initialize()
throws InitializationException
{
@@ -91,9 +85,7 @@ public class DefaultMavenResourcesFilter
*/
private MavenFileFilter mavenFileFilter;
- /* (non-Javadoc)
- * @see
org.apache.maven.shared.filtering.MavenResourcesFiltering#filterResources(java.util.List,
java.io.File, org.apache.maven.project.MavenProject, java.lang.String,
java.util.List, java.util.List, org.apache.maven.execution.MavenSession)
- */
+ /** {@inheritDoc} */
public void filterResources( List<Resource> resources, File
outputDirectory, MavenProject mavenProject,
String encoding, List<String> fileFilters,
List<String> nonFilteredFileExtensions,
MavenSession mavenSession )
@@ -108,9 +100,7 @@ public class DefaultMavenResourcesFilter
filterResources( mavenResourcesExecution );
}
- /* (non-Javadoc)
- * @see
org.apache.maven.shared.filtering.MavenResourcesFiltering#filterResources(java.util.List,
java.io.File, java.lang.String, java.util.List, java.io.File, java.util.List)
- */
+ /** {@inheritDoc} */
public void filterResources( List<Resource> resources, File
outputDirectory, String encoding,
List<FileUtils.FilterWrapper> filterWrappers,
File resourcesBaseDirectory,
List<String> nonFilteredFileExtensions )
@@ -122,9 +112,7 @@ public class DefaultMavenResourcesFilter
filterResources( mavenResourcesExecution );
}
- /* (non-Javadoc)
- * @see
org.apache.maven.shared.filtering.MavenResourcesFiltering#filteredFileExtension(java.lang.String,
java.util.List)
- */
+ /** {@inheritDoc} */
public boolean filteredFileExtension( String fileName, List<String>
userNonFilteredFileExtensions )
{
List<String> nonFilteredFileExtensions = new ArrayList<String>(
getDefaultNonFilteredFileExtensions() );
@@ -142,9 +130,7 @@ public class DefaultMavenResourcesFilter
return filteredFileExtension;
}
- /* (non-Javadoc)
- * @see
org.apache.maven.shared.filtering.MavenResourcesFiltering#getDefaultNonFilteredFileExtensions()
- */
+ /** {@inheritDoc} */
public List<String> getDefaultNonFilteredFileExtensions()
{
if ( this.defaultNonFilteredFileExtensions == null )
@@ -154,9 +140,7 @@ public class DefaultMavenResourcesFilter
return this.defaultNonFilteredFileExtensions;
}
- /* (non-Javadoc)
- * @see
org.apache.maven.shared.filtering.MavenResourcesFiltering#filterResources(org.apache.maven.shared.filtering.MavenResourcesExecution)
- */
+ /** {@inheritDoc} */
public void filterResources( MavenResourcesExecution
mavenResourcesExecution )
throws MavenFilteringException
{
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java?rev=1632661&r1=1632660&r2=1632661&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
Fri Oct 17 20:14:16 2014
@@ -165,7 +165,8 @@ public final class PropertyUtils
v = v.substring( idx + 2 );
// if no matching } then bail
- if ( ( idx2 = v.indexOf( '}' ) ) < 0 )
+ idx2 = v.indexOf( '}' );
+ if ( idx2 < 0 )
{
break;
}
