KT-2153 Enum classes don't have a "K" overlay on the icon in project view

#KT-2153 Fixed
This commit is contained in:
Andrey Ponomarev
2013-01-30 21:15:34 +01:00
committed by Evgeny Gerashchenko
parent ba9c455ea1
commit cee8473910
4 changed files with 5 additions and 4 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 765 B

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