diff --git a/platform/usageView-impl/api-dump.txt b/platform/usageView-impl/api-dump.txt index 373a96263b35..0dd9ead28ab5 100644 --- a/platform/usageView-impl/api-dump.txt +++ b/platform/usageView-impl/api-dump.txt @@ -142,7 +142,6 @@ c:com.intellij.usages.impl.UsageViewImpl - p:isPreviewUsageActionEnabled():Z - isSearchInProgress():Z - isVisible(com.intellij.usages.Usage):Z -- ps:moveActionTo(java.util.List,java.lang.String,java.lang.String,Z):V - refreshUsages():V - removeUsage(com.intellij.usages.Usage):V - removeUsagesBulk(java.util.Collection):V diff --git a/platform/usageView-impl/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView-impl/src/com/intellij/usages/impl/UsageViewImpl.java index ed28567280fa..b4768ccacecc 100644 --- a/platform/usageView-impl/src/com/intellij/usages/impl/UsageViewImpl.java +++ b/platform/usageView-impl/src/com/intellij/usages/impl/UsageViewImpl.java @@ -571,7 +571,8 @@ public class UsageViewImpl implements UsageViewEx { continue; } synchronized (childNode) { - List swingChildren = ((GroupNode)parentNode).getSwingChildren(); + GroupNode parentGroupNode = (GroupNode)parentNode; + List swingChildren = parentGroupNode.getSwingChildren(); boolean contains = swingChildren.contains(childNode); if (!contains) { nodesToFire.add(childNode); @@ -581,7 +582,7 @@ public class UsageViewImpl implements UsageViewEx { indicesToFire.add(swingChildren.indexOf(change.childNode)); if (childNode instanceof UsageNode) { - ((GroupNode)parentNode).incrementUsageCount(1); + parentGroupNode.incrementUsageCount(1); } } } @@ -617,11 +618,6 @@ public class UsageViewImpl implements UsageViewEx { } } - private int getVisibleRowCount() { - ThreadingAssertions.assertEventDispatchThread(); - return TreeUtil.getVisibleRowCount(myTree); - } - private void setupCentralPanel() { ThreadingAssertions.assertEventDispatchThread(); @@ -974,14 +970,14 @@ public class UsageViewImpl implements UsageViewEx { } sortGroupingActions(list); moveActionTo(list, UsageViewBundle.message("action.group.by.module"), - UsageViewBundle.message("action.flatten.modules"), true); + UsageViewBundle.message("action.flatten.modules")); return list.toArray(AnAction.EMPTY_ARRAY); } + @ApiStatus.Internal protected static void moveActionTo(@NotNull List list, @NotNull String actionText, - @NotNull String targetActionText, - boolean before) { + @NotNull String targetActionText) { if (Objects.equals(actionText, targetActionText)) { return; } @@ -995,7 +991,7 @@ public class UsageViewImpl implements UsageViewEx { if (actionIndex != -1 && targetIndex != -1) { if (actionIndex < targetIndex) targetIndex--; AnAction anAction = list.remove(actionIndex); - list.add(before ? targetIndex : targetIndex + 1, anAction); + list.add(targetIndex, anAction); return; } }