From cee847391075bb3ccd248b6062cdeaca7295fd56 Mon Sep 17 00:00:00 2001 From: Andrey Ponomarev Date: Wed, 30 Jan 2013 21:15:34 +0100 Subject: [PATCH] KT-2153 Enum classes don't have a "K" overlay on the icon in project view #KT-2153 Fixed --- .../jetbrains/jet/plugin/icons/enum_kotlin.png | Bin 0 -> 765 bytes .../jet/plugin/JetDescriptorIconProvider.java | 4 ++-- .../org/jetbrains/jet/plugin/JetIconProvider.java | 4 ++-- idea/src/org/jetbrains/jet/plugin/JetIcons.java | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 idea/resources/org/jetbrains/jet/plugin/icons/enum_kotlin.png diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/enum_kotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/enum_kotlin.png new file mode 100644 index 0000000000000000000000000000000000000000..43a53540805ed31134e6f79f6c40c143c8e14f39 GIT binary patch literal 765 zcmV&I5bQ2L3UWgS4A&D4mU_WR| z8RlitMcvs=7j>1@O<9DHwbEqa-<w_ILcOV5u2V7>Lv7Q|v1hQy@%fa*0 z^GaBD2uSCOBpd*Eq>62eDXq88FM)6b2JqKIID$IAgvFHBD@$UnsX)onTRxY-0|eA4 z{(9%!(XwK7K6tin5%^pJpUf5p0EDanu%_z!t2`AjHg%+9blkKz`rHm43&~uQsX)`2 z%m@M9)Y0MdAppR^Q|)Lt)cV^&2sFxMlYlb(5extq?iUs8lpLTGNaX=h05s0PQaVn6 zK(UA%M-m!kCQ*s3Wa|_-F*1p(gX7>bOK`spul=#CPSpn7d}#(YVuvLIYv@2P(D_`_iJ znQ<#&jFl}DXLAIVoHnFnX|v9lha-e~({c7IX!kvbo;IwNqzPg8G0I=){~&&00000NkvXXu0mjfUn5qO literal 0 HcmV?d00001 diff --git a/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java b/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java index 188edd2a803..868d02c99e8 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java @@ -95,9 +95,9 @@ public final class JetDescriptorIconProvider { case TRAIT: return JetIcons.TRAIT; case ENUM_CLASS: - return PlatformIcons.ENUM_ICON; + return JetIcons.ENUM; case ENUM_ENTRY: - return PlatformIcons.ENUM_ICON; + return JetIcons.ENUM; case ANNOTATION_CLASS: return PlatformIcons.ANNOTATION_TYPE_ICON; case OBJECT: diff --git a/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java b/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java index c613dfa8a3a..4b5efb62853 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java @@ -129,11 +129,11 @@ public class JetIconProvider extends IconProvider { return JetIcons.TRAIT; } - Icon icon = jetClass.isEnum() ? PlatformIcons.ENUM_ICON : JetIcons.CLASS; + Icon icon = jetClass.isEnum() ? JetIcons.ENUM : JetIcons.CLASS; if (jetClass instanceof JetEnumEntry) { JetEnumEntry enumEntry = (JetEnumEntry) jetClass; if (enumEntry.getPrimaryConstructorParameterList() == null) { - icon = PlatformIcons.ENUM_ICON; + icon = JetIcons.ENUM; } } return icon; diff --git a/idea/src/org/jetbrains/jet/plugin/JetIcons.java b/idea/src/org/jetbrains/jet/plugin/JetIcons.java index ae8a02d968a..2adc692104a 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetIcons.java +++ b/idea/src/org/jetbrains/jet/plugin/JetIcons.java @@ -25,6 +25,7 @@ public interface JetIcons { Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin.png"); Icon CLASS = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/class_kotlin.png"); + Icon ENUM = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/enum_kotlin.png"); Icon FILE = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin_file.png"); Icon OBJECT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/object.png"); Icon TRAIT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/trait.png");