diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemNode.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemNode.java index 018031819efd..66fbd5804c97 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemNode.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemNode.java @@ -35,7 +35,7 @@ import java.util.function.Function; /** * @author Vladislav.Soroka */ -public abstract class ExternalSystemNode extends SimpleNode implements Comparable> { +public abstract class ExternalSystemNode extends SimpleNode implements Comparable> { static final int BUILTIN_TASKS_DATA_NODE_ORDER = 10; static final int BUILTIN_DEPENDENCIES_DATA_NODE_ORDER = BUILTIN_TASKS_DATA_NODE_ORDER + 10; @@ -407,7 +407,7 @@ public abstract class ExternalSystemNode extends SimpleNode implements Compar } @Override - public int compareTo(@NotNull ExternalSystemNode node) { + public int compareTo(@NotNull ExternalSystemNode node) { return StringUtil.compare(this.getName(), node.getName(), true); } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemViewDefaultContributor.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemViewDefaultContributor.java index 943c612742d7..77586d936fc5 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemViewDefaultContributor.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalSystemViewDefaultContributor.java @@ -422,7 +422,7 @@ final class ExternalSystemViewDefaultContributor extends ExternalSystemViewContr } @Override - public int compareTo(@NotNull ExternalSystemNode node) { + public int compareTo(@NotNull ExternalSystemNode node) { final T myData = getData(); final Object thatData = node.getData(); if (myData instanceof OrderAware && thatData instanceof OrderAware) { diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java index f247caf40ed7..5399ee57db9b 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java @@ -80,7 +80,7 @@ public class ModuleNode extends ExternalSystemNode { } @Override - public int compareTo(@NotNull ExternalSystemNode node) { + public int compareTo(@NotNull ExternalSystemNode node) { return myIsRoot ? -1 : (node instanceof ModuleNode && ((ModuleNode)node).myIsRoot) ? 1 : super.compareTo(node); } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java index e41bc454e67d..b78606f34848 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java @@ -80,7 +80,7 @@ public class TasksNode extends ExternalSystemNode { } @Override - public int compareTo(@NotNull ExternalSystemNode node) { + public int compareTo(@NotNull ExternalSystemNode node) { return "other".equals(group) ? 1 : super.compareTo(node); } };