diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ClassParameterObjectBuilder.kt b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ClassResultObjectBuilder.kt similarity index 91% rename from java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ClassParameterObjectBuilder.kt rename to java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ClassResultObjectBuilder.kt index 41b8272bbe33..9a9d4e2219f3 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ClassParameterObjectBuilder.kt +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ClassResultObjectBuilder.kt @@ -5,10 +5,10 @@ import com.intellij.psi.* import com.intellij.psi.util.PsiTreeUtil import com.siyeh.ig.psiutils.TypeUtils -class ClassParameterObjectBuilder(private val pojoClass: PsiClass): ParameterObjectBuilder { +class ClassResultObjectBuilder(private val pojoClass: PsiClass): ResultObjectBuilder { companion object { - fun create(variables: List): ClassParameterObjectBuilder { - return ClassParameterObjectBuilder(createPojoClass(variables)) + fun create(variables: List): ClassResultObjectBuilder { + return ClassResultObjectBuilder(createPojoClass(variables)) } private fun createPojoClass(variables: List): PsiClass { diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ParameterObjectExtractor.kt b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ParameterObjectExtractor.kt index 6d375504c451..89949bc60715 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ParameterObjectExtractor.kt +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ParameterObjectExtractor.kt @@ -41,9 +41,9 @@ object ParameterObjectExtractor { } val shouldInsertRecord = HighlightingFeature.RECORDS.isAvailable(variables.first()) val objectBuilder = if (shouldInsertRecord) { - RecordParameterObjectBuilder.create(variables) + RecordResultObjectBuilder.create(variables) } else { - ClassParameterObjectBuilder.create(variables) + ClassResultObjectBuilder.create(variables) } val file = scope.first().containingFile val project = file.project @@ -99,7 +99,7 @@ object ParameterObjectExtractor { return preview } - private fun introduceObjectForVariables(builder: ParameterObjectBuilder, + private fun introduceObjectForVariables(builder: ResultObjectBuilder, variables: List, affectedReferences: List, placeForDeclaration: PsiElement): IntroduceObjectResult { diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/RecordParameterObjectBuilder.kt b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/RecordResultObjectBuilder.kt similarity index 86% rename from java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/RecordParameterObjectBuilder.kt rename to java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/RecordResultObjectBuilder.kt index a672e61993cb..bd70b8a96f3d 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/RecordParameterObjectBuilder.kt +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/RecordResultObjectBuilder.kt @@ -4,12 +4,12 @@ package com.intellij.refactoring.extractMethod.newImpl.parameterObject import com.intellij.psi.* import com.intellij.psi.util.PsiTreeUtil -class RecordParameterObjectBuilder(private val record: PsiClass): ParameterObjectBuilder { +class RecordResultObjectBuilder(private val record: PsiClass): ResultObjectBuilder { companion object { - fun create(variables: List): RecordParameterObjectBuilder { - return RecordParameterObjectBuilder(createRecord(variables)) + fun create(variables: List): RecordResultObjectBuilder { + return RecordResultObjectBuilder(createRecord(variables)) } private fun createRecord(variables: List): PsiClass { diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ParameterObjectBuilder.kt b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ResultObjectBuilder.kt similarity index 94% rename from java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ParameterObjectBuilder.kt rename to java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ResultObjectBuilder.kt index 1464a7ff6f9a..f1ea6258bd77 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ParameterObjectBuilder.kt +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/parameterObject/ResultObjectBuilder.kt @@ -6,7 +6,7 @@ import com.intellij.psi.PsiDeclarationStatement import com.intellij.psi.PsiExpression import com.intellij.psi.PsiReferenceExpression -interface ParameterObjectBuilder { +interface ResultObjectBuilder { fun createClass(): PsiClass fun createDeclaration(): PsiDeclarationStatement fun createReferenceReplacement(reference: PsiReferenceExpression): PsiExpression