diff --git a/platform/icons/src/modules/generatedTestRoot.png b/platform/icons/src/modules/generatedTestRoot.png new file mode 100644 index 000000000000..114f685c9d6b Binary files /dev/null and b/platform/icons/src/modules/generatedTestRoot.png differ diff --git a/platform/icons/src/modules/generatedTestRoot@2x.png b/platform/icons/src/modules/generatedTestRoot@2x.png new file mode 100644 index 000000000000..1c08e64a7e65 Binary files /dev/null and b/platform/icons/src/modules/generatedTestRoot@2x.png differ 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 000000000000..818a6b328370 Binary files /dev/null and b/platform/icons/src/modules/generatedTestRoot@2x_dark.png differ diff --git a/platform/icons/src/modules/generatedTestRoot_dark.png b/platform/icons/src/modules/generatedTestRoot_dark.png new file mode 100644 index 000000000000..3485f89f6d27 Binary files /dev/null and b/platform/icons/src/modules/generatedTestRoot_dark.png differ 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