diff --git a/community-resources/src/developSlogan_community.png b/community-resources/src/developSlogan_community.png deleted file mode 100644 index 7d0da0070c3b..000000000000 Binary files a/community-resources/src/developSlogan_community.png and /dev/null differ diff --git a/community-resources/src/idea/IdeaApplicationInfo.xml b/community-resources/src/idea/IdeaApplicationInfo.xml index 29be79be394a..59923082a7bb 100644 --- a/community-resources/src/idea/IdeaApplicationInfo.xml +++ b/community-resources/src/idea/IdeaApplicationInfo.xml @@ -5,14 +5,11 @@ - + - - + diff --git a/community-resources/src/welcomeCaption_community.png b/community-resources/src/welcomeCaption_community.png deleted file mode 100644 index 0398d21f6227..000000000000 Binary files a/community-resources/src/welcomeCaption_community.png and /dev/null differ diff --git a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java index d1251c9c9ad0..a00310347ac4 100644 --- a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java +++ b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -100,25 +100,6 @@ public abstract class ApplicationInfoEx extends ApplicationInfo { public abstract List getPluginChooserPages(); - - /** @deprecated to remove in IDEA 14 */ - @SuppressWarnings("UnusedDeclaration") - public boolean isEssentialPlugin(String pluginId) { - return false; - } - - /** @deprecated to remove in IDEA 14 */ - @SuppressWarnings("UnusedDeclaration") - public abstract String getOpaqueIconUrl(); - - /** @deprecated to remove in IDEA 14 */ - @SuppressWarnings("UnusedDeclaration") - public abstract String getWelcomeScreenCaptionUrl(); - - /** @deprecated to remove in IDEA 14 */ - @SuppressWarnings("UnusedDeclaration") - public abstract String getWelcomeScreenDeveloperSloganUrl(); - @Nullable public abstract String getCustomizeIDEWizardStepsProvider(); } diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java index b9a0330c90e3..86cc7a21d40a 100644 --- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java @@ -67,7 +67,6 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern private String myIconUrl = "/icon.png"; private String mySmallIconUrl = "/icon_small.png"; private String myBigIconUrl = null; - private String myOpaqueIconUrl = "/icon.png"; private String myToolWindowIconUrl = "/toolwindows/toolWindowProject.png"; private String myWelcomeScreenLogoUrl = null; private String myEditorBackgroundImageUrl = null; @@ -76,8 +75,6 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern private Calendar myMajorReleaseBuildDate = null; private String myPackageCode = null; private boolean myShowLicensee = true; - private String myWelcomeScreenCaptionUrl; - private String myWelcomeScreenDeveloperSloganUrl; private String myCustomizeIDEWizardStepsProvider; private UpdateUrls myUpdateUrls; private String myDocumentationUrl; @@ -136,15 +133,12 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern private static final String ATTRIBUTE_SIZE128 = "size128"; private static final String ATTRIBUTE_SIZE16 = "size16"; private static final String ATTRIBUTE_SIZE12 = "size12"; - private static final String ATTRIBUTE_SIZE32OPAQUE = "size32opaque"; private static final String ELEMENT_PACKAGE = "package"; private static final String ATTRIBUTE_CODE = "code"; private static final String ELEMENT_LICENSEE = "licensee"; private static final String ATTRIBUTE_SHOW = "show"; private static final String WELCOME_SCREEN_ELEMENT_NAME = "welcome-screen"; - private static final String CAPTION_URL_ATTR = "caption-url"; private static final String LOGO_URL_ATTR = "logo-url"; - private static final String SLOGAN_URL_ATTR = "slogan-url"; private static final String ELEMENT_EDITOR = "editor"; private static final String BACKGROUND_URL_ATTR = "background-url"; private static final String UPDATE_URLS_ELEMENT_NAME = "update-urls"; @@ -338,26 +332,11 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern return myBigIconUrl; } - @Override - public String getOpaqueIconUrl() { - return myOpaqueIconUrl; - } - @Override public String getToolWindowIconUrl() { return myToolWindowIconUrl; } - @Override - public String getWelcomeScreenCaptionUrl() { - return myWelcomeScreenCaptionUrl; - } - - @Override - public String getWelcomeScreenDeveloperSloganUrl() { - return myWelcomeScreenDeveloperSloganUrl; - } - @Override public String getWelcomeScreenLogoUrl() { return myWelcomeScreenLogoUrl; @@ -566,7 +545,8 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern if (buildElement != null) { myBuildNumber = buildElement.getAttributeValue(ATTRIBUTE_NUMBER); myApiVersion = buildElement.getAttributeValue(ATTRIBUTE_API_VERSION); - PluginManagerCore.BUILD_NUMBER = myApiVersion != null ? myApiVersion : myBuildNumber; + setBuildNumber(myApiVersion, myBuildNumber); + String dateString = buildElement.getAttributeValue(ATTRIBUTE_DATE); if (dateString.equals("__BUILD_DATE__")) { myBuildDate = new GregorianCalendar(); @@ -651,7 +631,6 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern if (iconElement != null) { myIconUrl = iconElement.getAttributeValue(ATTRIBUTE_SIZE32); mySmallIconUrl = iconElement.getAttributeValue(ATTRIBUTE_SIZE16); - myOpaqueIconUrl = iconElement.getAttributeValue(ATTRIBUTE_SIZE32OPAQUE); myBigIconUrl = iconElement.getAttributeValue(ATTRIBUTE_SIZE128, (String)null); final String toolWindowIcon = iconElement.getAttributeValue(ATTRIBUTE_SIZE12); if (toolWindowIcon != null) { @@ -672,8 +651,6 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern Element welcomeScreen = parentNode.getChild(WELCOME_SCREEN_ELEMENT_NAME); if (welcomeScreen != null) { myWelcomeScreenLogoUrl = welcomeScreen.getAttributeValue(LOGO_URL_ATTR); - myWelcomeScreenCaptionUrl = welcomeScreen.getAttributeValue(CAPTION_URL_ATTR); - myWelcomeScreenDeveloperSloganUrl = welcomeScreen.getAttributeValue(SLOGAN_URL_ATTR); } Element wizardSteps = parentNode.getChild(CUSTOMIZE_IDE_WIZARD_STEPS); @@ -789,6 +766,10 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern } } + private static void setBuildNumber(String apiVersion, String buildNumber) { + PluginManagerCore.BUILD_NUMBER = apiVersion != null ? apiVersion : buildNumber; + } + private static GregorianCalendar parseDate(final String dateString) { @SuppressWarnings("MultipleVariablesInDeclaration") int year = 0, month = 0, day = 0, hour = 0, minute = 0; @@ -806,6 +787,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern return new GregorianCalendar(year, month, day, hour, minute); } + @SuppressWarnings("UseJBColor") private static Color parseColor(final String colorString) { final long rgb = Long.parseLong(colorString, 16); return new Color((int)rgb, rgb > 0xffffff); diff --git a/platform/icons/src/icon_CEwhite.png b/platform/icons/src/icon_CEwhite.png deleted file mode 100644 index 11130b5421ca..000000000000 Binary files a/platform/icons/src/icon_CEwhite.png and /dev/null differ diff --git a/platform/icons/src/icon_CEwhite@2x.png b/platform/icons/src/icon_CEwhite@2x.png deleted file mode 100644 index dbc20e01289a..000000000000 Binary files a/platform/icons/src/icon_CEwhite@2x.png and /dev/null differ diff --git a/platform/icons/src/icon_white.png b/platform/icons/src/icon_white.png deleted file mode 100644 index 76b15852f8df..000000000000 Binary files a/platform/icons/src/icon_white.png and /dev/null differ diff --git a/platform/icons/src/icon_white@2x.png b/platform/icons/src/icon_white@2x.png deleted file mode 100644 index 8f905ff30055..000000000000 Binary files a/platform/icons/src/icon_white@2x.png and /dev/null differ diff --git a/platform/platform-resources/src/idea/PlatformApplicationInfo.xml b/platform/platform-resources/src/idea/PlatformApplicationInfo.xml index 95c21fc68610..c2144d209fae 100644 --- a/platform/platform-resources/src/idea/PlatformApplicationInfo.xml +++ b/platform/platform-resources/src/idea/PlatformApplicationInfo.xml @@ -1,5 +1,4 @@ - @@ -7,9 +6,7 @@ - + diff --git a/platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml b/platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml index d49864b49973..ed77b4a73104 100644 --- a/platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml +++ b/platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml @@ -4,13 +4,11 @@ - + - + - + - + - + - +