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 00000000000..43a53540805 Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/enum_kotlin.png differ 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");