From d12e70aab579928fc1e3366f3d07e702b8b7b2f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Fri, 22 Sep 2017 01:04:48 +0200 Subject: [PATCH] Truly disable multifile --- .../pmd/lang/apex/multifile/ApexProjectMirror.java | 6 +++++- .../src/main/java/net/sourceforge/pmd/RuleSetFactory.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/multifile/ApexProjectMirror.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/multifile/ApexProjectMirror.java index b8238f2207..1ec5634d9a 100644 --- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/multifile/ApexProjectMirror.java +++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/multifile/ApexProjectMirror.java @@ -16,12 +16,16 @@ import net.sourceforge.pmd.lang.apex.metrics.signature.ApexOperationSigMask; * * @author Clément Fournier */ -public class ApexProjectMirror implements ApexSignatureMatcher { +class ApexProjectMirror implements ApexSignatureMatcher { static final ApexProjectMirror INSTANCE = new ApexProjectMirror(); private final Map classes = new HashMap<>(); + ApexProjectMirror() { + + } + void reset() { classes.clear(); diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java index 5b98235f90..62246bb045 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java @@ -577,7 +577,7 @@ public class RuleSetFactory { } if (hasAttributeSetTrue(ruleElement, "multifile")) { - rule.setUsesMultifile(); + // rule.setUsesMultifile(); // TODO, once that's safe } final NodeList nodeList = ruleElement.getChildNodes();