From 09d349712d92298534e7f95ef8ff10d9e79f5590 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Sat, 6 Jan 2018 16:18:26 +0700
Subject: [PATCH] Unnecessary null-check removed

---
 .../openapi/editor/colors/impl/AbstractColorsScheme.java        | 2 +-
 .../com/intellij/openapi/actionSystem/impl/ActionButton.java    | 2 +-
 .../graph/src/com/intellij/vcs/log/graph/GraphCommitImpl.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java
index 11994f7657c6..0380a6438b5e 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java
@@ -1098,7 +1098,7 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement
     if (myParentScheme instanceof TemporaryParent) {
       String parentName = ((TemporaryParent)myParentScheme).getParentName();
       EditorColorsScheme newParent = nameResolver.apply(parentName);
-      if (newParent == null || !(newParent instanceof ReadOnlyColorsScheme)) {
+      if (!(newParent instanceof ReadOnlyColorsScheme)) {
         throw new InvalidDataException(parentName);
       }
       myParentScheme = newParent;
diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java
index d367bf17736f..29e36e51e64e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java
@@ -466,7 +466,7 @@ public class ActionButton extends JComponent implements ActionButtonComponent, A
       Icon icon = ActionButton.this.getIcon();
       if (icon instanceof Accessible) {
         AccessibleContext context = ((Accessible)icon).getAccessibleContext();
-        if (context != null && context instanceof AccessibleIcon) {
+        if (context instanceof AccessibleIcon) {
           return new AccessibleIcon[]{(AccessibleIcon)context};
         }
       }
diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/GraphCommitImpl.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/GraphCommitImpl.java
index 505e93a93581..673174e8af83 100644
--- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/GraphCommitImpl.java
+++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/GraphCommitImpl.java
@@ -37,7 +37,7 @@ abstract class AbstractGraphCommit<CommitId> extends ImmutableList<CommitId> imp
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
-    if (o == null || !(o instanceof GraphCommit)) return false;
+    if (!(o instanceof GraphCommit)) return false;
     GraphCommit commit = (GraphCommit)o;
     return getId().equals(commit.getId());
   }