From 7bf080971e2994f2e661a99de5b752740632e81c Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Mon, 14 Jan 2019 14:45:37 +0300 Subject: [PATCH] Gradle: expose the method to provide the node display name for the ES projects view IDEA-205334 --- .../openapi/externalSystem/view/ExternalProjectsView.java | 3 +++ .../externalSystem/view/ExternalProjectsViewAdapter.java | 5 +++++ .../externalSystem/view/ExternalProjectsViewImpl.java | 3 ++- .../openapi/externalSystem/view/ExternalSystemNode.java | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsView.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsView.java index 7deded34a8a8..4cfba9a2ac5e 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsView.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsView.java @@ -62,6 +62,9 @@ public interface ExternalProjectsView { boolean getShowIgnored(); + @Nullable + String getDisplayName(@Nullable DataNode node); + interface Listener { void onDoubleClickOrEnter(@NotNull ExternalSystemNode node, InputEvent inputEvent); } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewAdapter.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewAdapter.java index 9f348978449e..364eea4da583 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewAdapter.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewAdapter.java @@ -115,4 +115,9 @@ public class ExternalProjectsViewAdapter implements ExternalProjectsView { public boolean getShowIgnored() { return delegate.getShowIgnored(); } + + @Override + public String getDisplayName(DataNode node) { + return delegate.getDisplayName(node); + } } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewImpl.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewImpl.java index ca502a1c07b0..16530901dd63 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewImpl.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewImpl.java @@ -492,8 +492,9 @@ public class ExternalProjectsViewImpl extends SimpleToolWindowPanel implements D } } + @Override @Nullable - String getDisplayName(@Nullable DataNode node) { + public String getDisplayName(@Nullable DataNode node) { if (node == null) return null; return myViewContributors.stream() .map(contributor -> contributor.getDisplayName(node)) 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 ad0b3cbbfa99..56ee5238a400 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 @@ -118,7 +118,7 @@ public abstract class ExternalSystemNode extends SimpleNode implements Compar @Override public String getName() { - String displayName = ((ExternalProjectsViewImpl)getExternalProjectsView()).getDisplayName(myDataNode); + String displayName = getExternalProjectsView().getDisplayName(myDataNode); return displayName == null ? super.getName() : displayName; }