From bfbec1d0a6fdd9c98966cb4238f2e48c65a81d9a Mon Sep 17 00:00:00 2001 From: Stefan Neuhaus Date: Wed, 4 Oct 2017 20:34:39 +0200 Subject: [PATCH] Cleanup: Remove enabled flag (reuse flag from AbstractAnalyzer class) --- .../analyzer/CentralAnalyzer.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CentralAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CentralAnalyzer.java index a54fbff90..462049b18 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CentralAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CentralAnalyzer.java @@ -92,11 +92,6 @@ public class CentralAnalyzer extends AbstractFileTypeAnalyzer { */ protected CentralSearch searcher; - /** - * Field indicating if the analyzer is enabled. - */ - private boolean enabled = true; - /** * Initializes the analyzer with the configured settings. * @@ -105,17 +100,7 @@ public class CentralAnalyzer extends AbstractFileTypeAnalyzer { @Override public void initialize(Settings settings) { super.initialize(settings); - enabled = checkEnabled(); - } - - /** - * Determine whether to enable this analyzer or not. - * - * @return whether the analyzer should be enabled - */ - @Override - public boolean isEnabled() { - return enabled; + setEnabled(checkEnabled()); } /** @@ -215,7 +200,7 @@ public class CentralAnalyzer extends AbstractFileTypeAnalyzer { */ @Override public void analyzeDependency(Dependency dependency, Engine engine) throws AnalysisException { - if (errorFlag || !isEnabled()) { + if (errorFlag) { return; }