From 33ab409c4e5a4c5c29a5c19eb4b45f079f17d481 Mon Sep 17 00:00:00 2001 From: Ilja Dubinin Date: Sat, 5 Sep 2015 11:59:17 +0100 Subject: [PATCH] Issue #46: loops should not have more then one break or continue statement --- .../coding/IllegalInstantiationCheck.java | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java index a8a3ca02e..f68bc09bc 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java @@ -23,6 +23,7 @@ import java.util.Set; import java.util.StringTokenizer; import antlr.collections.AST; + import com.google.common.collect.Sets; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; @@ -263,24 +264,15 @@ public class IllegalInstantiationCheck String illegalType = null; // import statements for (FullIdent importLineText : imports) { - final String importArg = importLineText.getText(); + String importArg = importLineText.getText(); if (importArg.endsWith(".*")) { - final String fqClass = - importArg.substring(0, importArg.length() - 1) - + className; - // assume that illegalInstances only contain existing classes - // or else we might create a false alarm here - if (illegalClasses.contains(fqClass)) { - illegalType = fqClass; - break; - } + importArg = importArg.substring(0, importArg.length() - 1) + + className; } - else { - if (CommonUtils.baseClassName(importArg).equals(className) + if (CommonUtils.baseClassName(importArg).equals(className) && illegalClasses.contains(importArg)) { - illegalType = importArg; - break; - } + illegalType = importArg; + break; } } return illegalType;