Extract Interface: Fix NPE on dialog opening

#KT-14854 Fixed
This commit is contained in:
Alexey Sedunov
2016-11-21 19:18:48 +03:00
parent 24035d2c83
commit ddb5308993
2 changed files with 6 additions and 0 deletions
+1
View File
@@ -335,6 +335,7 @@ These artifacts include extensions for the types available in the latter JDKs, s
#### Refactorings #### Refactorings
- [`KT-14583`](https://youtrack.jetbrains.com/issue/KT-14583) Change Signature: Use new signature when looking for redeclaration conflicts - [`KT-14583`](https://youtrack.jetbrains.com/issue/KT-14583) Change Signature: Use new signature when looking for redeclaration conflicts
- [`KT-14854`](https://youtrack.jetbrains.com/issue/KT-14854) Extract Interface: Fix NPE on dialog opening
## 1.0.5 ## 1.0.5
@@ -51,6 +51,8 @@ abstract class KotlinExtractSuperDialogBase(
refactoringName: String, refactoringName: String,
private val refactoring: (ExtractSuperInfo) -> Unit private val refactoring: (ExtractSuperInfo) -> Unit
) : JavaExtractSuperBaseDialog(originalClass.project, originalClass.toLightClass()!!, emptyList(), refactoringName) { ) : JavaExtractSuperBaseDialog(originalClass.project, originalClass.toLightClass()!!, emptyList(), refactoringName) {
private var initComplete: Boolean = false
private lateinit var memberInfoModel: MemberInfoModelBase private lateinit var memberInfoModel: MemberInfoModelBase
val selectedMembers: List<KotlinMemberInfo> val selectedMembers: List<KotlinMemberInfo>
@@ -73,6 +75,7 @@ abstract class KotlinExtractSuperDialogBase(
get() = fileNameField.text get() = fileNameField.text
private fun resetFileNameField() { private fun resetFileNameField() {
if (!initComplete) return
fileNameField.text = "$extractedSuperName.${KotlinFileType.EXTENSION}" fileNameField.text = "$extractedSuperName.${KotlinFileType.EXTENSION}"
} }
@@ -146,6 +149,8 @@ abstract class KotlinExtractSuperDialogBase(
override fun init() { override fun init() {
super.init() super.init()
initComplete = true
resetFileNameField() resetFileNameField()
} }