[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.


git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1632661 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java b/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
index e8fec57..0e08de5 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
@@ -28,11 +28,11 @@
 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 @@
      * @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,
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
index 563c688..e742a6e 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
@@ -80,9 +80,7 @@
         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 @@
                   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 @@
         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
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java
index 31477f1..ca27014 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java
@@ -38,9 +38,7 @@
     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 @@
         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 @@
         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 )
     {
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
index 0f40038..2e3c5d2 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -48,10 +48,6 @@
  * @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 @@
     // ------------------------------------------------
     // Plexus lifecycle
     // ------------------------------------------------
-    /* (non-Javadoc)
-     * @see org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable#initialize()
-     */
+    /** {@inheritDoc} */
     public void initialize()
         throws InitializationException
     {
@@ -91,9 +85,7 @@
      */
     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 @@
         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 @@
         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 @@
         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 @@
         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
     {
diff --git a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
index 27438ff..6c0e788 100644
--- a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
@@ -165,7 +165,8 @@
             v = v.substring( idx + 2 );
 
             // if no matching } then bail
-            if ( ( idx2 = v.indexOf( '}' ) ) < 0 )
+            idx2 = v.indexOf( '}' );
+            if ( idx2 < 0 )
             {
                 break;
             }