azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
#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
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/org/jetbrains/jet/plugin/icons/enum_kotlin.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 765 B

idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java
+2 -2
View File
@@ -95,9 +95,9 @@ public final class JetDescriptorIconProvider {
case TRAIT: case TRAIT:
return JetIcons.TRAIT; return JetIcons.TRAIT;
case ENUM_CLASS: case ENUM_CLASS:
return PlatformIcons.ENUM_ICON; return JetIcons.ENUM;
case ENUM_ENTRY: case ENUM_ENTRY:
return PlatformIcons.ENUM_ICON; return JetIcons.ENUM;
case ANNOTATION_CLASS: case ANNOTATION_CLASS:
return PlatformIcons.ANNOTATION_TYPE_ICON; return PlatformIcons.ANNOTATION_TYPE_ICON;
case OBJECT: case OBJECT:
idea/src/org/jetbrains/jet/plugin/JetIconProvider.java
+2 -2
View File
@@ -129,11 +129,11 @@ public class JetIconProvider extends IconProvider {
return JetIcons.TRAIT; return JetIcons.TRAIT;
} }
Icon icon = jetClass.isEnum() ? PlatformIcons.ENUM_ICON : JetIcons.CLASS; Icon icon = jetClass.isEnum() ? JetIcons.ENUM : JetIcons.CLASS;
if (jetClass instanceof JetEnumEntry) { if (jetClass instanceof JetEnumEntry) {
JetEnumEntry enumEntry = (JetEnumEntry) jetClass; JetEnumEntry enumEntry = (JetEnumEntry) jetClass;
if (enumEntry.getPrimaryConstructorParameterList() == null) { if (enumEntry.getPrimaryConstructorParameterList() == null) {
icon = PlatformIcons.ENUM_ICON; icon = JetIcons.ENUM;
} }
} }
return icon; return icon;
idea/src/org/jetbrains/jet/plugin/JetIcons.java
+1
View File
@@ -25,6 +25,7 @@ public interface JetIcons {
Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin.png"); 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 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 FILE = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin_file.png");
Icon OBJECT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/object.png"); Icon OBJECT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/object.png");
Icon TRAIT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/trait.png"); Icon TRAIT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/trait.png");