From 1def0c841c4c829bcd314c18d96ad29fb1e421c0 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Mon, 13 May 2024 17:20:47 +0200 Subject: [PATCH] [refactoring] Fix some raw-types in inplace introducers GitOrigin-RevId: 8e2e93e1bfdd4ead7d0ef0b00aeacedbec7fe341 --- .../src/com/intellij/refactoring/IntroduceHandlerBase.java | 2 +- .../refactoring/introduceField/IntroduceConstantHandler.java | 2 +- .../introduce/inplace/AbstractInplaceIntroducer.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/IntroduceHandlerBase.java b/java/java-impl-refactorings/src/com/intellij/refactoring/IntroduceHandlerBase.java index 287fc17481a4..a6a0225897b9 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/IntroduceHandlerBase.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/IntroduceHandlerBase.java @@ -99,5 +99,5 @@ public abstract class IntroduceHandlerBase implements RefactoringActionHandler, protected abstract boolean invokeImpl(Project project, PsiLocalVariable localVariable, @Nullable Editor editor); @TestOnly - public abstract AbstractInplaceIntroducer getInplaceIntroducer(); + public abstract AbstractInplaceIntroducer getInplaceIntroducer(); } diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java index 6f784dbedc9d..294d2462292c 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java @@ -105,7 +105,7 @@ public class IntroduceConstantHandler extends BaseExpressionToFieldHandler imple String enteredName = null; boolean replaceAllOccurrences = true; - final AbstractInplaceIntroducer activeIntroducer = AbstractInplaceIntroducer.getActiveIntroducer(editor); + final AbstractInplaceIntroducer activeIntroducer = AbstractInplaceIntroducer.getActiveIntroducer(editor); if (activeIntroducer != null) { activeIntroducer.stopIntroduce(editor); expr = (PsiExpression)activeIntroducer.getExpr(); diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java index 538703dc6014..f77d4b0e0a50 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java @@ -55,7 +55,7 @@ public abstract class AbstractInplaceIntroducer ACTIVE_INTRODUCE = Key.create("ACTIVE_INTRODUCE"); + public static final Key> ACTIVE_INTRODUCE = Key.create("ACTIVE_INTRODUCE"); private EditorEx myPreview; private final JComponent myPreviewComponent; @@ -632,7 +632,7 @@ public abstract class AbstractInplaceIntroducer getActiveIntroducer(@Nullable Editor editor) { if (editor == null) return null; return editor.getUserData(ACTIVE_INTRODUCE); }