diff --git a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java index 156fcfe73444..e74469f13c9d 100644 --- a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java +++ b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java @@ -15,6 +15,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import org.intellij.lang.annotations.JdkConstants; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -83,8 +84,12 @@ public class KeymapUtil { return s; } + /** + * @deprecated icons are not applicable for our user interface and will be removed + */ @NotNull @Deprecated + @ApiStatus.ScheduledForRemoval(inVersion = "2020.1") public static Icon getShortcutIcon(@NotNull Shortcut shortcut) { if (shortcut instanceof KeyboardShortcut) { return AllIcons.General.KeyboardShortcut; diff --git a/platform/platform-api/src/com/intellij/ui/AnimatedIcon.java b/platform/platform-api/src/com/intellij/ui/AnimatedIcon.java index 91ece55d0a07..5d2152780437 100644 --- a/platform/platform-api/src/com/intellij/ui/AnimatedIcon.java +++ b/platform/platform-api/src/com/intellij/ui/AnimatedIcon.java @@ -94,7 +94,11 @@ public class AnimatedIcon implements Icon { AllIcons.Ide.Macro.Recording_4); } + /** + * @deprecated icons are not applicable for our user interface and will be removed + */ @Deprecated + @ApiStatus.ScheduledForRemoval(inVersion = "2020.1") public static class Grey extends AnimatedIcon { public Grey() { super(DELAY, ICONS.toArray(new Icon[0])); diff --git a/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java b/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java index e20300700740..ed30d4e15ddd 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java @@ -39,8 +39,10 @@ public class JBScrollPane extends JScrollPane { * * @see UIUtil#putClientProperty(JComponent, Key, Object) * @see UIUtil#isUnderDarcula + * @deprecated unsupported approach to control a scroll bar painting */ @Deprecated + @ApiStatus.ScheduledForRemoval(inVersion = "2020.2") public static final Key BRIGHTNESS_FROM_VIEW = Key.create("JB_SCROLL_PANE_BRIGHTNESS_FROM_VIEW"); /** @@ -236,7 +238,11 @@ public class JBScrollPane extends JScrollPane { return new JBViewport(); } + /** + * @deprecated unsupported old implementation + */ @Deprecated + @ApiStatus.ScheduledForRemoval(inVersion = "2020.2") protected boolean isOverlaidScrollbar(@Nullable JScrollBar scrollbar) { ScrollBarUI vsbUI = scrollbar == null ? null : scrollbar.getUI(); return vsbUI instanceof ButtonlessScrollBarUI && !((ButtonlessScrollBarUI)vsbUI).alwaysShowTrack(); diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTree.java b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTree.java index 7ce9f1901e50..a571e057bd00 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTree.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTree.java @@ -15,6 +15,7 @@ import com.intellij.ui.TreeUIHelper; import com.intellij.util.ui.EmptyIcon; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -556,14 +557,22 @@ public class SimpleTree extends Tree implements CellEditorListener { myEmptyHandle = null; } + /** + * @deprecated old way to configure tree icons + */ @Deprecated + @ApiStatus.ScheduledForRemoval(inVersion = "2020.3") public Icon getHandleIcon(DefaultMutableTreeNode node, TreePath path) { if (node.getChildCount() == 0) return getEmptyHandle(); return isExpanded(path) ? getExpandedHandle() : getCollapsedHandle(); } + /** + * @deprecated use UIUtil.getTreeExpandedIcon(...) instead + */ @Deprecated + @ApiStatus.ScheduledForRemoval(inVersion = "2020.3") public Icon getExpandedHandle() { if (myExpandedHandle == null) { myExpandedHandle = UIUtil.getTreeExpandedIcon(); @@ -571,7 +580,11 @@ public class SimpleTree extends Tree implements CellEditorListener { return myExpandedHandle; } + /** + * @deprecated use UIUtil.getTreeCollapsedIcon(...) instead + */ @Deprecated + @ApiStatus.ScheduledForRemoval(inVersion = "2020.3") public Icon getCollapsedHandle() { if (myCollapsedHandle == null) { myCollapsedHandle = UIUtil.getTreeCollapsedIcon(); @@ -579,7 +592,11 @@ public class SimpleTree extends Tree implements CellEditorListener { return myCollapsedHandle; } + /** + * @deprecated use EmptyIcon.create(...) instead + */ @Deprecated + @ApiStatus.ScheduledForRemoval(inVersion = "2020.3") public Icon getEmptyHandle() { if (myEmptyHandle == null) { final Icon expand = getExpandedHandle(); diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurablesGroupBase.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurablesGroupBase.java index 9115cf814ac2..9c9f3c574890 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurablesGroupBase.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurablesGroupBase.java @@ -6,13 +6,16 @@ import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurableEP; import com.intellij.openapi.options.ConfigurableGroup; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * @author nik + * @deprecated needed for IdeConfigurablesGroup */ @Deprecated +@ApiStatus.ScheduledForRemoval(inVersion = "2020.2") abstract class ConfigurablesGroupBase implements ConfigurableGroup { private Configurable[] myChildren; private final ExtensionPointName> myConfigurablesExtensionPoint; diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/IdeConfigurablesGroup.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/IdeConfigurablesGroup.java index 8f0958d579f3..458d02d71b60 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/IdeConfigurablesGroup.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/IdeConfigurablesGroup.java @@ -4,11 +4,13 @@ package com.intellij.openapi.options.ex; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurableGroup; import com.intellij.openapi.options.OptionsBundle; +import org.jetbrains.annotations.ApiStatus; /** * @deprecated ShowSettingsUtilImpl#getConfigurableGroups(null, true) */ @Deprecated +@ApiStatus.ScheduledForRemoval(inVersion = "2020.2") public class IdeConfigurablesGroup extends ConfigurablesGroupBase implements ConfigurableGroup { public IdeConfigurablesGroup() { super(Configurable.APPLICATION_CONFIGURABLE);