From 98d931ecb0d057d84a656e83edf47ee24ed8939d Mon Sep 17 00:00:00 2001 From: Alexey Gopachenko Date: Wed, 23 Dec 2009 17:50:36 +0300 Subject: [PATCH] Fix updater by removing non-working channel switching ability and always resorting to AppplictionInfo.xml default channel. --- .../src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java | 2 +- .../src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) 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 b5791d5a3d..e3f39d7b31 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 @@ -308,7 +308,7 @@ public final class UpdateChecker { Product product = findProduct(root, productCode); if (product == null) return null; - UpdateChannel channel = product.findUpdateChannelById(UpdateSettings.getInstance().CURRENT_UPDATE_CHANNEL); + UpdateChannel channel = product.findUpdateChannelById(ApplicationInfo.getInstance().getDefaultUpdateChannel()); if (channel != null) return channel; for (UpdateChannel c : product.getChannels()) { diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java index 89e7df47be..06d96d2d9f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java @@ -15,7 +15,6 @@ */ package com.intellij.openapi.updateSettings.impl; -import com.intellij.openapi.application.ApplicationInfo; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; @@ -51,8 +50,6 @@ public class UpdateSettings implements PersistentStateComponent { public String CHECK_PERIOD = UpdateSettingsConfigurable.WEEKLY; public long LAST_TIME_CHECKED = 0; - public String CURRENT_UPDATE_CHANNEL = ApplicationInfo.getInstance().getDefaultUpdateChannel(); - public static UpdateSettings getInstance() { return ServiceManager.getService(UpdateSettings.class); } -- 2.11.4.GIT