MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-08-03 11:45:03 +02:00
parent 4bf2fd564a
commit 68d5c8ba9b
4 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
community-resources/src/idea/IdeaApplicationInfo.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<component>
<version codename="Community Edition" major="12" minor="0" eap="true" update-channel="ledaEAP"/>
<version codename="Community Edition" major="12" minor="0" eap="true"/>
<company name="JetBrains s.r.o." url="http://www.jetbrains.com/"/>
<build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
<install-over minbuild="0" maxbuild="0" version="10.5"/>
platform/platform-api/src/com/intellij/openapi/application/ApplicationInfo.java
-1
View File
@@ -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() {
platform/platform-impl/src/com/intellij/errorreport/itn/ITNProxy.java
-2
View File
@@ -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()));
platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
-6
View File
@@ -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);