From 816f585d541f51ab106d67a617cbb01f52169fb0 Mon Sep 17 00:00:00 2001 From: Andrey Turbanov Date: Sun, 17 Apr 2022 16:07:57 +0300 Subject: Cleanup redundant null check before instanceof --- .../org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java | 2 +- .../java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java | 5 ++--- .../org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java | 2 +- .../aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java | 4 ++-- .../java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) (limited to 'org.aspectj.ajdt.core/src') diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java index ceb1231db..c147cdafc 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java @@ -56,7 +56,7 @@ public class InterimCompilationResult { } public boolean equals(Object other) { - if (other == null || !(other instanceof InterimCompilationResult)) { + if (!(other instanceof InterimCompilationResult)) { return false; } InterimCompilationResult ir = (InterimCompilationResult) other; diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java index d90feb773..1ed6f009e 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java @@ -83,9 +83,8 @@ public class ProceedVisitor extends ASTVisitor { boolean isRef(Expression expr, Binding binding) { //System.err.println("isRef: " + expr + ", " + binding); - return expr != null - && expr instanceof NameReference - && isRef((NameReference) expr, binding); + return expr instanceof NameReference + && isRef((NameReference)expr, binding); } public void endVisit(SingleNameReference ref, BlockScope scope) { diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java index b1189d9dc..44e929cc7 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java @@ -102,7 +102,7 @@ public class ThisJoinPointVisitor extends ASTVisitor { } boolean isRef(Expression expr, Binding binding) { - return expr != null && expr instanceof NameReference && isRef((NameReference) expr, binding); + return expr instanceof NameReference && isRef((NameReference)expr, binding); } public void endVisit(SingleNameReference ref, BlockScope scope) { diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java index 9604bab9b..59bea43e5 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java @@ -485,7 +485,7 @@ public class AjProblemReporter extends ProblemReporter { // don't output unused type warnings for aspects! if (typeDecl instanceof AspectDeclaration) return; - if (typeDecl.enclosingType != null && (typeDecl.enclosingType instanceof AspectDeclaration)) { + if (typeDecl.enclosingType instanceof AspectDeclaration) { AspectDeclaration ad = (AspectDeclaration) typeDecl.enclosingType; if (ad.concreteName != null) { List declares = ad.concreteName.declares; @@ -609,7 +609,7 @@ public class AjProblemReporter extends ProblemReporter { Argument arg = (Argument) localDecl; if (arg.binding != null && arg.binding.declaringScope != null) { ReferenceContext context = arg.binding.declaringScope.referenceContext(); - if (context != null && context instanceof PointcutDeclaration) + if (context instanceof PointcutDeclaration) return; } } diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java index 3e526002e..0fa1d6258 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java @@ -115,7 +115,7 @@ public class AjBuildConfig implements CompilerConfigurationChangeFlags { @Override public boolean equals(Object obj) { - if (obj != null && (obj instanceof BinarySourceFile)) { + if (obj instanceof BinarySourceFile) { BinarySourceFile other = (BinarySourceFile) obj; return (binSrc.equals(other.binSrc)); } -- cgit v1.2.3