From ea2523489a37391f66cac1cd79601031b2a8e46c Mon Sep 17 00:00:00 2001 From: oowekyala Date: Mon, 22 May 2017 19:16:42 +0200 Subject: [PATCH] Checkstyle fixes --- .../main/java/net/sourceforge/pmd/RuleSet.java | 18 ++++++++++++------ .../lang/AbstractLanguageVersionHandler.java | 2 +- .../pmd/lang/rule/AbstractDelegateRule.java | 14 +++++++++----- .../pmd/lang/rule/AbstractRule.java | 6 +++--- .../pmd/lang/java/AbstractJavaHandler.java | 2 +- .../java/oom/visitor/MetricsVisitorFacade.java | 4 ++-- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/RuleSet.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSet.java index e8104c82fb..66e9b6d697 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/RuleSet.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSet.java @@ -4,6 +4,17 @@ package net.sourceforge.pmd; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import net.sourceforge.pmd.benchmark.Benchmark; import net.sourceforge.pmd.benchmark.Benchmarker; import net.sourceforge.pmd.cache.ChecksumAware; @@ -16,11 +27,6 @@ import net.sourceforge.pmd.util.StringUtil; import net.sourceforge.pmd.util.filter.Filter; import net.sourceforge.pmd.util.filter.Filters; -import java.io.File; -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * This class represents a collection of rules along with some optional filter * patterns that can preclude their application on specific files. @@ -361,7 +367,7 @@ public class RuleSet implements ChecksumAware { throw new IllegalArgumentException(MISSING_RULE); } - for (final Iterator it = rules.iterator(); it.hasNext(); ) { + for (final Iterator it = rules.iterator(); it.hasNext();) { final Rule r = it.next(); if (r.getName().equals(rule.getName()) && r.getLanguage() == rule.getLanguage()) { it.remove(); diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractLanguageVersionHandler.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractLanguageVersionHandler.java index 5b6d9358b5..92ac766a47 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractLanguageVersionHandler.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractLanguageVersionHandler.java @@ -51,7 +51,7 @@ public abstract class AbstractLanguageVersionHandler implements LanguageVersionH } @Override - public VisitorStarter getMetricsVisitorFacade(ClassLoader classLoader){ + public VisitorStarter getMetricsVisitorFacade(ClassLoader classLoader) { return VisitorStarter.DUMMY; } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractDelegateRule.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractDelegateRule.java index 9079162b38..0e346113b4 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractDelegateRule.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractDelegateRule.java @@ -4,16 +4,20 @@ package net.sourceforge.pmd.lang.rule; -import net.sourceforge.pmd.*; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.sourceforge.pmd.PropertyDescriptor; +import net.sourceforge.pmd.PropertySource; +import net.sourceforge.pmd.Rule; +import net.sourceforge.pmd.RuleContext; +import net.sourceforge.pmd.RulePriority; import net.sourceforge.pmd.lang.Language; import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.lang.ParserOptions; import net.sourceforge.pmd.lang.ast.Node; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Base class for Rule implementations which delegate to another Rule instance. */ diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRule.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRule.java index 497a683ae1..921ebc63f1 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRule.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRule.java @@ -4,6 +4,9 @@ package net.sourceforge.pmd.lang.rule; +import java.util.ArrayList; +import java.util.List; + import net.sourceforge.pmd.AbstractPropertySource; import net.sourceforge.pmd.Rule; import net.sourceforge.pmd.RuleContext; @@ -13,9 +16,6 @@ import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.lang.ParserOptions; import net.sourceforge.pmd.lang.ast.Node; -import java.util.ArrayList; -import java.util.List; - /** * Basic abstract implementation of all parser-independent methods of the Rule * interface. diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java index e35623e23f..32f9f15ead 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java @@ -98,7 +98,7 @@ public abstract class AbstractJavaHandler extends AbstractLanguageVersionHandler } @Override - public VisitorStarter getMetricsVisitorFacade(final ClassLoader classLoader){ + public VisitorStarter getMetricsVisitorFacade(final ClassLoader classLoader) { return new VisitorStarter() { @Override public void start(Node rootNode) { diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/MetricsVisitorFacade.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/MetricsVisitorFacade.java index 0173aea658..cc5c8b06bd 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/MetricsVisitorFacade.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/MetricsVisitorFacade.java @@ -14,8 +14,8 @@ import net.sourceforge.pmd.lang.java.ast.JavaParserVisitorAdapter; */ public class MetricsVisitorFacade extends JavaParserVisitorAdapter { - public void initializeWith(ClassLoader classLoader, ASTCompilationUnit rootNode){ - + public void initializeWith(ClassLoader classLoader, ASTCompilationUnit rootNode) { + System.err.println("Metrics init!"); } }