From 37fa35d8f0d191ee64f8d06f1aedf79dee8e6271 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Thu, 30 Jan 2020 02:07:11 +0300 Subject: [PATCH] Use interface ComponentWithExpandableItems instead of concrete class GitOrigin-RevId: 5d848c6ccd73a160dd6dd89271dcf0858a6f027f --- .../src/com/intellij/ui/tree/ui/DefaultTreeUI.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/tree/ui/DefaultTreeUI.java b/platform/platform-impl/src/com/intellij/ui/tree/ui/DefaultTreeUI.java index a65b2ad770bb..28b1fe17da4e 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/ui/DefaultTreeUI.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/ui/DefaultTreeUI.java @@ -9,10 +9,10 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.BackgroundSupplier; import com.intellij.ui.ComponentUtil; +import com.intellij.ui.ComponentWithExpandableItems; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.tree.AsyncTreeModel; import com.intellij.ui.tree.TreePathBackgroundSupplier; -import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ui.MouseEventAdapter; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; @@ -109,10 +109,11 @@ public final class DefaultTreeUI extends BasicTreeUI { } private static int getExpandedRow(@NotNull JTree tree) { - if (tree instanceof Tree) { - Tree custom = (Tree)tree; - Collection items = custom.getExpandableItemsHandler().getExpandedItems(); - if (!items.isEmpty()) return items.iterator().next(); + if (tree instanceof ComponentWithExpandableItems) { + ComponentWithExpandableItems component = (ComponentWithExpandableItems)tree; + Collection items = component.getExpandableItemsHandler().getExpandedItems(); + Object item = items.isEmpty() ? null : items.iterator().next(); + if (item instanceof Integer) return (Integer)item; } return -1; }