From 9ecbdc65a3f53c946c4228be251d439c247714ce Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 28 Nov 2013 11:14:29 +0400 Subject: [PATCH] special icon for generated test root --- platform/icons/src/modules/generatedTestRoot.png | Bin 0 -> 1209 bytes .../icons/src/modules/generatedTestRoot@2x.png | Bin 0 -> 1652 bytes .../src/modules/generatedTestRoot@2x_dark.png | Bin 0 -> 1668 bytes .../icons/src/modules/generatedTestRoot_dark.png | Bin 0 -> 1211 bytes .../JavaModuleSourceRootEditHandler.java | 5 ++--- .../JavaSourceRootEditHandlerBase.java | 9 +++++++++ .../JavaTestSourceRootEditHandler.java | 7 ++++++- .../util/src/com/intellij/icons/AllIcons.java | 3 ++- 8 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 platform/icons/src/modules/generatedTestRoot.png create mode 100644 platform/icons/src/modules/generatedTestRoot@2x.png create mode 100644 platform/icons/src/modules/generatedTestRoot@2x_dark.png create mode 100644 platform/icons/src/modules/generatedTestRoot_dark.png diff --git a/platform/icons/src/modules/generatedTestRoot.png b/platform/icons/src/modules/generatedTestRoot.png new file mode 100644 index 0000000000000000000000000000000000000000..114f685c9d6bdb831508e2bb4a33525e22a97208 GIT binary patch literal 1209 zcmaJ>TWs4@7xiUKPrVE7vRq#`qF-^1KaF}L%w9n_o2(P)IBEj;iW^Y}Aho)%AI+8UNIEq4E zn@156XL_#$MQ_Ne=1!Y%!)Qy;X_jJ~lIp;8`v0Md(m5nCROw8{OBtv|_7Y-)sTwW9B6{w;*S88zMOjEAo1VzV@ zd1%PbL21a)6tG<}CpXW9Z>qP$m73-fOE%@wI2qcR>%Zn)zryBmwhhaR`*lj;hsqAaQ8#ETe`tl#E$4tYAxUy2UwJ6URZ z-*xcI!+Tb?wu)OPPItLKF6Ue)mycVdXTqI7`_cMDh&bW7@H^c@FSgY>!1qKg2c}x{ z{h|9$-FPSe^LlhH-Zs~s9|LC}xH?h(l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij|p>v7?!xxq+#frIVqdtFeW#p`oRl3y?N9 zvvf0Xf$4S0PcF?(%`1WFO+n~2#HkmQ5^@WGHoK%2WtOF;xE1B+Du8`#m5I|WX0ABR zgX&Ge=@v6LoO<AP1iAQ}cj{y$G19Q~7TAFfcH^^mK6y zskrrKdb~$)pv>|2dw2g{U2J*V!0T}0mj$jIjtXLSE`kxZUysWjGMJ>nk;MPER->9D zUh9owl*GiX?!TMal!RCv9sONbYOXwSY1!>7x!?23ch{bO>hq4x>v7y|XSp8*bXOjM6564w>cjp z4OmSvEn=;-L5iPCwRartOMNXAD11)OdO7VC7oJAF_YKdOOWm9aOifb4Y#|m{uHW z&EA(Gs?Z>;uB=u$ul~)gVo9{W!I;-@_zLrN&sU9Z7ntX* zwGW9qHFM_@p{bXXA}b6e+A3qZ8{#hbvi3}nXLe1n-DweZCiz8M>*tTq0WbtDpQm9nRF$sBJF$_2x9DUJB}3{kHVA zUGn1Xk@@<}(i?NO*%rPlEqypg`b3PDTICthYYcb(RlPi^av7e zb}Xs+=GVrJ*Dcx7n4N@cGLGyO`ZYg_B_gw> zU03e5#f%d%9ktPSw0w^A=~W&*GU-PG&(WGY3C29j7p;^E-nrCVP{3&?(~TNCwP~5^ zo~5VftS@@vv`hB&?vT=lyk_6m9TOMiJjA@@(xpv4A@^AMi|rmeM;3m*|KIwb@&Sg& Xi$45m{F2oLss}t>{an^LB{Ts5l`MJq literal 0 HcmV?d00001 diff --git a/platform/icons/src/modules/generatedTestRoot@2x_dark.png b/platform/icons/src/modules/generatedTestRoot@2x_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..818a6b328370083e84e7df7697531e00370eb45a GIT binary patch literal 1668 zcmaJ?drT8|94}85iVxJOAbK2v2z}RLTPa#v9(5EEs-O~}+#PVh-IePBr65rv6Pbv{ zsKlXB9D95{s9HN(HlwSlDM#NF+S`uN%VImd*RG2m%2}QJUMoK;6 z&0ttKqnZdRLLDT92#ljOVK@d%N3$6W?+pf>7D_@WAQp*7aTz#Jbq54cSO$iR)I7CL zfh3@TMiL1#25TT=5+s4a4L*RkK}ri?2&DxKSTe4c8f4&vu9V)JuDKvE0ilv);K!sQ z)FFU^AQ3>s5wRg2e=V?1!r_bfYsGvPAmH(ZT%M527qa;RDNiEhi-5@oq@$5=oHSJF zKN*WY$-o4P(n-18^z?L2x{yPV@m#({BH{7`T!Da1BiQ;3oYETDxZY(-L5b)g64g;C zfdeK*Z7h*W$v`^Ok0oHbX<1x9*(SPST!U7}<#TwZlBR%a_5VXLY#ObnLXl7T{->~B zlc7Vnp@^PHB_VonaW1A%I;nz0v=l*V2qJl^iy;XFMd%X<9iUJE?%^m76Y2Uj6L7U! zs>1b@7Kad(QU=lj92AA6>%;=SP$&_Lyd=JSzMoJclnecp3NMjT!Bcw46;oU#0i|LH zPEB#)Ph822T$2+p9UWPTkZ2kL`;!C)OjImIXU@fIM!iWcJaaDVX5@0|WVoie{%g)t zSG0Ld+iBO*hiTs-ZBd(zMD7imx{_o1IW7#Z)S{)T z=6Sd4v+V6WUzh%kov>9mbqUs6T{vnp+pK9(&b3WIWuxkYuft+Dw>sY(_n%^z51u?N zKfKo|#0`qzYAT|$}JvcuNjBiEdR zAysbWrOWQJ4Fj8{9VI`LLx0s}kGG%hi(2^2Y+*_x^}NvX=gT+c|nD@ zZV7jWZ><+xvQDx(FxS%cI0$hJan<}5C% z>$RO>R_v@=cI#r-^>h0hM?@zAZZu_{*|Ax1o;|?OYZw`wZHF*U kbzSE1amOG3C}UVK_IZD<>19KR%My4Kd6BCD0nJzjArTXJ`KX__->mgJHqU`ogW3;WXD<(?!*cQ3oU zHfdIjl}#NhTBeSD(hrLJA{PDN(6Sd?Mz?Qc$eex>?s?(& z`~Ba3+^O{VSby&my%>h|ClhQ2t+@Gax1;Z#wI+v_K_iwk4k`ts%xMq{3knZGQsRm* z136*l*bNxKFxyjNHfQ8g&og;Na&jidS&>x4#;`!BqH_63XaF7-ML9^UE?p*oCglX<^DghoN2!XN<&8XTxdM`fL<1c^;u2JOvjk^q|!V=_oQ zNGg{~gQ%iG;B|T(d5ZP`pWjJ)Y0n6~AGj#mO;T=>b~|VnL-`rn3$`8tMbm@=lVRgq zvCt__eE(Be&(5fj%s^e4 z((-6fx}E!V(^ilt%Kk;#?xSQM}1>3#T8 z@Q=pq+Ua)|KbgC8qVLYb_4f}1cE5Vr+Ss%3Q2ncGyT0A19^Y~O_X9rc$>l2xzs}zO zr7;GUehXb~es(_e_Qk)}R|i5jn*(#}KU~A25Z!hluvGMxQ?)#Qw-S|ZM`!nRWTc6*&yS|(dr|sJ* Y?1QU9W8|doUGsO6jE%D&MvlDnH$r=y7ytkO literal 0 HcmV?d00001 diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaModuleSourceRootEditHandler.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaModuleSourceRootEditHandler.java index c1ee9c03ad34..b95101316900 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaModuleSourceRootEditHandler.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaModuleSourceRootEditHandler.java @@ -22,7 +22,6 @@ import com.intellij.ui.DarculaColors; import com.intellij.ui.JBColor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.model.java.JavaSourceRootProperties; import org.jetbrains.jps.model.java.JavaSourceRootType; import javax.swing.*; @@ -60,8 +59,8 @@ public class JavaModuleSourceRootEditHandler extends JavaSourceRootEditHandlerBa @NotNull @Override - public Icon getRootIcon(@NotNull JavaSourceRootProperties properties) { - return properties.isForGeneratedSources() ? AllIcons.Modules.GeneratedSourceRoot : AllIcons.Modules.SourceRoot; + protected Icon getGeneratedRootIcon() { + return AllIcons.Modules.GeneratedSourceRoot; } @Nullable diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaSourceRootEditHandlerBase.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaSourceRootEditHandlerBase.java index 7b3f5879e867..c3042f7d1358 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaSourceRootEditHandlerBase.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaSourceRootEditHandlerBase.java @@ -39,6 +39,15 @@ public abstract class JavaSourceRootEditHandlerBase extends ModuleSourceRootEdit super(rootType); } + @NotNull + @Override + public Icon getRootIcon(@NotNull JavaSourceRootProperties properties) { + return properties.isForGeneratedSources() ? getGeneratedRootIcon() : getRootIcon(); + } + + @NotNull + protected abstract Icon getGeneratedRootIcon(); + @Nullable @Override public String getPropertiesString(@NotNull JavaSourceRootProperties properties) { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaTestSourceRootEditHandler.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaTestSourceRootEditHandler.java index 2cdcbc42de55..569a63b6e31c 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaTestSourceRootEditHandler.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/JavaTestSourceRootEditHandler.java @@ -38,7 +38,6 @@ public class JavaTestSourceRootEditHandler extends JavaSourceRootEditHandlerBase super(JavaSourceRootType.TEST_SOURCE); } - @NotNull @Override public String getRootTypeName() { @@ -57,6 +56,12 @@ public class JavaTestSourceRootEditHandler extends JavaSourceRootEditHandlerBase return AllIcons.Modules.TestRoot; } + @NotNull + @Override + protected Icon getGeneratedRootIcon() { + return AllIcons.Modules.GeneratedTestRoot; + } + @Nullable @Override public Icon getFolderUnderRootIcon() { diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index bfe93a893ddc..35f60dfd8035 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -346,7 +346,7 @@ public class AllIcons { public static final Icon AutoscrollFromSource = IconLoader.getIcon("/general/autoscrollFromSource.png"); // 16x16 public static final Icon AutoscrollToSource = IconLoader.getIcon("/general/autoscrollToSource.png"); // 16x16 public static final Icon Balloon = IconLoader.getIcon("/general/balloon.png"); // 16x16 - public static final Icon BalloonClose = IconLoader.getIcon("/general/balloonClose.png"); // 30x30 + public static final Icon BalloonClose = IconLoader.getIcon("/general/balloonClose.png"); // 32x32 public static final Icon BalloonError = IconLoader.getIcon("/general/balloonError.png"); // 16x16 public static final Icon BalloonInformation = IconLoader.getIcon("/general/balloonInformation.png"); // 16x16 public static final Icon BalloonWarning = IconLoader.getIcon("/general/balloonWarning.png"); // 16x16 @@ -690,6 +690,7 @@ public class AllIcons { public static final Icon Edit = IconLoader.getIcon("/modules/edit.png"); // 14x14 public static final Icon ExcludeRoot = IconLoader.getIcon("/modules/excludeRoot.png"); // 16x16 public static final Icon GeneratedSourceRoot = IconLoader.getIcon("/modules/generatedSourceRoot.png"); // 16x16 + public static final Icon GeneratedTestRoot = IconLoader.getIcon("/modules/generatedTestRoot.png"); // 16x16 public static final Icon Library = IconLoader.getIcon("/modules/library.png"); // 16x16 public static final Icon Merge = IconLoader.getIcon("/modules/merge.png"); // 16x16 public static final Icon ModulesNode = IconLoader.getIcon("/modules/modulesNode.png"); // 16x16