From da3964f1dab7a838eb1d0363157f959609df4863 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 14 Jul 2016 21:04:02 +0200 Subject: [PATCH] [java] module icons --- .../ClassesOrderRootTypeUIFactory.java | 3 +-- .../psi/impl/JavaDirectoryIconProvider.java | 8 ++++++-- .../java/JavaModulePresentationProvider.java | 2 +- platform/icons/src/nodes/javaModule.png | Bin 0 -> 454 bytes platform/icons/src/nodes/javaModule@2x.png | Bin 0 -> 933 bytes platform/icons/src/nodes/javaModuleRoot.png | Bin 0 -> 124 bytes platform/icons/src/nodes/javaModuleRoot@2x.png | Bin 0 -> 155 bytes .../util/src/com/intellij/icons/AllIcons.java | 2 ++ 8 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 platform/icons/src/nodes/javaModule.png create mode 100644 platform/icons/src/nodes/javaModule@2x.png create mode 100644 platform/icons/src/nodes/javaModuleRoot.png create mode 100644 platform/icons/src/nodes/javaModuleRoot@2x.png diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java index 57227d1e40d4..e4422331e055 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java @@ -25,7 +25,6 @@ import com.intellij.openapi.roots.ui.OrderRootTypeUIFactory; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.impl.jrt.JrtFileSystem; import com.intellij.ui.components.JBList; -import com.intellij.util.PlatformIcons; import javax.swing.*; @@ -72,7 +71,7 @@ public class ClassesOrderRootTypeUIFactory implements OrderRootTypeUIFactory { return new PathCellRenderer() { @Override protected Icon getItemIcon(Object value) { - return isJrtRoot(value) ? PlatformIcons.JAR_ICON : super.getItemIcon(value); + return isJrtRoot(value) ? AllIcons.Nodes.JavaModuleRoot : super.getItemIcon(value); } }; } diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaDirectoryIconProvider.java b/java/java-impl/src/com/intellij/psi/impl/JavaDirectoryIconProvider.java index e4989828d363..784da4e17cdd 100644 --- a/java/java-impl/src/com/intellij/psi/impl/JavaDirectoryIconProvider.java +++ b/java/java-impl/src/com/intellij/psi/impl/JavaDirectoryIconProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -27,6 +27,7 @@ import com.intellij.openapi.roots.SourceFolder; import com.intellij.openapi.roots.ui.configuration.SourceRootPresentation; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.vfs.impl.jrt.JrtFileSystem; import com.intellij.openapi.vfs.newvfs.ArchiveFileSystem; import com.intellij.psi.JavaDirectoryService; import com.intellij.psi.PsiDirectory; @@ -61,6 +62,9 @@ public class JavaDirectoryIconProvider extends IconProvider implements DumbAware else if ((sourceFolder = ProjectRootsUtil.getModuleSourceRoot(vFile, project)) != null) { symbolIcon = SourceRootPresentation.getSourceRootIcon(sourceFolder); } + else if (JrtFileSystem.isModuleRoot(vFile)) { + symbolIcon = AllIcons.Nodes.JavaModuleRoot; + } else if (JavaDirectoryService.getInstance().getPackage(psiDirectory) != null) { symbolIcon = PlatformIcons.PACKAGE_ICON; } @@ -76,4 +80,4 @@ public class JavaDirectoryIconProvider extends IconProvider implements DumbAware return null; } -} +} \ No newline at end of file diff --git a/java/java-psi-impl/src/com/intellij/psi/presentation/java/JavaModulePresentationProvider.java b/java/java-psi-impl/src/com/intellij/psi/presentation/java/JavaModulePresentationProvider.java index c6a92794e332..2b1adee12615 100644 --- a/java/java-psi-impl/src/com/intellij/psi/presentation/java/JavaModulePresentationProvider.java +++ b/java/java-psi-impl/src/com/intellij/psi/presentation/java/JavaModulePresentationProvider.java @@ -43,7 +43,7 @@ public class JavaModulePresentationProvider implements ItemPresentationProvider< @Nullable @Override public Icon getIcon(boolean unused) { - return AllIcons.FileTypes.Java; + return AllIcons.Nodes.JavaModule; } }; } diff --git a/platform/icons/src/nodes/javaModule.png b/platform/icons/src/nodes/javaModule.png new file mode 100644 index 0000000000000000000000000000000000000000..8e4a624d7e71f0abad2fd57488e7532cb65a93c2 GIT binary patch literal 454 zcmV;%0XhDOP)4~Tl0VL6R~LgVvW0fV7Iu+BDWW1o%h1ZmG*J?Zw3}rHspDnTf}9Z)<;z!e zOqy}y;u${9`^QJxRxwG*yXO&=`L>irL`w{`=Vv4(6Rm}g|~0x*V)N}Vt3 woOGv4qpnnQ+?}pZou&&qU(SI{@-hv>FJOfB7B2t_;{X5v07*qoM6N<$g4r0vfdBvi literal 0 HcmV?d00001 diff --git a/platform/icons/src/nodes/javaModule@2x.png b/platform/icons/src/nodes/javaModule@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1a7a4442427808f095a0e13a5ba321a39202fafd GIT binary patch literal 933 zcmV;W16urvP)t##BPOeTdE^rbO4b`@jTkiCHl*iX4t8m8RUgA4FT_}ai|$1#;S7FWZ~>Lg04 zfE}b7bLy%$TLYfhliDGxDB>GSsb2wGk$zgbDpXHj5e_I8OGoee!sH2{Y6ngC+}eZj z--Q+qD3%&yvck;pC4iJ!Fz>F$4|ceZgLt$K&4Kz_6C6994`~OJAtfdTQetEA`4Hrt zF7`Q&VzS*~5&MLvfN0_CaU0#kEybhu`CCxP(jgTm%rCqEg=#IRF4w@R;!;q^GvGwQ zIiF(*Tm`XD?B)re4hK3cnmg$1iGE-jGE?LrPfUVpgOTgA5jvAq6i~tw&`sS;KVpZr zF^3l_ZJn^(>e@E0T?%?k1E!cdW*1MuEVa~@5eM8J^(O0Rj$!Ojsc z0d7_2%qn#;9{ z4e0DiW!D&{AptV54(OTZgUJ1Hb#OtBa}YaoTi!$vUX4hNjpzm{<)LYQCWw$>FF09L z0?Lc!aHgyV@>FGzos&z?atsQAz-`64Asf`cvva9=3IVNg0jf+kE@%t80C9UN_&+8y zos;}|?${an^LB{Ts5cxfk0 literal 0 HcmV?d00001 diff --git a/platform/icons/src/nodes/javaModuleRoot@2x.png b/platform/icons/src/nodes/javaModuleRoot@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..7e739fe7eb2f39b2137b9668897c57fd1dbb5172 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kcwMxuRHQGDDt>myx7%j z+Q6f;AnE)GsR<6=!W?HF-oL*vGkC(0a|#Cx8}_S6omQ^sX3$Yw#E|Era-g+?ZHDlJ zngij|I=(#fxDT9U5pZB&e8>7G`sl8<_l#d8ZMk2>FX;?*K7H{L&^887S3j3^P6