Update to PMD 6.6.0

Refs #48

Author: adangel

ReleaseNotes.md

@@ -11,11 +11,11 @@ Eclipse Update Site:
 
 ### New and noteworthy
 
-*   Updated PMD to 6.3.0
+*   Updated PMD to 6.6.0
 
 ### Fixed Issues
 
-*   [#48](https://github.com/pmd/pmd-eclipse-plugin/issues/48): Upgrade to PMD 6.3.0
+*   [#48](https://github.com/pmd/pmd-eclipse-plugin/issues/48): Upgrade to PMD 6.6.0
 
 ### External Contributions
 

net.sourceforge.pmd.eclipse.plugin.test.fragment/src/main/resources/rulesets/extra1.xml

@@ -413,10 +413,10 @@ Avoid unnecessary return statements.
  [parent::Statement
   [parent::BlockStatement
    [parent::Block
-    [parent::MethodDeclaration/ResultType[@Void='true']
-    ]
+    [parent::MethodDeclaration/ResultType[@Void='true']]
    ]
-  ] ]]>
+  ]
+ ] ]]>
               </value>
           </property>
       </properties>

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/EclipseUtils.java

@@ -1,12 +1,12 @@
 /*
  * Created on 14 mai 2005
- * 
+ *
  * Copyright (c) 2005, PMD for Eclipse Development Team All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  * * Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer. * Redistributions
  * in binary form must reproduce the above copyright notice, this list of
@@ -18,7 +18,7 @@
  * Neither the name of "PMD for Eclipse Development Team" nor the names of
  * its contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
  * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -45,6 +45,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
+import java.util.regex.Pattern;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -68,7 +69,7 @@
 
 /**
  * This is a utility class for Eclipse various operations
- * 
+ *
  * @author Philippe Herlin
  * @author Brian Remedios
  */
@@ -96,7 +97,7 @@ private EclipseUtils() {
 
     /**
      * Test if 2 sets of rules are equals
-     * 
+     *
      * @param ruleSet1
      * @param ruleSet2
      * @return
@@ -126,7 +127,7 @@ public static boolean assertRuleSetEquals(final Collection<Rule> ruleSet1, final
 
     /**
      * Create a new java project
-     * 
+     *
      * @param projectName
      *            a project name
      * @return newProject a new project resource handle
@@ -161,7 +162,7 @@ public static IProject createProject(final String projectName) throws CoreExcept
 
     /**
      * Create a test source file
-     * 
+     *
      * @param project
      *            a project where to create that file; this project is expected to be empty
      */
@@ -186,7 +187,7 @@ public static IFile createTestSourceFile(final IProject project)
 
     /**
      * Get the content of a project resource.
-     * 
+     *
      * @param project
      *            a project reference
      * @param resourceName
@@ -202,7 +203,7 @@ public static InputStream getResourceStream(final IProject project, final String
 
     /**
      * Remove the PMD Nature from a project
-     * 
+     *
      * @param project
      *            a project to remove the PMD Nature
      * @param monitor
@@ -238,7 +239,7 @@ public static boolean removePMDNature(final IProject project) throws CoreExcepti
 
     /**
      * Add a Java Nature to a project when creating
-     * 
+     *
      * @param project
      * @throws CoreException
      */
@@ -272,7 +273,7 @@ private static void addJavaNature(final IProject project) throws CoreException {
 
     /**
      * Print rule details
-     * 
+     *
      * @param rule
      */
     private static void dumpRule(final Rule rule, final PrintStream out) {
@@ -286,13 +287,50 @@ private static void dumpRule(final Rule rule, final PrintStream out) {
     }
 
     private static boolean propertiesMatchFor(final Rule ruleA, final Rule ruleB) {
+        Map<PropertyDescriptor<?>, Object> ruleAProperties = ruleA.getPropertiesByPropertyDescriptor();
 
-        return ruleA.getPropertiesByPropertyDescriptor().equals(ruleB.getPropertiesByPropertyDescriptor());
+        Map<PropertyDescriptor<?>, Object> ruleBProperties = ruleB.getPropertiesByPropertyDescriptor();
+
+        // simple equals doesn't work for RegexProperties whose value type is java.util.regex.Pattern...
+        //return ruleAProperties.equals(ruleBProperties);
+
+        if (ruleAProperties == ruleBProperties) {
+            return true;
+        }
+
+        if (ruleAProperties.size() != ruleBProperties.size()) {
+            return false;
+        }
+
+        for (Map.Entry<PropertyDescriptor<?>, Object> entry : ruleAProperties.entrySet()) {
+            if (entry.getValue() == null) {
+                Object valueB = ruleBProperties.get(entry.getKey());
+                if (!(valueB == null && ruleBProperties.containsKey(entry.getKey()))) {
+                    return false;
+                }
+            } else {
+                Object valueB = ruleBProperties.get(entry.getKey());
+                if (entry.getValue() instanceof Pattern) {
+                    if (!(valueB instanceof Pattern)) {
+                        return false;
+                    }
+                    if (!entry.getValue().toString().equals(valueB.toString())) {
+                        return false;
+                    }
+                } else {
+                    if (!entry.getValue().equals(valueB)) {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return true;
     }
 
     /**
      * Search a rule in a set of rules
-     * 
+     *
      * @param rule
      * @param set
      * @return

pom.xml

@@ -16,7 +16,7 @@
   <properties>
     <tycho.version>1.1.0</tycho.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <pmd.version>6.3.0</pmd.version>
+    <pmd.version>6.6.0</pmd.version>
     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
   </properties>