From 68d5c8ba9b988d7d65800546fdfab669bf4e2bc8 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 3 Aug 2012 11:45:03 +0200 Subject: [PATCH] update channels in ApplicationInfo.xml don't need to be fixed because they aren't used for anything any more; remove them to avoid confusion --- community-resources/src/idea/IdeaApplicationInfo.xml | 2 +- .../com/intellij/openapi/application/ApplicationInfo.java | 1 - .../src/com/intellij/errorreport/itn/ITNProxy.java | 2 -- .../openapi/application/impl/ApplicationInfoImpl.java | 6 ------ 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/community-resources/src/idea/IdeaApplicationInfo.xml b/community-resources/src/idea/IdeaApplicationInfo.xml index 41831dcca9ac..96ec937f7f9f 100644 --- a/community-resources/src/idea/IdeaApplicationInfo.xml +++ b/community-resources/src/idea/IdeaApplicationInfo.xml @@ -1,5 +1,5 @@ - + diff --git a/platform/platform-api/src/com/intellij/openapi/application/ApplicationInfo.java b/platform/platform-api/src/com/intellij/openapi/application/ApplicationInfo.java index 244b9586ce31..da83ad689aa2 100644 --- a/platform/platform-api/src/com/intellij/openapi/application/ApplicationInfo.java +++ b/platform/platform-api/src/com/intellij/openapi/application/ApplicationInfo.java @@ -38,7 +38,6 @@ public abstract class ApplicationInfo { public abstract String getHelpURL(); public abstract String getCompanyName(); public abstract String getCompanyURL(); - public abstract String getDefaultUpdateChannel(); public abstract boolean hasContextHelp(); public static ApplicationInfo getInstance() { diff --git a/platform/platform-impl/src/com/intellij/errorreport/itn/ITNProxy.java b/platform/platform-impl/src/com/intellij/errorreport/itn/ITNProxy.java index 265abf1fc342..fb5ed2db5209 100644 --- a/platform/platform-impl/src/com/intellij/errorreport/itn/ITNProxy.java +++ b/platform/platform-impl/src/com/intellij/errorreport/itn/ITNProxy.java @@ -36,7 +36,6 @@ import java.io.*; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Iterator; @@ -136,7 +135,6 @@ public class ITNProxy { params.add(Pair.create("app.version.minor", appInfo.getMinorVersion())); params.add(Pair.create("app.build.date", format(appInfo.getBuildDate()))); params.add(Pair.create("app.build.date.release", format(appInfo.getMajorReleaseBuildDate()))); - params.add(Pair.create("app.update.channel", appInfo.getDefaultUpdateChannel())); params.add(Pair.create("app.compilation.timestamp", compilationTimestamp)); params.add(Pair.create("update.channel.status", updateSettings.getSelectedChannelStatus().getCode())); diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java index 1894947fb261..e572e39e7adb 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java @@ -74,7 +74,6 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern private String myPluginManagerUrl; private String myPluginsListUrl; private String myPluginsDownloadUrl; - private String myDefaultUpdateChannel; private String myWhatsNewUrl; private String myWinKeymapUrl; private String myMacKeymapUrl; @@ -257,10 +256,6 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern return myEAP; } - public String getDefaultUpdateChannel() { - return myDefaultUpdateChannel; - } - public UpdateUrls getUpdateUrls() { return myUpdateUrls; } @@ -362,7 +357,6 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern myMinorVersion = versionElement.getAttributeValue(ATTRIBUTE_MINOR); myCodeName = versionElement.getAttributeValue(ATTRIBUTE_CODENAME); myEAP = Boolean.parseBoolean(versionElement.getAttributeValue(ATTRIBUTE_EAP)); - myDefaultUpdateChannel = versionElement.getAttributeValue("update-channel"); } Element companyElement = parentNode.getChild(ELEMENT_COMPANY);