From 3b7f349cc5dbb5b5cd0c9d0a8221f05bbd16d20f Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 21 Jan 2020 21:57:39 +0300 Subject: [PATCH] Remove deprecated icons in AllIcons.Json GitOrigin-RevId: 64dd7a261edd06809b110cb8742ae8e51443d6ea --- .../intellij/json/psi/impl/JsonPsiImplUtils.java | 5 +++-- .../com/intellij/json/JsonStructureViewTest.java | 3 ++- .../json/property_braces.png | Bin 177 -> 0 bytes .../json/property_braces@2x.png | Bin 261 -> 0 bytes .../json/property_braces@2x_dark.png | Bin 262 -> 0 bytes .../json/property_braces_dark.png | Bin 177 -> 0 bytes .../json/property_brackets.png | Bin 110 -> 0 bytes .../json/property_brackets@2x.png | Bin 133 -> 0 bytes .../json/property_brackets@2x_dark.png | Bin 133 -> 0 bytes .../json/property_brackets_dark.png | Bin 110 -> 0 bytes platform/icons/src/json/icon-robots.txt | 2 -- .../com/intellij/ui/PlatformIconsAPITest.java | 2 -- .../util/src/com/intellij/icons/AllIcons.java | 12 ------------ 13 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 platform/icons/compatibilityResources/json/property_braces.png delete mode 100644 platform/icons/compatibilityResources/json/property_braces@2x.png delete mode 100644 platform/icons/compatibilityResources/json/property_braces@2x_dark.png delete mode 100644 platform/icons/compatibilityResources/json/property_braces_dark.png delete mode 100644 platform/icons/compatibilityResources/json/property_brackets.png delete mode 100644 platform/icons/compatibilityResources/json/property_brackets@2x.png delete mode 100644 platform/icons/compatibilityResources/json/property_brackets@2x_dark.png delete mode 100644 platform/icons/compatibilityResources/json/property_brackets_dark.png delete mode 100644 platform/icons/src/json/icon-robots.txt diff --git a/json/src/com/intellij/json/psi/impl/JsonPsiImplUtils.java b/json/src/com/intellij/json/psi/impl/JsonPsiImplUtils.java index c1fe7f0ebb53..2d6e66912270 100644 --- a/json/src/com/intellij/json/psi/impl/JsonPsiImplUtils.java +++ b/json/src/com/intellij/json/psi/impl/JsonPsiImplUtils.java @@ -1,3 +1,4 @@ +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.json.psi.impl; import com.intellij.icons.AllIcons; @@ -76,10 +77,10 @@ public class JsonPsiImplUtils { @Override public Icon getIcon(boolean unused) { if (property.getValue() instanceof JsonArray) { - return AllIcons.Json.Property_brackets; + return AllIcons.Json.Array; } if (property.getValue() instanceof JsonObject) { - return AllIcons.Json.Property_braces; + return AllIcons.Json.Object; } return PlatformIcons.PROPERTY_ICON; } diff --git a/json/tests/test/com/intellij/json/JsonStructureViewTest.java b/json/tests/test/com/intellij/json/JsonStructureViewTest.java index 4c70bafc2705..cfc204449744 100644 --- a/json/tests/test/com/intellij/json/JsonStructureViewTest.java +++ b/json/tests/test/com/intellij/json/JsonStructureViewTest.java @@ -1,3 +1,4 @@ +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.json; import com.intellij.icons.AllIcons; @@ -148,7 +149,7 @@ public class JsonStructureViewTest extends JsonTestCase { assertEquals("aaa", children[0].getPresentation().getPresentableText()); assertEquals(PlatformIcons.PROPERTY_ICON, children[0].getPresentation().getIcon(false)); assertEquals("bbb", children[1].getPresentation().getPresentableText()); - assertEquals(AllIcons.Json.Property_braces, children[1].getPresentation().getIcon(false)); + assertEquals(AllIcons.Json.Object, children[1].getPresentation().getIcon(false)); children = children[1].getChildren(); assertEquals(1, children.length); diff --git a/platform/icons/compatibilityResources/json/property_braces.png b/platform/icons/compatibilityResources/json/property_braces.png deleted file mode 100644 index bac6140fc6f31736f43277cca10be890e4394b4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`6`n4RAr-fh6C|cA*igBMVW$*# z!w)-w|HqZS%WH)>VDNPHb6Mw<&;$Spt~`DK diff --git a/platform/icons/compatibilityResources/json/property_braces@2x.png b/platform/icons/compatibilityResources/json/property_braces@2x.png deleted file mode 100644 index 9e4abe46f75c79f0897a45c8e2b929106f628b35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJGoCJvAr-fh6C_v{CulStde+HQ zvR$BqyP?8f;6M9CmlutzTVIJPT>r$NP{(h|)7N?7yF73684iW3MXWk)CJjeAuiS1p z`jKmi#RA5&MT|y^`ELsHKCw!$W6jL4GnKjE(8w&c;$g#I5sL)-oqP`0Zul?NxZ$sH z(8A$k&6X>#fzmP;&dlmh>1VKO-Ed{TL+c?O#^}nXM;i}5XlU$ZV(OeQsc6CcHFr!T zHa%RR)xow$LvF$;j_}ePhv}~>4oIssFY+`?ky^JnK_q~S;j#YnN%we5e**o*;OXk; Jvd$@?2>{YRXL$es diff --git a/platform/icons/compatibilityResources/json/property_braces@2x_dark.png b/platform/icons/compatibilityResources/json/property_braces@2x_dark.png deleted file mode 100644 index 5fcf6c75e45b272ad16b61ca806a1f9183312431..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJvz{)FAr-fh6C_v{CulV0{_f|z zaMwvekKxf@hd=Tz!VB5giLDB6h&j#N@Wb|sfrXmW{dyA~BjtvW)1n(BE-?tH2jw%1 z9oL@lsDaJoH0y~TyA*em39lP|iY!_9^GbmOGb>-lf;Q%F!4De#KCxnmOtzo8D8YUq z%VUP4pDzZj2TB(>7-!o}vSs=qaww>tNtA0dOU_fyuH$UY%xq>{94by;ryA=v6Q}@t>YZf^aDCo*gR#4YA%t(qF^1WUd;up}Z1i{%+y(B+M>#vwPR@SD az~J0^;k2!y;aZ>@7(8A5T-G@yGywo;*gHZ1 diff --git a/platform/icons/compatibilityResources/json/property_brackets.png b/platform/icons/compatibilityResources/json/property_brackets.png deleted file mode 100644 index 03416f83ee86836d3db6c07cc2692c09f84ee29b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`rk*a2Ar-fh6C~^wY^Z!xpW?I1 z#^+$ALK#D%&L_Tr8oBw5zdH+F{tINz$YD5o(WA~uY8L}TbX2pZ1M3wvpaBe?u6{1- HoD!M%bQVQr^;8bz-fwAk5$4I#>IRRr3Y3pyU7|Xku`X5^&>}) gU~f~P!6OESMHO%U$TKoG0L^9aboFyt=akR{05DlAegFUf diff --git a/platform/icons/compatibilityResources/json/property_brackets@2x_dark.png b/platform/icons/compatibilityResources/json/property_brackets@2x_dark.png deleted file mode 100644 index fd7045b5743f70f9b112b2e644c4d5365b085582..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzA5Ry@kcwN$2@zopr0OExtoB#j- diff --git a/platform/icons/src/json/icon-robots.txt b/platform/icons/src/json/icon-robots.txt deleted file mode 100644 index 44b4bd92dc97..000000000000 --- a/platform/icons/src/json/icon-robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -deprecated: property_braces.png -> /json/object.svg; to be removed in IDEA 2020 - use AllIcons.Json.Object -deprecated: property_brackets.png -> /json/array.svg; to be removed in IDEA 2020 - use AllIcons.Json.Array diff --git a/platform/platform-tests/testSrc/com/intellij/ui/PlatformIconsAPITest.java b/platform/platform-tests/testSrc/com/intellij/ui/PlatformIconsAPITest.java index e25ffef921cc..26c48eecaabf 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/PlatformIconsAPITest.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/PlatformIconsAPITest.java @@ -594,8 +594,6 @@ public class PlatformIconsAPITest extends TestCase { "/javaee/WebServiceClient2.png", "/json/array.png", "/json/object.png", - "/json/property_braces.png", - "/json/property_brackets.png", "/Logo_welcomeScreen.png", "/mac/appIconOk512.png", "/mac/text.png", diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 7ff339df7031..de803347b746 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -584,18 +584,6 @@ public class AllIcons { /** 16x16 */ public static final Icon Array = load("/json/array.svg"); /** 16x16 */ public static final Icon Object = load("/json/object.svg"); - /** @deprecated to be removed in IDEA 2020 - use AllIcons.Json.Object */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval(inVersion = "2020.1") - /** 16x16 */ public static final Icon Property_braces = load("/json/object.svg"); - - /** @deprecated to be removed in IDEA 2020 - use AllIcons.Json.Array */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval(inVersion = "2020.1") - /** 16x16 */ public static final Icon Property_brackets = load("/json/array.svg"); - } /** 80x80 */ public static final Icon Logo_welcomeScreen = load("/Logo_welcomeScreen.png"); /** 80x80 */ public static final Icon Logo_welcomeScreen_CE = load("/Logo_welcomeScreen_CE.png");