From 2294b19662545cf487bee1504ea4534aaa23dcf4 Mon Sep 17 00:00:00 2001 From: Nicolas PERU Date: Fri, 19 Feb 2016 17:08:46 +0100 Subject: [PATCH] Fix quality flaws --- .../org/sonar/java/checks/AbstractDeprecatedChecker.java | 2 +- .../main/java/org/sonar/java/checks/IndentationCheck.java | 3 ++- .../src/test/files/checks/IndentationCheck_default.java | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/java-checks/src/main/java/org/sonar/java/checks/AbstractDeprecatedChecker.java b/java-checks/src/main/java/org/sonar/java/checks/AbstractDeprecatedChecker.java index 67f51438f7f..be60e8d878d 100644 --- a/java-checks/src/main/java/org/sonar/java/checks/AbstractDeprecatedChecker.java +++ b/java-checks/src/main/java/org/sonar/java/checks/AbstractDeprecatedChecker.java @@ -87,7 +87,7 @@ private static boolean hasDeprecatedAnnotation(Iterable annotati protected static Tree getReportTree(Tree tree) { Tree reportTree = tree; if(reportTree.is(PublicApiChecker.classKinds())) { - reportTree = ExpressionsHelper.reportOnClassTree(((ClassTree) reportTree)); + reportTree = ExpressionsHelper.reportOnClassTree((ClassTree) reportTree); } else if(reportTree.is(PublicApiChecker.methodKinds())) { reportTree = ((MethodTree) reportTree).simpleName(); } else if(reportTree.is(Tree.Kind.VARIABLE)) { diff --git a/java-checks/src/main/java/org/sonar/java/checks/IndentationCheck.java b/java-checks/src/main/java/org/sonar/java/checks/IndentationCheck.java index 25c6fe940bb..55a7a0e02e0 100644 --- a/java-checks/src/main/java/org/sonar/java/checks/IndentationCheck.java +++ b/java-checks/src/main/java/org/sonar/java/checks/IndentationCheck.java @@ -25,6 +25,7 @@ import org.sonar.check.Priority; import org.sonar.check.Rule; import org.sonar.check.RuleProperty; +import org.sonar.java.model.JavaTree; import org.sonar.java.syntaxtoken.FirstSyntaxTokenFinder; import org.sonar.java.syntaxtoken.LastSyntaxTokenFinder; import org.sonar.java.tag.Tag; @@ -199,7 +200,7 @@ private void checkIndentation(List trees) { private void checkIndentation(Tree tree, int expectedLevel) { SyntaxToken firstSyntaxToken = FirstSyntaxTokenFinder.firstSyntaxToken(tree); if (firstSyntaxToken.column() != expectedLevel && !isExcluded(tree, firstSyntaxToken.line())) { - addIssue(tree, "Make this line start at column " + (expectedLevel + 1) + "."); + addIssue(((JavaTree) tree).getLine(), "Make this line start at column " + (expectedLevel + 1) + "."); isBlockAlreadyReported = true; } lastCheckedLine = LastSyntaxTokenFinder.lastSyntaxToken(tree).line(); diff --git a/java-checks/src/test/files/checks/IndentationCheck_default.java b/java-checks/src/test/files/checks/IndentationCheck_default.java index 33ad64f4ece..f9d45a11aa8 100644 --- a/java-checks/src/test/files/checks/IndentationCheck_default.java +++ b/java-checks/src/test/files/checks/IndentationCheck_default.java @@ -192,3 +192,10 @@ protected void append(final ILoggingEvent event) { } } + +public interface plop { + @Foo + public static class Inner { // Noncompliant + public static final String FOO = "foo"; + } +}