From ddcf5545d2e21baf9db47d3282784a4ca909e47e Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Mon, 20 Nov 2017 15:44:08 +0700
Subject: [PATCH] DfaInstanceofValue, ExpressionTypeMemoryState: cosmetic

---
 .../guess/impl/ExpressionTypeMemoryState.java         |  5 +----
 .../dataFlow/value/DfaInstanceofValue.java            | 11 +++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java
index 5689b2153f02..226b7bf04bc7 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java
@@ -91,10 +91,7 @@ public class ExpressionTypeMemoryState extends DfaMemoryStateImpl {
     if (!super.equals(o)) return false;
 
     ExpressionTypeMemoryState that = (ExpressionTypeMemoryState)o;
-
-    if (!myStates.equals(that.myStates)) return false;
-
-    return true;
+    return myStates.equals(that.myStates);
   }
 
   @Override
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaInstanceofValue.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaInstanceofValue.java
index 833f5037f265..a5cc96cbe9b1 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaInstanceofValue.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaInstanceofValue.java
@@ -18,28 +18,27 @@ package com.intellij.codeInspection.dataFlow.value;
 import com.intellij.psi.PsiExpression;
 import com.intellij.psi.PsiType;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author peter
  */
 public class DfaInstanceofValue extends DfaValue {
-  private final PsiExpression myExpression;
-  private final PsiType myCastType;
+  private final @NotNull PsiExpression myExpression;
+  private final @NotNull PsiType myCastType;
   private final boolean myNegated;
 
-  public DfaInstanceofValue(DfaValueFactory factory, PsiExpression expression, PsiType castType) {
+  public DfaInstanceofValue(DfaValueFactory factory, @NotNull PsiExpression expression, @NotNull PsiType castType) {
     this(factory, expression, castType, false);
   }
 
-  public DfaInstanceofValue(DfaValueFactory factory, PsiExpression expression, PsiType castType, boolean negated) {
+  public DfaInstanceofValue(DfaValueFactory factory, @NotNull PsiExpression expression, @NotNull PsiType castType, boolean negated) {
     super(factory);
     myExpression = expression;
     myCastType = castType;
     myNegated = negated;
   }
 
-  @Nullable
+  @NotNull
   public PsiExpression getExpression() {
     return myExpression;
   }