Add PMD check to default goal and fix only 2 remaining PMD warnings.

Author: garydgregory

pom.xml

@@ -184,7 +184,7 @@
   </properties>
 
   <build>
-    <defaultGoal>clean package apache-rat:check japicmp:cmp checkstyle:check spotbugs:check javadoc:javadoc</defaultGoal>
+    <defaultGoal>clean package apache-rat:check japicmp:cmp checkstyle:check spotbugs:check pmd:check javadoc:javadoc</defaultGoal>
     <pluginManagement>
       <plugins>
         <plugin>

src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java

@@ -142,8 +142,8 @@ char[] lookAhead(final int n) throws IOException {
     @Override
     public int read() throws IOException {
         final int current = super.read();
-        if ((current == CR || current == LF && lastChar != CR) ||
-            (current == END_OF_STREAM && lastChar != CR && lastChar != LF && lastChar != END_OF_STREAM)) {
+        if (current == CR || current == LF && lastChar != CR ||
+            current == END_OF_STREAM && lastChar != CR && lastChar != LF && lastChar != END_OF_STREAM) {
             eolCounter++;
         }
         lastChar = current;