From 32c67d05ece713b05ac3adaec3a4bf8c49c61cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 23 Apr 2016 15:59:04 +0100
Subject: [PATCH] PMD: XML config file, enable most of unnecessary

---
 app/build.gradle                               | 12 ++----------
 .../views/CaffeinatedScrollView.java           |  1 +
 config/pmd/rules.xml                           | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 config/pmd/rules.xml

diff --git a/app/build.gradle b/app/build.gradle
index e4c4fe60f..7442af8bf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -208,16 +208,8 @@ pmd {
 }
 
 task pmd(type: Pmd, dependsOn: assembleDebug) {
-    ruleSets = [
-        //'java-basic',
-        'java-unusedcode',
-        'java-android',
-        'java-clone',
-        'java-finalizers',
-        'java-imports',
-        'java-migrating',
-        //'java-unnecessary', // too nitpicky with parenthesis
-    ]
+    ruleSetFiles = files("${project.rootDir}/config/pmd/rules.xml")
+    ruleSets = [] // otherwise defaults clash with the list in rules.xml
     source 'src/main/java', 'src/test/java', 'src/androidTest/java'
     include '**/*.java'
 }
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java
index f43dbc053..dd3e7837a 100644
--- a/app/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java
+++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java
@@ -40,6 +40,7 @@ public class CaffeinatedScrollView extends ScrollView {
     /**
      * Make this visible so we can call it
      */
+    @SuppressWarnings("PMD.UselessOverridingMethod")
     @Override
     public boolean awakenScrollBars() {
         return super.awakenScrollBars();
diff --git a/config/pmd/rules.xml b/config/pmd/rules.xml
new file mode 100644
index 000000000..1cf4ca4a9
--- /dev/null
+++ b/config/pmd/rules.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+        xmlns="http://pmd.sf.net/ruleset/1.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+        xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+
+    <!--<rule ref="rulesets/java/basic.xml"/>-->
+    <rule ref="rulesets/java/unusedcode.xml"/>
+    <rule ref="rulesets/java/android.xml"/>
+    <rule ref="rulesets/java/clone.xml"/>
+    <rule ref="rulesets/java/finalizers.xml"/>
+    <rule ref="rulesets/java/imports.xml"/>
+    <rule ref="rulesets/java/migrating.xml"/>
+    <rule ref="rulesets/java/unnecessary.xml">
+        <exclude name="UselessParentheses"/> <!--Too nitpicky-->
+    </rule>
+</ruleset>