Merge branch 'master' into 7.0.x

pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPLanguage.java

@@ -26,7 +26,7 @@ public class CPPLanguage extends AbstractLanguage {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see net.sourceforge.pmd.cpd.AbstractLanguage#setProperties(java.util.
      * Properties)
      */

pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java

@@ -26,7 +26,7 @@ public class CPPTokenizer extends JavaCCTokenizer {
 
     /**
      * Sets the possible options for the C++ tokenizer.
-     * 
+     *
      * @param properties
      *            the properties
      * @see #OPTION_SKIP_BLOCKS
@@ -65,7 +65,7 @@ public class CPPTokenizer extends JavaCCTokenizer {
                     filtered.append(line);
                 }
                 // always add a new line to keep the line-numbering
-                filtered.append(PMD.EOL); 
+                filtered.append(PMD.EOL);
             }
             return filtered.toString();
         }

pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppTokenManager.java

@@ -17,7 +17,7 @@ public class CppTokenManager implements TokenManager {
 
     /**
      * Creates a new C++ Token Manager from the given source code.
-     * 
+     *
      * @param source
      *            the source code
      */

pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerTest.java

@@ -41,7 +41,7 @@ public class CPPTokenizerTest {
         assertNotSame(TokenEntry.getEOF(), tokens.getTokens().get(0));
         assertEquals(24, tokens.size());
     }
-    
+
     @Test
     public void testIgnoreBetweenSpecialComments() {
         String code = "#include <iostream>\n" + "#include <string>\n" + "\n" + "// CPD-OFF\n"