From 660b4ef02168edb83763bcdfd43bc09d9cbd87dc Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Fri, 26 Apr 2019 17:00:14 +0300
Subject: [PATCH] [jvm] cleanup: remove old unused methods from
 JvmElementActionsFactory

GitOrigin-RevId: 4ca2354457fa60b29977d0a3efaf5c9c3fbfa15e
---
 .../lang/jvm/actions/JvmElementActionsFactory.kt     | 12 ++----------
 .../src/com/intellij/lang/jvm/actions/actions.kt     |  7 -------
 .../intention/impl/JavaElementActionsFactory.kt      |  8 --------
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/JvmElementActionsFactory.kt b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/JvmElementActionsFactory.kt
index 354274fae12c..f87efbf76dbb 100644
--- a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/JvmElementActionsFactory.kt
+++ b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/JvmElementActionsFactory.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 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-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.
 package com.intellij.lang.jvm.actions
 
 import com.intellij.codeInsight.intention.IntentionAction
@@ -16,17 +16,10 @@ import com.intellij.lang.jvm.JvmModifiersOwner
  */
 abstract class JvmElementActionsFactory {
 
-  open fun createChangeModifierActions(target: JvmModifiersOwner, request: ChangeModifierRequest): List<IntentionAction> =
-    createChangeModifierActions(target, MemberRequest.Modifier(request.modifier, request.shouldBePresent()))
-
-  @Deprecated(message = "use createChangeModifierActions(JvmModifiersOwner, ChangeModifierRequest)")
-  open fun createChangeModifierActions(target: JvmModifiersOwner, request: MemberRequest.Modifier): List<IntentionAction> = emptyList()
+  open fun createChangeModifierActions(target: JvmModifiersOwner, request: ChangeModifierRequest): List<IntentionAction> = emptyList()
 
   open fun createAddAnnotationActions(target: JvmModifiersOwner, request: AnnotationRequest): List<IntentionAction> = emptyList()
 
-  @Deprecated(message = "use createAddMethodActions with proper request")
-  open fun createAddPropertyActions(targetClass: JvmClass, request: MemberRequest.Property): List<IntentionAction> = emptyList()
-
   open fun createAddFieldActions(targetClass: JvmClass, request: CreateFieldRequest): List<IntentionAction> = emptyList()
 
   open fun createAddMethodActions(targetClass: JvmClass, request: CreateMethodRequest): List<IntentionAction> = emptyList()
@@ -34,5 +27,4 @@ abstract class JvmElementActionsFactory {
   open fun createAddConstructorActions(targetClass: JvmClass, request: CreateConstructorRequest): List<IntentionAction> = emptyList()
 
   open fun createChangeParametersActions(target: JvmMethod, request: ChangeParametersRequest): List<IntentionAction> = emptyList()
-
 }
diff --git a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt
index fe72c1f2bfde..3fbecb7b796c 100644
--- a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt
+++ b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt
@@ -42,13 +42,6 @@ fun createAddAnnotationActions(target: JvmModifiersOwner, request: AnnotationReq
 fun createModifierActions(target: JvmModifiersOwner, request: ChangeModifierRequest): List<IntentionAction> =
   createActions { it.createChangeModifierActions(target, request) }
 
-@Deprecated("use createModifierActions(JvmModifiersOwner, ChangeModifierRequest)")
-fun createModifierActions(target: JvmModifiersOwner, request: MemberRequest.Modifier): List<IntentionAction> {
-  return createActions {
-    it.createChangeModifierActions(target, request)
-  }
-}
-
 fun createAddFieldActions(target: JvmClass, request: CreateFieldRequest): List<IntentionAction> =
   createActions { it.createAddFieldActions(target, request) }
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/JavaElementActionsFactory.kt b/java/java-impl/src/com/intellij/codeInsight/intention/impl/JavaElementActionsFactory.kt
index c6c1bc697eed..a7ef8864527e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/JavaElementActionsFactory.kt
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/JavaElementActionsFactory.kt
@@ -18,14 +18,6 @@ import java.util.*
 class JavaElementActionsFactory : JvmElementActionsFactory() {
   private val renderer = JavaElementRenderer.getInstance()
 
-  override fun createChangeModifierActions(target: JvmModifiersOwner, request: MemberRequest.Modifier): List<IntentionAction> {
-    return with(request) {
-      val declaration = target as PsiModifierListOwner
-      if (declaration.language != JavaLanguage.INSTANCE) return@with emptyList()
-      listOf(ModifierFix(declaration, renderer.render(modifier), shouldPresent, false))
-    }
-  }
-
   override fun createChangeModifierActions(target: JvmModifiersOwner, request: ChangeModifierRequest): List<IntentionAction> {
     val declaration = target as PsiModifierListOwner
     if (declaration.language != JavaLanguage.INSTANCE) return emptyList()