diff --git a/pom.xml b/pom.xml index e387638d4..c990b554f 100644 --- a/pom.xml +++ b/pom.xml @@ -1149,7 +1149,7 @@ .*.checks.imports.CustomImportOrderCheck98100 .*.checks.indentation.MethodCallLineWrapHandler00 - .*.checks.indentation.ObjectBlockHandler75100 + .*.checks.indentation.MethodDefHandler87100 .*.checks.indentation.SynchronizedHandler100100 .*.checks.javadoc.AbstractJavadocCheck9093 diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.java index 54e479acc..73c577da2 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.java @@ -88,22 +88,14 @@ public class ObjectBlockHandler extends BlockParentHandler { super.checkIndentation(); } - @Override - protected boolean rcurlyMustStart() { - return false; - } - @Override protected void checkRCurly() { - final DetailAST lcurly = getLCurly(); final DetailAST rcurly = getRCurly(); final int rcurlyPos = expandedTabsColumnNo(rcurly); final IndentLevel level = curlyLevel(); level.addAcceptedIndent(level.getFirstIndentLevel() + getLineWrappingIndent()); - if (!level.accept(rcurlyPos) - && (rcurlyMustStart() || startsLine(rcurly)) - && !areOnSameLine(rcurly, lcurly)) { + if (!level.accept(rcurlyPos) && startsLine(rcurly)) { logError(rcurly, "rcurly", rcurlyPos, curlyLevel()); } }