Remove deprecated icons in AllIcons.Json

GitOrigin-RevId: 64dd7a261edd06809b110cb8742ae8e51443d6ea

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;
       }

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);

platform/icons/src/json/icon-robots.txt

@@ -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

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",

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");