From eeeea6a05b97753bf9a0b252be651f204cc1cd52 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Fri, 30 Aug 2024 18:38:29 +0200 Subject: [PATCH] IJPL-797 `intellij.platform.ide` review internal API GitOrigin-RevId: 05daf200d707f00529fe4805dce398de86e2d5a5 --- platform/platform-api/api-dump-unreviewed.txt | 19 +++---------------- platform/platform-api/exposed-private-api.txt | 7 ------- .../ColoredOutputTypeRegistryImpl.java | 4 ++-- .../intellij/openapi/ui/DialogBuilder.java | 8 ++++---- .../ui/ReorderableListController.java | 4 ++-- .../intellij/ui/components/JBScrollPane.java | 2 +- .../ui/messager/CalloutComponent.java | 4 ++-- .../ToolWindowContentExtractor.java | 6 +++--- .../ToolWindowViewModelExtractor.java | 6 +++--- .../intellij/util/animation/JBAnimator.java | 3 ++- 10 files changed, 22 insertions(+), 41 deletions(-) delete mode 100644 platform/platform-api/exposed-private-api.txt diff --git a/platform/platform-api/api-dump-unreviewed.txt b/platform/platform-api/api-dump-unreviewed.txt index 4c1ba14ec48d..53d29e4a1d3e 100644 --- a/platform/platform-api/api-dump-unreviewed.txt +++ b/platform/platform-api/api-dump-unreviewed.txt @@ -96,7 +96,6 @@ pc:com.intellij.execution.process.CapturingAnsiEscapesAwareProcessHandler$AnsiEs f:com.intellij.execution.process.ColoredOutputTypeRegistryImpl - ():V - s:getAnsiColorKey(I):com.intellij.openapi.editor.colors.TextAttributesKey -- getOutputType(com.intellij.execution.process.AnsiTerminalEmulator,com.intellij.openapi.util.Key):com.intellij.execution.process.ProcessOutputType - getOutputType(java.lang.String,com.intellij.openapi.util.Key):com.intellij.execution.process.ProcessOutputType f:com.intellij.execution.process.ConsoleHighlighter - sf:BLACK:com.intellij.openapi.editor.colors.TextAttributesKey @@ -3813,7 +3812,6 @@ c:com.intellij.openapi.ui.DialogBuilder$CancelActionDescriptor - p:myText:java.lang.String - ():V - getAction(com.intellij.openapi.ui.DialogWrapper):javax.swing.Action -- p:getBuiltinAction(com.intellij.openapi.ui.DialogBuilder$MyDialogWrapper):javax.swing.Action - setText(java.lang.String):V c:com.intellij.openapi.ui.DialogBuilder$CloseDialogAction - com.intellij.openapi.ui.DialogBuilder$DialogActionDescriptor @@ -3839,7 +3837,6 @@ c:com.intellij.openapi.ui.DialogBuilder$OkActionDescriptor - p:myText:java.lang.String - ():V - getAction(com.intellij.openapi.ui.DialogWrapper):javax.swing.Action -- p:getBuiltinAction(com.intellij.openapi.ui.DialogBuilder$MyDialogWrapper):javax.swing.Action - setText(java.lang.String):V f:com.intellij.openapi.ui.DialogEarthquakeShaker - s:shake(java.awt.Window):V @@ -7325,7 +7322,6 @@ a:com.intellij.ui.ReorderableListController$CustomActionDescription - setShowText(Z):V pc:com.intellij.ui.ReorderableListController$CustomActionDescription$BaseAction - com.intellij.openapi.project.DumbAwareAction -- (com.intellij.ui.ReorderableListController$CustomActionDescription,java.lang.String,java.lang.String,javax.swing.Icon,com.intellij.ui.ReorderableListController$ActionBehaviour):V - actionPerformed(com.intellij.openapi.actionSystem.AnActionEvent):V - getActionUpdateThread():com.intellij.openapi.actionSystem.ActionUpdateThread - update(com.intellij.openapi.actionSystem.AnActionEvent):V @@ -8432,6 +8428,9 @@ c:com.intellij.ui.components.JBScrollPane$Layout - layoutContainer(java.awt.Container):V - preferredLayoutSize(java.awt.Container):java.awt.Dimension - syncWithScrollPane(javax.swing.JScrollPane):V +c:com.intellij.ui.components.JBScrollPane$ViewportBorder +- javax.swing.border.LineBorder +- paintBorder(java.awt.Component,java.awt.Graphics,I,I,I,I):V c:com.intellij.ui.components.JBSlider - javax.swing.JSlider - ():V @@ -10023,7 +10022,6 @@ f:com.intellij.ui.messager.Callout - s:showText(javax.swing.JTree,javax.swing.tree.TreePath,I,java.lang.String):V - s:showTextBelow(javax.swing.JComponent,java.lang.String):V c:com.intellij.ui.messager.CalloutComponent -- p:myPointerComponent:com.intellij.ui.messager.CalloutComponent$Pointer - p:myTargetComponent:javax.swing.JComponent - p:myTargetWindow:java.awt.Window - (javax.swing.JComponent):V @@ -11547,12 +11545,6 @@ c:com.intellij.ui.treeStructure.treetable.TreeTableTree - setTreeTableTreeBorder(javax.swing.border.Border):V - setVisibleRow(I):V - updateUI():V -*:com.intellij.ui.viewModel.extraction.ToolWindowContentExtractor -- sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName -- sf:FILE_VISIBLE_FOR_REMOTE_CLIENTS:com.intellij.openapi.util.Key -- sf:SYNC_TAB_TO_REMOTE_CLIENTS:com.intellij.openapi.util.Key -- a:isApplicable(com.intellij.ui.content.Content,com.intellij.openapi.client.ClientProjectSession):Z -- a:syncContentToRemoteClient(com.intellij.ui.content.Content):Z *c:com.intellij.ui.viewModel.extraction.ToolWindowExtractorEP - sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName - id:java.lang.String @@ -11573,10 +11565,6 @@ c:com.intellij.ui.treeStructure.treetable.TreeTableTree - isUnsupported():Z - s:valueOf(java.lang.String):com.intellij.ui.viewModel.extraction.ToolWindowExtractorMode - s:values():com.intellij.ui.viewModel.extraction.ToolWindowExtractorMode[] -*:com.intellij.ui.viewModel.extraction.ToolWindowViewModelExtractor -- sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName -- a:getMode():com.intellij.ui.viewModel.extraction.ToolWindowExtractorMode -- a:isApplicable(java.lang.String,com.intellij.openapi.client.ClientProjectSession):Z com.intellij.ui.viewModel.extraction.ToolWindowViewModelListener - sf:TOPIC:com.intellij.util.messages.Topic - a:toolWindowChanged(java.lang.String):V @@ -11752,7 +11740,6 @@ f:com.intellij.util.OpenSourceUtil - dispose():V - getName():java.lang.String - getPeriod():I -- getStatistic():com.intellij.util.animation.JBAnimator$Statistic - getType():com.intellij.util.animation.JBAnimator$Type - ignorePowerSaveMode():com.intellij.util.animation.JBAnimator - isCyclic():Z diff --git a/platform/platform-api/exposed-private-api.txt b/platform/platform-api/exposed-private-api.txt deleted file mode 100644 index e1787355d76b..000000000000 --- a/platform/platform-api/exposed-private-api.txt +++ /dev/null @@ -1,7 +0,0 @@ -com/intellij/execution/process/AnsiTerminalEmulator -com/intellij/openapi/client/ClientProjectSession -com/intellij/openapi/ui/DialogBuilder$MyDialogWrapper -com/intellij/ui/ReorderableListController$ActionBehaviour -com/intellij/ui/components/JBScrollPane$ViewportBorder -com/intellij/ui/messager/CalloutComponent$Pointer -com/intellij/util/animation/JBAnimator$Statistic diff --git a/platform/platform-api/src/com/intellij/execution/process/ColoredOutputTypeRegistryImpl.java b/platform/platform-api/src/com/intellij/execution/process/ColoredOutputTypeRegistryImpl.java index 92885d5e05a6..ca190447df65 100644 --- a/platform/platform-api/src/com/intellij/execution/process/ColoredOutputTypeRegistryImpl.java +++ b/platform/platform-api/src/com/intellij/execution/process/ColoredOutputTypeRegistryImpl.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.execution.process; import com.intellij.execution.ui.ConsoleViewContentType; @@ -110,7 +110,7 @@ public final class ColoredOutputTypeRegistryImpl extends ColoredOutputTypeRegist * later to print to the console */ @Override - public @NotNull ProcessOutputType getOutputType(@NotNull AnsiTerminalEmulator terminal, @NotNull Key streamType) { + @NotNull ProcessOutputType getOutputType(@NotNull AnsiTerminalEmulator terminal, @NotNull Key streamType) { Map attrsToKeyMap = ProcessOutputType.isStdout(streamType) ? myStdoutAttrsToKeyMap : myStderrAttrsToKeyMap; String ansiSerializedState = terminal.getAnsiSerializedSGRState(); ProcessOutputType key = attrsToKeyMap.get(ansiSerializedState); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java index cd568a66c85b..a6f6462739fe 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.ui; import com.intellij.CommonBundle; @@ -323,19 +323,19 @@ public class DialogBuilder implements Disposable { return builtinAction; } - protected abstract Action getBuiltinAction(MyDialogWrapper dialogWrapper); + abstract Action getBuiltinAction(MyDialogWrapper dialogWrapper); } public static class OkActionDescriptor extends BuiltinAction { @Override - protected Action getBuiltinAction(MyDialogWrapper dialogWrapper) { + Action getBuiltinAction(MyDialogWrapper dialogWrapper) { return dialogWrapper.getOKAction(); } } public static class CancelActionDescriptor extends BuiltinAction { @Override - protected Action getBuiltinAction(MyDialogWrapper dialogWrapper) { + Action getBuiltinAction(MyDialogWrapper dialogWrapper) { return dialogWrapper.getCancelAction(); } } diff --git a/platform/platform-api/src/com/intellij/ui/ReorderableListController.java b/platform/platform-api/src/com/intellij/ui/ReorderableListController.java index af6455b617aa..9fb14d66fc56 100644 --- a/platform/platform-api/src/com/intellij/ui/ReorderableListController.java +++ b/platform/platform-api/src/com/intellij/ui/ReorderableListController.java @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ui; import com.intellij.icons.AllIcons; @@ -152,7 +152,7 @@ public abstract class ReorderableListController { private final ActionBehaviour myBehaviour; private final CustomActionDescription myCustomActionDescription; - public BaseAction(final CustomActionDescription customActionDescription, + BaseAction(final CustomActionDescription customActionDescription, final @NlsActions.ActionText String text, final @NlsActions.ActionDescription String description, final Icon icon, final ActionBehaviour behaviour) { super(text, description, icon); myBehaviour = behaviour; 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 b2b99e65f733..dedcff5069a4 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java @@ -415,7 +415,7 @@ public class JBScrollPane extends JScrollPane { } } - private static class ViewportBorder extends LineBorder { + public static class ViewportBorder extends LineBorder { ViewportBorder(int thickness) { super(null, thickness); } diff --git a/platform/platform-api/src/com/intellij/ui/messager/CalloutComponent.java b/platform/platform-api/src/com/intellij/ui/messager/CalloutComponent.java index c285922cc951..fdc77ca964b8 100644 --- a/platform/platform-api/src/com/intellij/ui/messager/CalloutComponent.java +++ b/platform/platform-api/src/com/intellij/ui/messager/CalloutComponent.java @@ -1,4 +1,4 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ui.messager; @@ -35,7 +35,7 @@ public class CalloutComponent { protected JComponent myTargetComponent; protected Window myTargetWindow; - protected Pointer myPointerComponent; + private Pointer myPointerComponent; private final KeyboardFocusManager myKeyboardFocusManager; public CalloutComponent(JComponent component) { diff --git a/platform/platform-api/src/com/intellij/ui/viewModel/extraction/ToolWindowContentExtractor.java b/platform/platform-api/src/com/intellij/ui/viewModel/extraction/ToolWindowContentExtractor.java index e9ccf84a8025..052bf7d10e10 100644 --- a/platform/platform-api/src/com/intellij/ui/viewModel/extraction/ToolWindowContentExtractor.java +++ b/platform/platform-api/src/com/intellij/ui/viewModel/extraction/ToolWindowContentExtractor.java @@ -1,11 +1,11 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ui.viewModel.extraction; import com.intellij.openapi.client.ClientProjectSession; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.util.Key; import com.intellij.ui.content.Content; -import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; /** @@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull; * If your content contains virtual files that must be visible (i.e. in editors) * you should mark them with {@link #FILE_VISIBLE_FOR_REMOTE_CLIENTS}. */ -@ApiStatus.Experimental +@Internal public interface ToolWindowContentExtractor { ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.toolWindowContentExtractor"); Key SYNC_TAB_TO_REMOTE_CLIENTS = Key.create("ToolWindowContentExtractor.SyncTabToGuest"); diff --git a/platform/platform-api/src/com/intellij/ui/viewModel/extraction/ToolWindowViewModelExtractor.java b/platform/platform-api/src/com/intellij/ui/viewModel/extraction/ToolWindowViewModelExtractor.java index 2b268e0f0ad1..117a7baa5cdc 100644 --- a/platform/platform-api/src/com/intellij/ui/viewModel/extraction/ToolWindowViewModelExtractor.java +++ b/platform/platform-api/src/com/intellij/ui/viewModel/extraction/ToolWindowViewModelExtractor.java @@ -1,9 +1,9 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ui.viewModel.extraction; import com.intellij.openapi.client.ClientProjectSession; import com.intellij.openapi.extensions.ExtensionPointName; -import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; /** @@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull; * @see ToolWindowExtractorEP * @see ViewModelToolWindowFactory */ -@ApiStatus.Experimental +@Internal public interface ToolWindowViewModelExtractor { ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.toolWindowExtractor"); diff --git a/platform/platform-api/src/com/intellij/util/animation/JBAnimator.java b/platform/platform-api/src/com/intellij/util/animation/JBAnimator.java index 7c05072f8f38..ed289048563b 100644 --- a/platform/platform-api/src/com/intellij/util/animation/JBAnimator.java +++ b/platform/platform-api/src/com/intellij/util/animation/JBAnimator.java @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.util.animation; import com.intellij.ide.PowerSaveMode; @@ -349,6 +349,7 @@ public final class JBAnimator implements Disposable { /** * @return statistic of the last animation */ + @ApiStatus.Internal public @Nullable Statistic getStatistic() { return myStatistic; }