From 231bf9b11276ee1cadae1e4e486e3a422e3699f8 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 3 Mar 2011 20:18:54 +0100
Subject: [PATCH] UpdateChecker.showUpdateResult()

---
 .../com/intellij/idea/IdeaApplication.java    |  7 +-----
 .../impl/CheckForUpdateAction.java            | 11 ++------
 .../updateSettings/impl/UpdateChecker.java    | 25 +++++++++++--------
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
index dedb0115464f..81fbd5d6d5d9 100644
--- a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
+++ b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
@@ -215,12 +215,7 @@ public class IdeaApplication {
           app.invokeLater(new Runnable() {
             @Override
             public void run() {
-              if (checkForUpdateResult.hasNewBuildInSelectedChannel()) {
-                UpdateChecker.showUpdateInfoDialog(true, checkForUpdateResult.getUpdatedChannel(), updatedPlugins);
-              }
-              else if (updatedPlugins != null) {
-                UpdateChecker.showNoUpdatesDialog(true, updatedPlugins, showConfirmation);
-              }
+              UpdateChecker.showUpdateResult(checkForUpdateResult, updatedPlugins, showConfirmation, true, false);
             }
           });
         }
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java
index e8578b64a569..c78d54abe30f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java
@@ -56,15 +56,8 @@ public class CheckForUpdateAction extends AnAction implements DumbAware {
               return;
             }
 
-            if (result.hasNewBuildInSelectedChannel()) {
-              //information about new channel could be there
-              UpdateSettings.getInstance().LAST_TIME_CHECKED = System.currentTimeMillis();
-              UpdateChecker.showUpdateInfoDialog(enableLink, result.getUpdatedChannel(), updatedPlugins);
-            }
-            else {
-              //information about new channel could be there
-              UpdateChecker.showNoUpdatesDialog(enableLink, updatedPlugins, true);
-            }
+            UpdateSettings.getInstance().LAST_TIME_CHECKED = System.currentTimeMillis();
+            UpdateChecker.showUpdateResult(result, updatedPlugins, true, enableLink, true);
           }
         });
       }
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
index 3854489cfd65..01f3c1859ff8 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
@@ -307,6 +307,21 @@ public final class UpdateChecker {
     return result;
   }
 
+  public static void showUpdateResult(CheckForUpdateResult checkForUpdateResult,
+                                      List<PluginDownloader> updatedPlugins,
+                                      boolean showConfirmation,
+                                      boolean enableLink,
+                                      final boolean alwaysShowResults) {
+    if (checkForUpdateResult.hasNewBuildInSelectedChannel()) {
+      new UpdateInfoDialog(true, checkForUpdateResult.getUpdatedChannel(), updatedPlugins, enableLink).show();
+    }
+    else if (updatedPlugins != null || alwaysShowResults) {
+      NoUpdatesDialog dialog = new NoUpdatesDialog(true, updatedPlugins, enableLink);
+      dialog.setShowConfirmation(showConfirmation);
+      dialog.show();
+    }
+}
+
   private static Document loadVersionInfo(final String url) throws Exception {
     if (LOG.isDebugEnabled()) {
       LOG.debug("enter: loadVersionInfo(UPDATE_URL='" + url + "' )");
@@ -374,16 +389,6 @@ public final class UpdateChecker {
     return uid;
   }
 
-  public static void showNoUpdatesDialog(boolean enableLink, final List<PluginDownloader> updatePlugins, boolean showConfirmation) {
-    NoUpdatesDialog dialog = new NoUpdatesDialog(true, updatePlugins, enableLink);
-    dialog.setShowConfirmation(showConfirmation);
-    dialog.show();
-  }
-
-  public static void showUpdateInfoDialog(boolean enableLink, final UpdateChannel channel, final List<PluginDownloader> updatePlugins) {
-    new UpdateInfoDialog(true, channel, updatePlugins, enableLink).show();
-  }
-
   public static boolean install(List<PluginDownloader> downloaders) {
     boolean installed = false;
     for (PluginDownloader downloader : downloaders) {