Skip to content

Commit a28eddc

Browse files
kimdohun0104kimdohun0104
committed
리팩토링
1 parent e18621e commit a28eddc

16 files changed

+47
-62
lines changed

‎src/main/kotlin/kr/co/finda/androidtemplate/feature/createFindaTemplate/action/CreateFindaTemplateAction.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.intellij.openapi.vfs.VirtualFile
99
import icons.Icons
1010
import kr.co.finda.androidtemplate.type.PluginError
1111
import kr.co.finda.androidtemplate.feature.createFindaTemplate.dialog.CreateFindaTemplateDialog
12-
import kr.co.finda.androidtemplate.model.ActionRouterImpl
12+
import kr.co.finda.androidtemplate.util.ActionRouterImpl
1313

1414
class CreateFindaTemplateAction :
1515
AnAction(), CreateFindaTemplateActionContract.View {

‎src/main/kotlin/kr/co/finda/androidtemplate/feature/createFindaTemplate/action/CreateFindaTemplateActionPresenter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package kr.co.finda.androidtemplate.feature.createFindaTemplate.action
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.project.Project
55
import com.intellij.openapi.vfs.VirtualFile
6-
import kr.co.finda.androidtemplate.model.ActionRouter
6+
import kr.co.finda.androidtemplate.util.ActionRouter
77
import kr.co.finda.androidtemplate.type.PluginError
88

99
class CreateFindaTemplateActionPresenter(

‎src/main/kotlin/kr/co/finda/androidtemplate/feature/createFindaTemplate/dialog/CreateFindaTemplateDialog.kt‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package kr.co.finda.androidtemplate.feature.createFindaTemplate.dialog
22

33
import com.intellij.openapi.project.Project
4+
import com.intellij.openapi.ui.ComboBox
45
import com.intellij.openapi.ui.DialogWrapper
56
import com.intellij.openapi.ui.Messages
67
import com.intellij.openapi.vfs.VirtualFile
78
import com.intellij.ui.EnumComboBoxModel
89
import com.intellij.ui.components.JBTextField
9-
import com.intellij.ui.layout.panel
10+
import com.intellij.util.ui.FormBuilder
1011
import icons.Icons
1112
import kr.co.finda.androidtemplate.type.PluginError
12-
import kr.co.finda.androidtemplate.model.FileHelperImpl
13-
import kr.co.finda.androidtemplate.model.ReplacerImpl
13+
import kr.co.finda.androidtemplate.util.FileHelperImpl
14+
import kr.co.finda.androidtemplate.util.ReplacerImpl
1415
import kr.co.finda.androidtemplate.type.ScreenType
1516
import javax.swing.JComponent
1617

@@ -27,28 +28,20 @@ class CreateFindaTemplateDialog(
2728
}
2829

2930
private val screenTypeModel = EnumComboBoxModel(ScreenType::class.java)
30-
private lateinit var nameTextField: JBTextField
31+
32+
private val nameTextField = JBTextField()
33+
private val screenTypeComboBox = ComboBox(screenTypeModel)
34+
private val panel = FormBuilder.createFormBuilder()
35+
.addLabeledComponent("화면 이름:", nameTextField)
36+
.addLabeledComponent("화면 종류:", screenTypeComboBox)
37+
.panel
3138

3239
init {
3340
init()
3441
title = "Create Finda Template"
3542
}
3643

3744
override fun createCenterPanel(): JComponent {
38-
val panel = panel {
39-
row("화면 이름:") {
40-
nameTextField = textField({ "" }, {}).component
41-
}
42-
43-
row("화면 종류:") {
44-
comboBox(
45-
screenTypeModel,
46-
{ screenTypeModel.selectedItem },
47-
{ screenTypeModel.setSelectedItem(it) }
48-
)
49-
}
50-
}
51-
panel.preferredFocusedComponent = nameTextField
5245
return panel
5346
}
5447

‎src/main/kotlin/kr/co/finda/androidtemplate/feature/createFindaTemplate/dialog/CreateFindaTemplateDialogPresenter.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package kr.co.finda.androidtemplate.feature.createFindaTemplate.dialog
33
import com.intellij.openapi.project.Project
44
import com.intellij.openapi.vfs.VirtualFile
55
import kr.co.finda.androidtemplate.type.PluginError
6-
import kr.co.finda.androidtemplate.model.FileHelper
7-
import kr.co.finda.androidtemplate.model.Replacements
6+
import kr.co.finda.androidtemplate.util.FileHelper
7+
import kr.co.finda.androidtemplate.util.Replacements
88
import kr.co.finda.androidtemplate.ext.decapitalizeWithUnderBar
99
import kr.co.finda.androidtemplate.type.FileExtension
1010
import kr.co.finda.androidtemplate.type.ScreenType

‎src/main/kotlin/kr/co/finda/androidtemplate/feature/createViewModelTest/action/CreateViewModelTestAction.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.intellij.openapi.ui.Messages
88
import com.intellij.openapi.vfs.VirtualFile
99
import icons.Icons
1010
import kr.co.finda.androidtemplate.feature.createViewModelTest.dialog.CreateViewModelTestDialog
11-
import kr.co.finda.androidtemplate.model.ActionRouterImpl
11+
import kr.co.finda.androidtemplate.util.ActionRouterImpl
1212
import kr.co.finda.androidtemplate.type.PluginError
1313

1414
class CreateViewModelTestAction :

‎src/main/kotlin/kr/co/finda/androidtemplate/feature/createViewModelTest/action/CreateViewModelTestActionPresenter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package kr.co.finda.androidtemplate.feature.createViewModelTest.action
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.project.Project
55
import com.intellij.openapi.vfs.VirtualFile
6-
import kr.co.finda.androidtemplate.model.ActionRouter
6+
import kr.co.finda.androidtemplate.util.ActionRouter
77
import kr.co.finda.androidtemplate.type.PluginError
88

99
class CreateViewModelTestActionPresenter(

‎src/main/kotlin/kr/co/finda/androidtemplate/feature/createViewModelTest/dialog/CreateViewModelTestDialog.kt‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import com.intellij.openapi.ui.DialogWrapper
55
import com.intellij.openapi.ui.Messages
66
import com.intellij.openapi.vfs.VirtualFile
77
import com.intellij.ui.components.JBTextField
8-
import com.intellij.ui.layout.panel
8+
import com.intellij.util.ui.FormBuilder
99
import icons.Icons
10-
import kr.co.finda.androidtemplate.model.FileHelperImpl
11-
import kr.co.finda.androidtemplate.model.ReplacerImpl
10+
import kr.co.finda.androidtemplate.util.FileHelperImpl
11+
import kr.co.finda.androidtemplate.util.ReplacerImpl
1212
import kr.co.finda.androidtemplate.type.PluginError
1313
import javax.swing.JComponent
1414

@@ -21,20 +21,17 @@ class CreateViewModelTestDialog(
2121
CreateViewModelTestDialogPresenter(this, FileHelperImpl(ReplacerImpl()))
2222
}
2323

24-
private lateinit var nameTextField: JBTextField
24+
private val nameTextField = JBTextField()
25+
private val panel = FormBuilder.createFormBuilder()
26+
.addLabeledComponent("ViewModel 이름:", nameTextField)
27+
.panel
2528

2629
init {
2730
init()
2831
title = "Create ViewModel Test Template"
2932
}
3033

3134
override fun createCenterPanel(): JComponent {
32-
val panel = panel {
33-
row("ViewModel 이름:") {
34-
nameTextField = textField({ "" }, {}).component
35-
}
36-
}
37-
panel.preferredFocusedComponent = nameTextField
3835
return panel
3936
}
4037

‎src/main/kotlin/kr/co/finda/androidtemplate/feature/createViewModelTest/dialog/CreateViewModelTestDialogPresenter.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package kr.co.finda.androidtemplate.feature.createViewModelTest.dialog
22

33
import com.intellij.openapi.project.Project
44
import com.intellij.openapi.vfs.VirtualFile
5-
import kr.co.finda.androidtemplate.model.FileHelper
6-
import kr.co.finda.androidtemplate.model.Replacements
5+
import kr.co.finda.androidtemplate.util.FileHelper
6+
import kr.co.finda.androidtemplate.util.Replacements
77
import kr.co.finda.androidtemplate.type.FileExtension
88
import kr.co.finda.androidtemplate.type.PluginError
99

‎src/main/kotlin/kr/co/finda/androidtemplate/feature/FindaTestTemplateContextType.kt‎ renamed to ‎src/main/kotlin/kr/co/finda/androidtemplate/feature/liveTemplate/FindaTestTemplateContextType.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kr.co.finda.androidtemplate.feature
1+
package kr.co.finda.androidtemplate.feature.liveTemplate
22

33
import com.intellij.codeInsight.template.TemplateContextType
44
import com.intellij.psi.PsiFile

‎src/main/kotlin/kr/co/finda/androidtemplate/feature/setting/FindaSettingConfigurable.kt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,38 @@ import javax.swing.JComponent
66

77
class FindaSettingConfigurable : Configurable {
88

9-
private lateinit var findaSettingComponent: FindaSettingComponent
9+
private lateinit var component: FindaSettingComponent
1010

1111
override fun createComponent(): JComponent {
12-
findaSettingComponent = FindaSettingComponent(WaistUpService.state)
13-
return findaSettingComponent.panel
12+
component = FindaSettingComponent(WaistUpService.state)
13+
return component.panel
1414
}
1515

1616
override fun isModified(): Boolean {
1717
val state = WaistUpService.state
18-
return state.isEnabled != findaSettingComponent.waistUpCheckBox.isSelected
19-
|| state.hideDelay != findaSettingComponent.hideDelayTextField.text.toLong()
20-
|| state.waitDelay != findaSettingComponent.waitDelayTextField.text.toLong()
18+
return state.isEnabled != component.waistUpCheckBox.isSelected
19+
|| state.hideDelay != component.hideDelayTextField.text.toLong()
20+
|| state.waitDelay != component.waitDelayTextField.text.toLong()
2121
}
2222

2323
override fun apply() {
2424
val state = WaistUpService.state
25-
state.isEnabled = findaSettingComponent.waistUpCheckBox.isSelected
26-
state.hideDelay = findaSettingComponent.hideDelayTextField.text.toLong()
27-
state.waitDelay = findaSettingComponent.waitDelayTextField.text.toLong()
25+
state.isEnabled = component.waistUpCheckBox.isSelected
26+
state.hideDelay = component.hideDelayTextField.text.toLong()
27+
state.waitDelay = component.waitDelayTextField.text.toLong()
2828

2929
WaistUpService.setNotificationEnable(state.isEnabled)
3030
}
3131

3232
override fun getPreferredFocusedComponent(): JComponent {
33-
return findaSettingComponent.hideDelayTextField
33+
return component.hideDelayTextField
3434
}
3535

3636
override fun reset() {
3737
val state = WaistUpService.state
38-
findaSettingComponent.waistUpCheckBox.isSelected = state.isEnabled
39-
findaSettingComponent.hideDelayTextField.text = state.hideDelay.toString()
40-
findaSettingComponent.waitDelayTextField.text = state.waitDelay.toString()
38+
component.waistUpCheckBox.isSelected = state.isEnabled
39+
component.hideDelayTextField.text = state.hideDelay.toString()
40+
component.waitDelayTextField.text = state.waitDelay.toString()
4141
}
4242

4343
override fun getDisplayName(): String {

0 commit comments

Comments
 (0)