azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc: Partially revert cleanup (44138f499e) as accessing synthetic properties leads to IllegalAccessError

Browse Source 
#KT-10653 Fixed
This commit is contained in:
Alexey Sedunov
2016-01-14 13:41:22 +03:00
parent 1d9bafe196
commit 6e5a2208c0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
+5 -5
View File
@@ -163,7 +163,7 @@ class KotlinChangeSignatureDialog(
override fun getTableEditor(table: JTable, item: ParameterTableModelItemBase<KotlinParameterInfo>): JBTableRowEditor? { override fun getTableEditor(table: JTable, item: ParameterTableModelItemBase<KotlinParameterInfo>): JBTableRowEditor? {
return object : JBTableRowEditor() { return object : JBTableRowEditor() {
private val components = ArrayList<JComponent>() private val components = ArrayList<JComponent>()
private val nameEditor = EditorTextField(item.parameter.name, project, fileType) private val nameEditor = EditorTextField(item.parameter.name, getProject(), getFileType())
private fun updateNameEditor() { private fun updateNameEditor() {
nameEditor.isEnabled = item.parameter != parametersTableModel.receiver nameEditor.isEnabled = item.parameter != parametersTableModel.receiver
@@ -183,8 +183,8 @@ class KotlinChangeSignatureDialog(
val columnFinal = column val columnFinal = column
if (KotlinCallableParameterTableModel.isTypeColumn(columnInfo)) { if (KotlinCallableParameterTableModel.isTypeColumn(columnInfo)) {
val document = PsiDocumentManager.getInstance(project).getDocument(item.typeCodeFragment) val document = PsiDocumentManager.getInstance(getProject()).getDocument(item.typeCodeFragment)
editor = EditorTextField(document, project, fileType) editor = EditorTextField(document, getProject(), getFileType())
component = editor component = editor
} }
else if (KotlinCallableParameterTableModel.isNameColumn(columnInfo)) { else if (KotlinCallableParameterTableModel.isNameColumn(columnInfo)) {
@@ -193,8 +193,8 @@ class KotlinChangeSignatureDialog(
updateNameEditor() updateNameEditor()
} }
else if (KotlinCallableParameterTableModel.isDefaultValueColumn(columnInfo) && isDefaultColumnEnabled()) { else if (KotlinCallableParameterTableModel.isDefaultValueColumn(columnInfo) && isDefaultColumnEnabled()) {
val document = PsiDocumentManager.getInstance(project).getDocument(item.defaultValueCodeFragment) val document = PsiDocumentManager.getInstance(getProject()).getDocument(item.defaultValueCodeFragment)
editor = EditorTextField(document, project, fileType) editor = EditorTextField(document, getProject(), getFileType())
component = editor component = editor
} }
else if (KotlinPrimaryConstructorParameterTableModel.isValVarColumn(columnInfo)) { else if (KotlinPrimaryConstructorParameterTableModel.isValVarColumn(columnInfo)) {
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt
+1 -1
View File
@@ -175,7 +175,7 @@ class KotlinInplaceParameterIntroducer(
init { init {
initFormComponents { initFormComponents {
addComponent(previewComponent) addComponent(getPreviewComponent())
val defaultValueCheckBox = NonFocusableCheckBox("Introduce default value") val defaultValueCheckBox = NonFocusableCheckBox("Introduce default value")
defaultValueCheckBox.isSelected = descriptor.withDefaultValue defaultValueCheckBox.isSelected = descriptor.withDefaultValue