From 6e5a2208c001035c69e9025ddd0a320617fe30f1 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 14 Jan 2016 13:41:22 +0300 Subject: [PATCH] Misc: Partially revert cleanup (44138f499e9e488ecf8db0ee6fe405e7b9f6b1ae) as accessing synthetic properties leads to IllegalAccessError #KT-10653 Fixed --- .../changeSignature/ui/KotlinChangeSignatureDialog.kt | 10 +++++----- .../KotlinInplaceParameterIntroducer.kt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt index 0d26f4323bb..c350eaf5c40 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt @@ -163,7 +163,7 @@ class KotlinChangeSignatureDialog( override fun getTableEditor(table: JTable, item: ParameterTableModelItemBase): JBTableRowEditor? { return object : JBTableRowEditor() { private val components = ArrayList() - private val nameEditor = EditorTextField(item.parameter.name, project, fileType) + private val nameEditor = EditorTextField(item.parameter.name, getProject(), getFileType()) private fun updateNameEditor() { nameEditor.isEnabled = item.parameter != parametersTableModel.receiver @@ -183,8 +183,8 @@ class KotlinChangeSignatureDialog( val columnFinal = column if (KotlinCallableParameterTableModel.isTypeColumn(columnInfo)) { - val document = PsiDocumentManager.getInstance(project).getDocument(item.typeCodeFragment) - editor = EditorTextField(document, project, fileType) + val document = PsiDocumentManager.getInstance(getProject()).getDocument(item.typeCodeFragment) + editor = EditorTextField(document, getProject(), getFileType()) component = editor } else if (KotlinCallableParameterTableModel.isNameColumn(columnInfo)) { @@ -193,8 +193,8 @@ class KotlinChangeSignatureDialog( updateNameEditor() } else if (KotlinCallableParameterTableModel.isDefaultValueColumn(columnInfo) && isDefaultColumnEnabled()) { - val document = PsiDocumentManager.getInstance(project).getDocument(item.defaultValueCodeFragment) - editor = EditorTextField(document, project, fileType) + val document = PsiDocumentManager.getInstance(getProject()).getDocument(item.defaultValueCodeFragment) + editor = EditorTextField(document, getProject(), getFileType()) component = editor } else if (KotlinPrimaryConstructorParameterTableModel.isValVarColumn(columnInfo)) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt index 1b45220b522..6a6d8801c7e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt @@ -175,7 +175,7 @@ class KotlinInplaceParameterIntroducer( init { initFormComponents { - addComponent(previewComponent) + addComponent(getPreviewComponent()) val defaultValueCheckBox = NonFocusableCheckBox("Introduce default value") defaultValueCheckBox.isSelected = descriptor.withDefaultValue