From 63cec94dbc949c50d3e4036ed8d40481dfdca156 Mon Sep 17 00:00:00 2001 From: Alexander Podkhalyuzin Date: Fri, 25 Jan 2019 12:41:49 +0300 Subject: [PATCH] Cleanup after review --- .../kotlin/idea/IconExtensionChooser.java | 15 +++++ .../kotlin/idea/IconExtensionChooser.java.182 | 14 ++++ .../jetbrains/kotlin/idea/KotlinIcons.java | 54 +++++++-------- .../kotlin/idea/KotlinIcons.java.182 | 62 ------------------ .../jetbrains/kotlin/idea/icons/kotlin24.png | Bin 442 -> 0 bytes .../jetbrains/kotlin/idea/icons/kotlin24.svg | 17 ----- .../kotlin/idea/icons/kotlin24@2x.png | Bin 802 -> 0 bytes .../kotlin/idea/icons/kotlin_activity.png | Bin 243 -> 0 bytes .../kotlin/idea/icons/kotlin_activity.svg | 20 ------ .../kotlin/idea/icons/kotlin_activity@2x.png | Bin 554 -> 0 bytes 10 files changed, 56 insertions(+), 126 deletions(-) create mode 100644 idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java create mode 100644 idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java.182 delete mode 100644 idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java.182 delete mode 100755 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.png delete mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.svg delete mode 100755 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24@2x.png delete mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.png delete mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.svg delete mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity@2x.png diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java new file mode 100644 index 00000000000..83e98940b5b --- /dev/null +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea; + +// BUNCH: 182 +// todo: inline when remove + +public interface IconExtensionChooser { + static String iconExtension() { + return "svg"; + } +} diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java.182 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java.182 new file mode 100644 index 00000000000..29a2fd09643 --- /dev/null +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java.182 @@ -0,0 +1,14 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea; + +// BUNCH: 182 + +public interface IconExtensionChooser { + static String iconExtension() { + return "png"; + } +} diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java index bb21b343724..8b279b971b2 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -22,41 +22,41 @@ import com.intellij.util.PlatformIcons; import javax.swing.*; public interface KotlinIcons { - Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin.svg"); - Icon KOTLIN_LOGO_24 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin24.svg"); + Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin." + IconExtensionChooser.iconExtension()); - Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin13.svg"); + Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin13." + IconExtensionChooser.iconExtension()); - Icon CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classKotlin.svg"); - Icon ABSTRACT_CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstractClassKotlin.svg"); - Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/enumKotlin.svg"); - Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file.svg"); - Icon SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_script.svg"); - Icon GRADLE_SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.svg"); - Icon ACTIVITY = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_activity.svg"); - Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/objectKotlin.svg"); - Icon INTERFACE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin.svg"); - Icon ANNOTATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/annotationKotlin.svg"); - Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/function.svg"); + Icon CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classKotlin." + IconExtensionChooser.iconExtension()); + Icon ABSTRACT_CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstractClassKotlin." + IconExtensionChooser.iconExtension()); + Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/enumKotlin." + IconExtensionChooser.iconExtension()); + Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file." + IconExtensionChooser.iconExtension()); + Icon SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_script." + IconExtensionChooser.iconExtension()); + Icon GRADLE_SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script." + IconExtensionChooser.iconExtension()); + Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/objectKotlin." + IconExtensionChooser.iconExtension()); + Icon INTERFACE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin." + IconExtensionChooser.iconExtension()); + Icon ANNOTATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/annotationKotlin." + IconExtensionChooser.iconExtension()); + // BUNCH: 182 + //todo: Use AllIcons.nodes instead (actually the same icon) + Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/function." + IconExtensionChooser.iconExtension()); Icon EXTENSION_FUNCTION = PlatformIcons.FUNCTION_ICON; - Icon ABSTRACT_EXTENSION_FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstract_extension_function.svg"); - Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/lambda.svg"); + Icon ABSTRACT_EXTENSION_FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstract_extension_function." + IconExtensionChooser.iconExtension()); + Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/lambda." + IconExtensionChooser.iconExtension()); Icon VAR = PlatformIcons.VARIABLE_ICON; - Icon VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/value.svg"); + Icon VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/value." + IconExtensionChooser.iconExtension()); Icon PARAMETER = PlatformIcons.PARAMETER_ICON; - Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_value.svg"); - Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_variable.svg"); - Icon CLASS_INITIALIZER = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classInitializerKotlin.svg"); - Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias.svg"); + Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_value." + IconExtensionChooser.iconExtension()); + Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_variable." + IconExtensionChooser.iconExtension()); + Icon CLASS_INITIALIZER = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classInitializerKotlin." + IconExtensionChooser.iconExtension()); + Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias." + IconExtensionChooser.iconExtension()); - Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall.svg"); + Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall." + IconExtensionChooser.iconExtension()); - Icon ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual.svg"); - Icon EXPECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect.svg"); + Icon ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual." + IconExtensionChooser.iconExtension()); + Icon EXPECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect." + IconExtensionChooser.iconExtension()); - Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.svg"); + Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration." + IconExtensionChooser.iconExtension()); - Icon JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_js.svg"); - Icon MPP = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project.svg"); + Icon JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_js." + IconExtensionChooser.iconExtension()); + Icon MPP = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project." + IconExtensionChooser.iconExtension()); Icon NATIVE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_native.svg"); } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java.182 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java.182 deleted file mode 100644 index b450d08f956..00000000000 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java.182 +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2010-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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea; - -import com.intellij.openapi.util.IconLoader; -import com.intellij.util.PlatformIcons; - -import javax.swing.*; - -public interface KotlinIcons { - Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin.png"); - Icon KOTLIN_LOGO_24 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin24.png"); - - Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin13.png"); - - Icon CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classKotlin.png"); - Icon ABSTRACT_CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstractClassKotlin.png"); - Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/enumKotlin.png"); - Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file.png"); - Icon SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_script.png"); - Icon GRADLE_SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png"); - Icon ACTIVITY = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_activity.png"); - Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/objectKotlin.png"); - Icon INTERFACE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin.png"); - Icon ANNOTATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/annotationKotlin.png"); - Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/function.png"); - Icon EXTENSION_FUNCTION = PlatformIcons.FUNCTION_ICON; - Icon ABSTRACT_EXTENSION_FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstract_extension_function.png"); - Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/lambda.png"); - Icon VAR = PlatformIcons.VARIABLE_ICON; - Icon VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/value.png"); - Icon PARAMETER = PlatformIcons.PARAMETER_ICON; - Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_value.png"); - Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_variable.png"); - Icon CLASS_INITIALIZER = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classInitializerKotlin.png"); - Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias.png"); - - Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall.png"); - - Icon ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual.png"); - Icon EXPECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect.png"); - - Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.png"); - - Icon JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_js.png"); - Icon MPP = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project.png"); - Icon NATIVE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_native.svg"); -} diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.png deleted file mode 100755 index 5687a064e439ddf6c67a0ed6575a3ab9e1aa50f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmV;r0Y(0aP)6D4f4M02|Fx2MVl0_YQYs3WdiMXByyE{C3UY|CWIjpBG-%4D|3|YL|DVjMBF2*W zB;^DD$=CnyOYi%CD5HZIOXic5(R3HQ`@cPT?*HAXQ;D%;K1n%Qd%>swOEb6r-<-UR z7)$1pTvW`>JpO-m%C7(GQ#RnWq_u4YC@2v{0I^_k>e>IxQxD^{q_JfKa!Mo3lKH9E z|Kqcyrg0~>j7YpCv(p~_$7M-H{ULni6mgbJPka3zni^uPa+Ey-+rMvCEtE$L4O7RyjeQW`&zV>o_GKo)>-eA7Ql499H=#PI*r kFdVxjR5qNv%t$T(083~E!Qg2Zpa1{>07*qoM6N<$f`GTx;s5{u diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.svg b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.svg deleted file mode 100644 index 27bbb434fd9..00000000000 --- a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24@2x.png deleted file mode 100755 index 0390ac95c10042915967f4fb6af91799930b028c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 802 zcmV+-1Ks?IP)Ra~FC7_E zvMiRQ*sKi8%9q{@QOcJLG0KQ#LiA0MNK59n^E`8c51iY>_rp2o_j{h-iHlpU7^yW4 z0QFUM-i*Mhjri`|fGOvCvg>~7!S0#+uVn?e%k%NIXfwV!HjyHFN)rA5g{KC%%B=Wo z+lop17HWiGe}z&ieVDNB#3wm{8X?%ffn;|RJ{IoA_{m+=2*LglA9XilG(Qnz1$(Fw zf_)V_a;X(VmVFqu?4?Es_GL85<;P&|0ldrGPmK`l`@jy*d-R(QW59ff8X?#>vINgC zI&;(T)|f<%5bQf~f@cIBrfj^{AHy3%G9^N=w-VcHM$v9CqW44^Ug{)DgkbN5w$*$< zo2~#|**WOR$)H3C_GWHf-4q&)#puj5<5`xT5+T^T(fFD09`i+X952L^3=1Vfu(#9k zbw6;$cp2?!4m?V?Q6dEUJTM!+%HTm;YB3(9o}okt_JJneI}Nwai&o7!+|!<=M2M(N zWF;ma?y6mAkt!$=A}S-L(b@r@sv1qIN=gJ@`1t_6+=WJUJ#MRNDG|Kk{{V92SGcbB z;fDGqC4xWvY-P#)@T&c&S2vR(oTqDNpKAA_LpXI^l^)}o^pFhUaMsOV6!;My={cwn zc1Ocvn<6iwT6zHrgj{qhSWm@=5K(H7h#Z}QXEIpASyJI2nV5)dnr$|l_Scv0fdUk zmixf)KS3FyOgoKG5Sj8IM|kCkQtdA+g-Dl2IKwMLlxl%sh*aBnG{Q%Ym;)@1kZfO~ z89p+^U%*0y$`)9T@ZlpC0_G4Y_MgicK0L&~fMh#jA$;hF7!DsABF4injaUKUgCkZ* g_~^~ps}*AX2Fw(_6z)Hd>;M1&07*qoM6N<$f~00}6951J diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.png deleted file mode 100644 index 99c9ec04fb67e3f58cb44f8c7c6c61cb4d5c7d4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmV6SvOug2#US=v24VqFaWN1-MZ?9!Y7T>HSc9Y)#ttLKfa_RnhvDnQIv*z{ zWOEACx%hAjR+qp63Xk)jBCDaF0i?t|P6PPX{r?ZbR?Dycf6=M)|9hJp44+3f-~>_{ zz%T%tW*`fvYCsCi03^*YjNcGsfJHOh5C8)QXC$RSUqS!?002ovPDHLkV1jfyT{Zv! diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.svg b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.svg deleted file mode 100644 index 285635ea565..00000000000 --- a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity@2x.png deleted file mode 100644 index 7c5e2a97f158d8984231415a82938defce66b5b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 554 zcmV+_0@eMAP)$MpQ|z`Z-QavKFV*#4S;$; zX%Uus07`P7F4zq~)4}vB(R2eK(u5m;5KYiLbE&5Nv@;-&(XhNGG&gfD061HZM00b@ z1wiZ{@aF+$rO4PSOS=Fsj$Ow9e-(ff#as$LHin?RIYi%djVLUiLs0nC z?hVcmgiT2Y$Vc8lL1b4D3