From 97956e1ae5d6842401ea0bfab121e8fb8d51c14d Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Thu, 20 Aug 2015 22:19:33 +0200 Subject: [PATCH] Inline simple setters. #1555 Fixes `CallToSimpleSetterInClass` inspection violations. Description: >Reports any calls to a simple property setter from within the property's class. A simple property setter is defined as one which simply assigns the value of its parameter to a field, and does no other calculation. Such simple setter calls may be safely inlined, at a small performance improvement. Some coding standards also suggest against the use of simple setters for code clarity reasons. --- .../tools/checkstyle/api/DetailAST.java | 20 ++++++------------- .../checks/coding/ReturnCountCheck.java | 2 +- .../sizes/ExecutableStatementCountCheck.java | 2 +- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java index cb6637380..cfaaccc1c 100755 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java @@ -98,7 +98,7 @@ public final class DetailAST extends CommonASTWithHiddenTokens { ((DetailAST) ast).setParent(parent); } if (ast != null) { - ((DetailAST) ast).setPreviousSibling(this); + ((DetailAST) ast).previousSibling = this; } } @@ -113,7 +113,7 @@ public final class DetailAST extends CommonASTWithHiddenTokens { final DetailAST previousSiblingNode = getPreviousSibling(); if (previousSiblingNode != null) { - ast.setPreviousSibling(previousSiblingNode); + ast.previousSibling = previousSiblingNode; previousSiblingNode.setNextSibling(ast); } else if (parent != null) { @@ -121,7 +121,7 @@ public final class DetailAST extends CommonASTWithHiddenTokens { } ast.setNextSibling(this); - setPreviousSibling(ast); + previousSibling = ast; } } @@ -137,22 +137,14 @@ public final class DetailAST extends CommonASTWithHiddenTokens { if (nextSibling != null) { ast.setNextSibling(nextSibling); - nextSibling.setPreviousSibling(ast); + nextSibling.previousSibling = ast; } - ast.setPreviousSibling(this); + ast.previousSibling = this; setNextSibling(ast); } } - /** - * Sets previous sibling. - * @param ast a previous sibling - */ - void setPreviousSibling(DetailAST ast) { - previousSibling = ast; - } - @Override public void addChild(AST ast) { super.addChild(ast); @@ -190,7 +182,7 @@ public final class DetailAST extends CommonASTWithHiddenTokens { final DetailAST nextSibling = getNextSibling(); if (nextSibling != null) { nextSibling.setParent(parent); - nextSibling.setPreviousSibling(this); + nextSibling.previousSibling = this; } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java index 4f4ad1801..802fefc9e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java @@ -59,7 +59,7 @@ public final class ReturnCountCheck extends AbstractFormatCheck { /** Creates new instance of the checks. */ public ReturnCountCheck() { super("^equals$"); - setMax(DEFAULT_MAX); + this.max = DEFAULT_MAX; } @Override diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java index 21ea5e012..448f6ef89 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java @@ -54,7 +54,7 @@ public final class ExecutableStatementCountCheck /** Constructs a {@code ExecutableStatementCountCheck}. */ public ExecutableStatementCountCheck() { - setMax(DEFAULT_MAX); + this.max = DEFAULT_MAX; } @Override