From 054bb2ae01cafd44cd70e109db18a1c95732e568 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 18 Oct 2016 15:05:56 +0300 Subject: [PATCH] ui: remove SwitchManager API - QuickAccessProvider * QuickAccessProvider - used in 'Cursive' plugin --- .../openapi/actionSystem/ActionToolbar.java | 4 +--- .../ui/switcher/QuickAccessProvider.java | 1 + .../ui/switcher/QuickActionProvider.java | 2 +- .../ui/layout/impl/RunnerContentUi.java | 18 +----------------- .../ide/projectView/impl/ProjectViewImpl.java | 6 ------ .../openapi/ui/SimpleToolWindowPanel.java | 4 ---- .../src/com/intellij/ui/tabs/JBTabs.java | 4 +--- .../com/intellij/ui/tabs/impl/JBTabsImpl.java | 5 ----- .../actionSystem/impl/ActionToolbarImpl.java | 5 ----- .../wm/impl/content/ToolWindowContentUi.java | 7 +------ .../ui/content/impl/ContentManagerImpl.java | 15 +-------------- 11 files changed, 7 insertions(+), 64 deletions(-) diff --git a/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/ActionToolbar.java b/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/ActionToolbar.java index e3b481235980..a6b52e14d880 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/ActionToolbar.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/ActionToolbar.java @@ -15,7 +15,6 @@ */ package com.intellij.openapi.actionSystem; -import com.intellij.ui.switcher.QuickAccessProvider; import com.intellij.ui.switcher.QuickActionProvider; import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.NotNull; @@ -28,7 +27,7 @@ import java.awt.*; * * @see ActionManager#createActionToolbar(String, ActionGroup, boolean) */ -public interface ActionToolbar extends QuickAccessProvider, QuickActionProvider { +public interface ActionToolbar extends QuickActionProvider { String ACTION_TOOLBAR_PROPERTY_KEY = "ACTION_TOOLBAR"; /** @@ -55,7 +54,6 @@ public interface ActionToolbar extends QuickAccessProvider, QuickActionProvider /** * @return component which represents the tool bar on UI */ - @Override JComponent getComponent(); /** diff --git a/platform/editor-ui-api/src/com/intellij/ui/switcher/QuickAccessProvider.java b/platform/editor-ui-api/src/com/intellij/ui/switcher/QuickAccessProvider.java index cc88b950eb51..79248e91cc83 100644 --- a/platform/editor-ui-api/src/com/intellij/ui/switcher/QuickAccessProvider.java +++ b/platform/editor-ui-api/src/com/intellij/ui/switcher/QuickAccessProvider.java @@ -17,6 +17,7 @@ package com.intellij.ui.switcher; import javax.swing.*; +@Deprecated public interface QuickAccessProvider { JComponent getComponent(); diff --git a/platform/editor-ui-api/src/com/intellij/ui/switcher/QuickActionProvider.java b/platform/editor-ui-api/src/com/intellij/ui/switcher/QuickActionProvider.java index a41abe4bc1ca..9208566d2575 100644 --- a/platform/editor-ui-api/src/com/intellij/ui/switcher/QuickActionProvider.java +++ b/platform/editor-ui-api/src/com/intellij/ui/switcher/QuickActionProvider.java @@ -20,7 +20,7 @@ import com.intellij.openapi.actionSystem.DataKey; import java.util.List; -public interface QuickActionProvider extends QuickAccessProvider { +public interface QuickActionProvider { DataKey KEY = DataKey.create("QuickActionProvider"); diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java index 17d39e19740f..9e85c4562fbf 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java @@ -47,7 +47,6 @@ import com.intellij.ui.docking.DockManager; import com.intellij.ui.docking.DockableContent; import com.intellij.ui.docking.DragSession; import com.intellij.ui.docking.impl.DockManagerImpl; -import com.intellij.ui.switcher.QuickAccessProvider; import com.intellij.ui.switcher.QuickActionProvider; import com.intellij.ui.tabs.JBTabs; import com.intellij.ui.tabs.TabInfo; @@ -78,7 +77,7 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.stream.Collectors; public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Facade, ViewContextEx, PropertyChangeListener, - QuickAccessProvider, QuickActionProvider, DockContainer.Dialog { + QuickActionProvider, DockContainer.Dialog { public static final DataKey KEY = DataKey.create("DebuggerContentUI"); public static final Key LIGHTWEIGHT_CONTENT_MARKER = Key.create("LightweightContent"); @@ -621,11 +620,6 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac return myOriginal != null; } - @Override - public boolean isCycleRoot() { - return false; - } - @Override public void setManager(@NotNull final ContentManager manager) { assert myManager == null; @@ -1406,16 +1400,6 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac return RunnerContentUi.this.getActions(originalProvider); } - @Override - public JComponent getComponent() { - return RunnerContentUi.this.getComponent(); - } - - @Override - public boolean isCycleRoot() { - return RunnerContentUi.this.isCycleRoot(); - } - @Override public void addNotify() { super.addNotify(); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index b5b930606efb..5b96f07eb991 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -338,11 +338,6 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo } } - @Override - public boolean isCycleRoot() { - return false; - } - @Override public synchronized void addProjectPane(@NotNull final AbstractProjectViewPane pane) { myUninitializedPanes.add(pane); @@ -771,7 +766,6 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo myConnection.disconnect(); } - @Override public JComponent getComponent() { return myDataProvider; } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java index 0ae404f593a2..728e839ff77d 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java @@ -116,10 +116,6 @@ public class SimpleToolWindowPanel extends JPanel implements QuickActionProvider return this; } - public boolean isCycleRoot() { - return false; - } - public void setContent(JComponent c) { myContent = c; add(c, BorderLayout.CENTER); diff --git a/platform/platform-api/src/com/intellij/ui/tabs/JBTabs.java b/platform/platform-api/src/com/intellij/ui/tabs/JBTabs.java index 8d815bfd5aeb..815ba0baf019 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/JBTabs.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/JBTabs.java @@ -20,7 +20,6 @@ import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.util.ActiveRunnable; import com.intellij.ui.awt.RelativePoint; -import com.intellij.ui.switcher.QuickAccessProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,7 +28,7 @@ import java.awt.*; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -public interface JBTabs extends QuickAccessProvider { +public interface JBTabs { @NotNull TabInfo addTab(TabInfo info, int index); @@ -72,7 +71,6 @@ public interface JBTabs extends QuickAccessProvider { JBTabs setSelectionChangeHandler(SelectionChangeHandler handler); - @Override @NotNull JComponent getComponent(); diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java index 4e26296049cf..4e86c65d5311 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java @@ -2688,11 +2688,6 @@ public class JBTabsImpl extends JComponent return this; } - @Override - public boolean isCycleRoot() { - return false; - } - private void addListeners() { for (TabInfo eachInfo : myVisibleInfos) { final TabLabel label = myInfo2Label.get(eachInfo); diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java index 2101c0363d5a..4d9709cbe9e6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java @@ -1227,11 +1227,6 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar { mySecondaryActions.getTemplatePresentation().setDescription(secondaryActionsTooltip); } - @Override - public boolean isCycleRoot() { - return false; - } - @Override public List getActions(boolean originalProvider) { ArrayList result = new ArrayList<>(); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java index 258b2ad23df5..ea0a2be5580b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java @@ -36,7 +36,6 @@ import com.intellij.ui.PopupHandler; import com.intellij.ui.content.*; import com.intellij.ui.content.tabs.PinToolwindowTabAction; import com.intellij.ui.content.tabs.TabbedContentAction; -import com.intellij.ui.switcher.QuickAccessProvider; import com.intellij.util.Alarm; import com.intellij.util.ContentUtilEx; import com.intellij.util.containers.ContainerUtil; @@ -56,7 +55,7 @@ import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; -public class ToolWindowContentUi extends JPanel implements ContentUI, PropertyChangeListener, DataProvider, QuickAccessProvider { +public class ToolWindowContentUi extends JPanel implements ContentUI, PropertyChangeListener, DataProvider { public static final String POPUP_PLACE = "ToolwindowPopup"; // when client property is put in toolwindow component, hides toolwindow label public static final String HIDE_ID_LABEL = "HideIdLabel"; @@ -113,10 +112,6 @@ public class ToolWindowContentUi extends JPanel implements ContentUI, PropertyCh return myContent; } - public boolean isCycleRoot() { - return true; - } - public JComponent getTabComponent() { return this; } diff --git a/platform/platform-impl/src/com/intellij/ui/content/impl/ContentManagerImpl.java b/platform/platform-impl/src/com/intellij/ui/content/impl/ContentManagerImpl.java index 49c8436a3261..847d3cf1e8d4 100644 --- a/platform/platform-impl/src/com/intellij/ui/content/impl/ContentManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/content/impl/ContentManagerImpl.java @@ -30,7 +30,6 @@ import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy; import com.intellij.ui.components.panels.NonOpaquePanel; import com.intellij.ui.content.*; -import com.intellij.ui.switcher.QuickAccessProvider; import com.intellij.util.EventDispatcher; import com.intellij.util.SmartList; import com.intellij.util.ui.UIUtil; @@ -95,7 +94,7 @@ public class ContentManagerImpl implements ContentManager, PropertyChangeListene if (myComponent == null) { myComponent = new MyNonOpaquePanel(); - MyContentComponent contentComponent = new MyContentComponent(); + NonOpaquePanel contentComponent = new NonOpaquePanel(); contentComponent.setContent(myUI.getComponent()); contentComponent.setFocusCycleRoot(true); @@ -141,18 +140,6 @@ public class ContentManagerImpl implements ContentManager, PropertyChangeListene } } - private class MyContentComponent extends NonOpaquePanel implements QuickAccessProvider { - @Override - public JComponent getComponent() { - return myUI instanceof QuickAccessProvider ? myUI.getComponent() : this; - } - - @Override - public boolean isCycleRoot() { - return myUI instanceof QuickAccessProvider && ((QuickAccessProvider)myUI).isCycleRoot(); - } - } - @Override public void addContent(@NotNull Content content, final int order) { doAddContent(content, order);