From 7dc835726ae359a1416ec67bb085a03fd0b2096e Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 1 Feb 2012 19:25:43 +0400
Subject: [PATCH] cleanup

---
 .../openapi/components/impl/stores/StorageUtil.java       | 4 ++--
 .../intellij/openapi/progress/util/ProgressWindow.java    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java
index 5e4431fc4099..b6624845f61f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java
@@ -190,7 +190,7 @@ public class StorageUtil {
   public static boolean contentEquals(@NotNull final Document document, @NotNull final IFile file) {
     try {
       final Pair<String, String> pair = loadFile(file);
-      return pair.first == null ? false : pair.first.equals(printDocumentToString(document, pair.second));
+      return pair.first != null && pair.first.equals(printDocumentToString(document, pair.second));
     }
     catch (IOException e) {
       LOG.debug(e);
@@ -201,7 +201,7 @@ public class StorageUtil {
   public static boolean contentEquals(@NotNull final Element element, @NotNull final IFile file) {
     try {
       final Pair<String, String> pair = loadFile(file);
-      return pair.first == null ? false : pair.first.equals(printElement(element, pair.second));
+      return pair.first != null && pair.first.equals(printElement(element, pair.second));
     }
     catch (IOException e) {
       LOG.debug(e);
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
index ccbb4f8afcc4..0a6c80418c06 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
@@ -164,7 +164,6 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa
                 final DialogWrapper popup = myDialog.myPopup;
                 if (popup != null) {
                   myFocusTrackback.registerFocusComponent(new FocusTrackback.ComponentQuery() {
-                    @SuppressWarnings({"ConstantConditions"})
                     public Component getComponent() {
                       return popup.getPreferredFocusedComponent();
                     }
@@ -250,7 +249,7 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa
     if (isDialogShowing()) {
       if (myFocusTrackback != null) {
         myFocusTrackback.setWillBeSheduledForRestore();
-      }      
+      }
     }
 
     UIUtil.invokeLaterIfNeeded(new Runnable() {
@@ -260,11 +259,12 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa
         if (myDialog != null) {
           myDialog.hide();
         }
-        
+
         if (myFocusTrackback != null) {
           if (wasShowing) {
             myFocusTrackback.restoreFocus();
-          } else {
+          }
+          else {
             myFocusTrackback.consume();
           }
         }