Skip to content

Commit 1decde8

Browse files
删除多余配置文件
1 parent 8d6d296 commit 1decde8

File tree

7 files changed

+7
-140
lines changed

7 files changed

+7
-140
lines changed

src/main/java/com/ruiyu/jsontodart/CollectInfo.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ class CollectInfo {
1616
return ServiceManager.getService(Settings::class.java).state.modelSuffix.toLowerCase()
1717
}
1818

19-
//二级类前缀
20-
fun modelPrefix(): Boolean {
21-
return ServiceManager.getService(Settings::class.java).state.addPrefix
22-
}
23-
2419
//用户输入的类名转为文件名
2520
fun transformInputClassNameToFileName(): String {
2621
return if (!userInputClassName.contains("_")) {

src/main/java/com/ruiyu/jsontodart/ModelGenerator.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,8 @@ class ModelGenerator(
2020
var allClasses = mutableListOf<ClassDefinition>()
2121
//parentType 父类型 是list 或者class
2222
private fun generateClassDefinition(className: String, parentName: String, jsonRawData: Any, parentType: String = ""): MutableList<ClassDefinition> {
23-
var newClassName = className
24-
if (collectInfo.modelPrefix()) {
25-
newClassName = parentName + newClassName
26-
}
27-
val preName = if (collectInfo.modelPrefix()) {
28-
newClassName
29-
} else ""
23+
val newClassName = parentName + className
24+
val preName = newClassName
3025
if (jsonRawData is List<*>) {
3126
// if first element is an array, start in the first element.
3227
generateClassDefinition(Inflector.getInstance().singularize(newClassName), Inflector.getInstance().singularize(newClassName), jsonRawData[0]!!)

src/main/java/com/ruiyu/setting/ConfigTableModel.kt

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/main/java/com/ruiyu/setting/SettingComponent.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ class SettingComponent : Configurable {
1414
return false
1515
}
1616
return getSettings() != Settings(
17-
settingLayout!!.getModelSuffix(),
18-
settingLayout!!.getIgnoreContainFieldClassTextField(),
19-
settingLayout!!.getSuffixFiles(),
20-
settingLayout!!.getModelPrefix())
17+
settingLayout!!.getModelSuffix())
2118
}
2219

2320
override fun getDisplayName(): String {
@@ -28,8 +25,6 @@ class SettingComponent : Configurable {
2825
settingLayout?.run {
2926
getSettings().apply {
3027
modelSuffix = getModelSuffix()
31-
scanFileSetting = getSuffixFiles()
32-
addPrefix = getModelPrefix()
3328
}
3429
}
3530
}

src/main/java/com/ruiyu/setting/SettingLayout.kt

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.ruiyu.setting
22

3-
import com.intellij.ui.components.CheckBox
43
import com.intellij.ui.components.JBLabel
54
import com.intellij.ui.components.JBScrollPane
65
import com.intellij.ui.components.JBTextField
@@ -14,18 +13,11 @@ import javax.swing.border.EmptyBorder
1413

1514
class SettingLayout(settingState: Settings) {
1615
private val panel: JPanel = JPanel(BorderLayout())
17-
private val checkBox: JCheckBox
1816
private val beanNameTextField: JBTextField
19-
private val ignoreContainFieldClassTextField: JBTextField
20-
private val configTableModel = ConfigTableModel(settingState)
2117

2218
init {
2319

2420
val beanNameLayout = createLinearLayoutVertical()
25-
checkBox = JCheckBox("whether to add a class prefix")
26-
checkBox.border = EmptyBorder(5, 0, 5, 0)
27-
checkBox.isSelected = settingState.addPrefix
28-
beanNameLayout.addComponentIntoVerticalBoxAlignmentLeft(checkBox)
2921
val beanName = JBLabel()
3022
beanName.border = EmptyBorder(5, 0, 5, 0)
3123
beanName.text = "model suffix"
@@ -34,30 +26,14 @@ class SettingLayout(settingState: Settings) {
3426
beanNameTextField.preferredSize = JBDimension(400, 40)
3527
beanNameLayout.addComponentIntoVerticalBoxAlignmentLeft(beanNameTextField)
3628

37-
val ignoreContainFieldClassTextFieldName = JBLabel()
38-
ignoreContainFieldClassTextFieldName.border = EmptyBorder(5, 0, 5, 0)
39-
ignoreContainFieldClassTextFieldName.text = "ignoreContainFieldClass"
40-
beanNameLayout.addComponentIntoVerticalBoxAlignmentLeft(ignoreContainFieldClassTextFieldName)
41-
ignoreContainFieldClassTextField = JBTextField(settingState.ignoreContainFieldClass)
42-
ignoreContainFieldClassTextField.preferredSize = JBDimension(400, 40)
43-
beanNameLayout.addComponentIntoVerticalBoxAlignmentLeft(ignoreContainFieldClassTextField)
4429

4530
panel.add(beanNameLayout, BorderLayout.NORTH)
4631

4732
val label1 = JBLabel()
4833
label1.border = EmptyBorder(5, 0, 5, 0)
4934
label1.text = "Configure scan suffix files(Please separate them with commas)"
5035
beanNameLayout.addComponentIntoVerticalBoxAlignmentLeft(
51-
label1
52-
)
53-
54-
55-
val jbTable = JBTable(configTableModel)
56-
jbTable.rowSelectionAllowed = true
57-
jbTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
58-
val jScrollPane = JBScrollPane(jbTable)
59-
beanNameLayout.addComponentIntoVerticalBoxAlignmentLeft(
60-
jScrollPane
36+
label1
6137
)
6238
panel.add(createLinearLayoutVertical(), BorderLayout.AFTER_LAST_LINE)
6339
}
@@ -66,22 +42,12 @@ class SettingLayout(settingState: Settings) {
6642
return this.panel
6743
}
6844

69-
fun getSuffixFiles(): List<Array<String>> {
70-
return configTableModel.data
71-
}
7245

7346
fun getModelSuffix(): String {
7447
return beanNameTextField.text
7548
}
7649

77-
fun getModelPrefix(): Boolean {
78-
return checkBox.isSelected
79-
}
80-
8150

82-
fun getIgnoreContainFieldClassTextField(): String {
83-
return ignoreContainFieldClassTextField.text
84-
}
8551
}
8652

8753
fun createLinearLayoutVertical(): JPanel {

src/main/java/com/ruiyu/setting/Settings.kt

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,11 @@ import com.intellij.util.xmlb.XmlSerializerUtil
77

88
@State(name = "FlutterJsonBeanFactorySettings", storages = [(Storage("FlutterJsonBeanFactorySettings.xml"))])
99
data class Settings(
10-
var modelSuffix: String,
11-
var ignoreContainFieldClass: String,
12-
var scanFileSetting: List<Array<String>>,
13-
var addPrefix: Boolean
10+
var modelSuffix: String
1411
) : PersistentStateComponent<Settings> {
1512

1613
constructor() : this(
17-
"entity", "base", mutableListOf(
18-
arrayOf("entity", "static T generateOBJ<T>(json) {", ".fromJson(json) as T;"),
19-
arrayOf("", "", ""),
20-
arrayOf("", "", "")
21-
),true
14+
"entity"
2215
)
2316

2417
override fun getState(): Settings {
@@ -28,9 +21,4 @@ data class Settings(
2821
override fun loadState(state: Settings) {
2922
XmlSerializerUtil.copyBean(state, this)
3023
}
31-
}
32-
33-
/**
34-
* 扫描的名字 方法 类名后面的
35-
*/
36-
data class GenerateCode(val scanName: String, val methodLine: String, val classNameLine: String)
24+
}

src/main/java/com/ruiyu/utils/FileUtils.kt

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)