From 7fbdfaaae7f3a73afb5c81b25ebfbbaac4a57c7f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 12 May 2016 09:36:08 +0200
Subject: [PATCH] enable PMD's java-basic ruleset

* CollapsibleIfStatements is pedantic
* that one NOPMD is for debug logging, it'll go away

closes #623 https://gitlab.com/fdroid/fdroidclient/issues/623
---
 .../org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java    | 2 +-
 config/pmd/rules.xml                                          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 6b0b46aaf..c711d3ec6 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -740,7 +740,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
 
         public void logStatus() {
 
-            if (true) return;
+            if (true) return; // NOPMD
 
             String message = "";
             if (service == null) {
diff --git a/config/pmd/rules.xml b/config/pmd/rules.xml
index 242403a32..6ad35b90e 100644
--- a/config/pmd/rules.xml
+++ b/config/pmd/rules.xml
@@ -5,7 +5,9 @@
         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/basic.xml">
+        <exclude name="CollapsibleIfStatements"/> <!--sometimes forces hard to read code-->
+    </rule>
     <rule ref="rulesets/java/unusedcode.xml"/>
     <rule ref="rulesets/java/android.xml"/>
     <rule ref="rulesets/java/clone.xml"/>