From cb8a385d0d5e4b0865e73bd3a6d502fe54b21846 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 16 Oct 2012 17:22:07 +0400
Subject: [PATCH] cleanup

---
 .../com/intellij/execution/ui/layout/impl/GridImpl.java  | 1 +
 .../src/com/intellij/usages/impl/PreviewUsageAction.java | 4 ++--
 .../src/com/intellij/usages/impl/RuleAction.java         | 5 +++--
 .../src/com/intellij/usages/impl/UsageTargetNode.java    | 1 +
 .../src/com/intellij/openapi/ui/NullableComponent.java   | 9 ++-------
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java
index f023d86d3a9b..2ad716142c98 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java
@@ -291,6 +291,7 @@ public class GridImpl extends Wrapper implements Grid, Disposable, DataProvider
           break;
         case bottom:
           mySplitter.setProportion(tab.getBottomProportion());
+          break;
         case center:
           break;
       }
diff --git a/platform/usageView/src/com/intellij/usages/impl/PreviewUsageAction.java b/platform/usageView/src/com/intellij/usages/impl/PreviewUsageAction.java
index fd8134466529..d9a58924ad46 100644
--- a/platform/usageView/src/com/intellij/usages/impl/PreviewUsageAction.java
+++ b/platform/usageView/src/com/intellij/usages/impl/PreviewUsageAction.java
@@ -18,13 +18,13 @@ package com.intellij.usages.impl;
 import com.intellij.icons.AllIcons;
 import com.intellij.usageView.UsageViewBundle;
 import com.intellij.usages.UsageViewSettings;
+import org.jetbrains.annotations.NotNull;
 
 /**
 * @author cdr
 */
 class PreviewUsageAction extends RuleAction {
-
-  PreviewUsageAction(UsageViewImpl usageView) {
+  PreviewUsageAction(@NotNull UsageViewImpl usageView) {
     super(usageView, UsageViewBundle.message("preview.usages.action.text"), AllIcons.Actions.Preview);
   }
 
diff --git a/platform/usageView/src/com/intellij/usages/impl/RuleAction.java b/platform/usageView/src/com/intellij/usages/impl/RuleAction.java
index 0b7e90177b61..0d4d2be93e15 100644
--- a/platform/usageView/src/com/intellij/usages/impl/RuleAction.java
+++ b/platform/usageView/src/com/intellij/usages/impl/RuleAction.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.usages.rules.UsageFilteringRuleProvider;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 
@@ -28,11 +29,11 @@ import javax.swing.*;
  * @author Eugene Zhuravlev
  *         Date: Jan 19, 2005
  */
-public abstract class RuleAction extends ToggleAction implements DumbAware {
+abstract class RuleAction extends ToggleAction implements DumbAware {
   private final UsageViewImpl myView;
   private boolean myState;
 
-  public RuleAction(UsageViewImpl view, final String text, final Icon icon) {
+  RuleAction(@NotNull UsageViewImpl view, @NotNull String text, @NotNull Icon icon) {
     super(text, null, icon);
     myView = view;
     myState = getOptionValue();
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageTargetNode.java b/platform/usageView/src/com/intellij/usages/impl/UsageTargetNode.java
index aa1ec1528ca0..d0ee47818f04 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageTargetNode.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageTargetNode.java
@@ -58,6 +58,7 @@ public class UsageTargetNode extends Node {
     return myTarget.getPresentation().getPresentableText();
   }
 
+  @NotNull
   public UsageTarget getTarget() {
     return myTarget;
   }
diff --git a/platform/util/src/com/intellij/openapi/ui/NullableComponent.java b/platform/util/src/com/intellij/openapi/ui/NullableComponent.java
index 5e3b7f08850d..aa00d69da338 100644
--- a/platform/util/src/com/intellij/openapi/ui/NullableComponent.java
+++ b/platform/util/src/com/intellij/openapi/ui/NullableComponent.java
@@ -23,24 +23,19 @@ public interface NullableComponent {
   boolean isNull();
 
   class Check {
-
     private Check() {
     }
 
     public static boolean isNull(Component c) {
-      if (c == null) return true;
-      if (c instanceof NullableComponent) return ((NullableComponent)c).isNull();
-      return false;
+      return c == null || c instanceof NullableComponent && ((NullableComponent)c).isNull();
     }
 
     public static boolean isNullOrHidden(Component c) {
-      if (c != null && !c.isShowing()) return true;
-      return isNull(c);
+      return c != null && !c.isShowing() || isNull(c);
     }
 
     public static boolean isNotNullAndVisible(Component c) {
       return !isNull(c) && c.isVisible();
     }
   }
-
 }