Change comment tab to other Tab

Add inner class model option in others tab
Support auto get Class name when it has one in the edit file

Author: seal

.idea/uiDesigner.xml

@@ -37,6 +37,10 @@ interface IConfigManager {
     private val USER_CUSTOM_JSON_LIB_ANNOTATION_FORMAT_STRING: String
         get() = "jsontokotlin_user_custom_json_lib_annotation_format_string"
 
+    private val INNER_CLASS_MODEL_KEY: String
+        get() = "jsontokotlin_inner_class_model_key"
+
+
     var isPropertiesVar: Boolean
         get() = if (isTestModel) TestConfig.isPropertiesVar else PropertiesComponent.getInstance().isTrueValue(IS_PROPERTIES_VAR_KEY)
         set(value) = if (isTestModel) {
@@ -96,6 +100,12 @@ interface IConfigManager {
         } else {
             PropertiesComponent.getInstance().setValue(USER_CUSTOM_JSON_LIB_ANNOTATION_FORMAT_STRING, value)
         }
+    var isInnerClassModel: Boolean
+        get() = if (isTestModel) TestConfig.isInnerClassModel else PropertiesComponent.getInstance().getBoolean(INNER_CLASS_MODEL_KEY, false)
+        set(value) = if (isTestModel) {
+        } else {
+            PropertiesComponent.getInstance().setValue(INNER_CLASS_MODEL_KEY, value)
+        }
 }
 
 /**
@@ -122,4 +132,5 @@ object TestConfig {
     var targetJsonConvertLib = TargetJsonConverter.Gson
     var isPropertyNullable = true
     var initWithDefaultValue = true
+    var isInnerClassModel = true
 }

src/wu/seal/jsontokotlin/ConfigManager.kt

@@ -10,7 +10,7 @@ import java.util.HashSet
  * Kotlin code maker
  * Created by seal.wu on 2017/8/21.
  */
-class KotlinMaker {
+class KotlinCodeMaker {
 
     private var className: String? = null
     private var inputElement: JsonElement? = null
@@ -44,11 +44,39 @@ class KotlinMaker {
             stringBuilder.deleteCharAt(index)
         }
         stringBuilder.append(")")
+        if (toBeAppend.isNotEmpty()) {
+            appendSubClassCode(stringBuilder)
+        }
+
+        return stringBuilder.toString()
+    }
+
+    private fun appendSubClassCode(stringBuilder: StringBuilder) {
+        if (ConfigManager.isInnerClassModel) {
+            appendInnerClassModelSubClassCode(stringBuilder)
+        } else {
+            appendNormalSubClassCode(stringBuilder)
+        }
+    }
+
+    private fun appendInnerClassModelSubClassCode(stringBuilder: StringBuilder) {
+        stringBuilder.append(" {")
+        for (append in toBeAppend) {
+            stringBuilder.append("\n")
+            append.split("\n").filter { it.isNotEmpty() }.forEach {
+                stringBuilder.append("\t")
+                stringBuilder.append(it)
+                stringBuilder.append("\n")
+            }
+        }
+        stringBuilder.append("}")
+    }
+
+    private fun appendNormalSubClassCode(stringBuilder: StringBuilder) {
         for (append in toBeAppend) {
             stringBuilder.append("\n")
             stringBuilder.append(append)
         }
-        return stringBuilder.toString()
     }
 
     private fun appClassName(stringBuilder: StringBuilder) {
@@ -67,7 +95,7 @@ class KotlinMaker {
                 val type = getArrayType(property, jsonElementValue.asJsonArray)
 
                 if (isExpectedJsonObjArrayType(jsonElementValue.asJsonArray)) {
-                    toBeAppend.add(KotlinMaker(getChildType(getRawType(type)), jsonElementValue.asJsonArray.first()).makeKotlinData())
+                    toBeAppend.add(KotlinCodeMaker(getChildType(getRawType(type)), jsonElementValue.asJsonArray.first()).makeKotlinData())
                 }
                 addProperty(stringBuilder, property, type, "")
 
@@ -77,7 +105,7 @@ class KotlinMaker {
 
             } else if (jsonElementValue.isJsonObject) {
                 val type = getJsonObjectType(property)
-                toBeAppend.add(KotlinMaker(getRawType(type), jsonElementValue).makeKotlinData())
+                toBeAppend.add(KotlinCodeMaker(getRawType(type), jsonElementValue).makeKotlinData())
                 addProperty(stringBuilder, property, type, "")
 
             } else if (jsonElementValue.isJsonNull) {

src/wu/seal/jsontokotlin/KotlinMaker.kt renamed to src/wu/seal/jsontokotlin/KotlinCodeMaker.kt

@@ -27,7 +27,7 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
     override fun actionPerformed(event: AnActionEvent) {
         var jsonString: String = ""
         try {
-            Thread() {
+            Thread {
                 sendActionInfo(gson.toJson(StartAction()))
             }.start()
             val project = event.getData(PlatformDataKeys.PROJECT)
@@ -37,21 +37,33 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
                 Messages.showWarningDialog("Please open a file in editor state for insert Kotlin code!", "No Editor File")
                 return
             }
-
-            val inputDialog = JsonInputDialog(project!!)
+            var tempClassName = ""
+            val document = editor.document
+            val editorText = document.text
+            var needRewriteRootClassName = false
+            if (editorText.indexOf("class") == editorText.lastIndexOf("class") && editorText.substringAfter("class").contains("(").not()) {
+                tempClassName = editorText.substringAfter("class").substringBefore("{").trim()
+                needRewriteRootClassName = true
+            }
+            val inputDialog = JsonInputDialog(tempClassName, project!!)
             inputDialog.show()
             val className = inputDialog.getClassName()
             val json = inputDialog.inputString
             if (json == null || json.isEmpty()) {
                 return
             }
             jsonString = json
-            val document = editor.document
+
+            if (needRewriteRootClassName) {
+                executeCouldRollBackAction(project) {
+                    document.setText(editorText.substringBefore("class"))
+                }
+            }
             ImportClassWriter.insertImportClassCode(project, document)
 
-            val maker: KotlinMaker
+            val codeMaker: KotlinCodeMaker
             try {
-                maker = KotlinMaker(className, jsonString)
+                codeMaker = KotlinCodeMaker(className, jsonString)
             } catch (e: IllegalFormatFlagsException) {
                 e.printStackTrace()
                 Messages.showErrorDialog(e.message, "UnSupport Json")
@@ -70,10 +82,9 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
                 } else {
                     offset = document.textLength - 1
                 }
-                document.insertString(Math.max(offset, 0), maker.makeKotlinData())
+                document.insertString(Math.max(offset, 0), codeMaker.makeKotlinData())
             }
 
-//            Messages.showMessageDialog(project, "Kotlin Code insert successfully!", "Information", Messages.getInformationIcon())
             Thread {
                 sendActionInfo(gson.toJson(SuccessCompleteAction()))
             }.start()

src/wu/seal/jsontokotlin/MakeKotlinClassAction.kt

@@ -19,6 +19,7 @@ data class ConfigInfo(
         val isPropertyNullable: Boolean = ConfigManager.isPropertyNullable,
         val initWithDefaultValue: Boolean = ConfigManager.initWithDefaultValue,
         val targetJsonConverterLib: String = ConfigManager.targetJsonConverterLib.name,
+        val isInnerClassMode:Boolean = ConfigManager.isInnerClassModel,
         val timeStamp: String = Date().time.toString(),
         val daytime: String = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).format(Date())
 

src/wu/seal/jsontokotlin/statistics/Datas.kt

@@ -32,23 +32,25 @@ class ConfigSettingDialog(canBeParent: Boolean) : DialogWrapper(canBeParent), IC
 
         val tabbedPane = JTabbedPane()
 
-        val propertyPanel = createPropertyPane()
+        val propertyPanelTab = createPropertyPane()
 
-        val commentConfigPanel = createCommentConfigPanel()
+        val otherConfigTab = createOtherSettingTab()
 
-        val targetJsonLibConfigPanel = createTargetJsonLibConfigPanel()
+        val JSONconverterTab = createTargetJsonLibConfigPanel()
 
-        tabbedPane.add("Property", propertyPanel)
+        tabbedPane.add("Property", propertyPanelTab)
 
-        tabbedPane.add("JSON Converter", targetJsonLibConfigPanel)
+        tabbedPane.add("JSON Converter", JSONconverterTab)
 
-        tabbedPane.add("Comment", commentConfigPanel)
+        tabbedPane.add("Other", otherConfigTab)
 
         tabbedPane.minimumSize = JBDimension(500, 300)
 
         return tabbedPane
     }
 
+    private fun createOtherSettingTab() = ConfigSettingsOthersTab(true)
+
     private fun createTargetJsonLibConfigPanel() = TargetJsonLibConfigPanelContainer(true)
 
     private fun createCommentConfigPanel() = CommentConfigPanel(true)

src/wu/seal/jsontokotlin/ui/ConfigSettingDialog.kt

@@ -0,0 +1,49 @@
+package wu.seal.jsontokotlin.ui
+
+import com.intellij.ui.components.JBCheckBox
+import com.intellij.util.ui.JBUI
+import wu.seal.jsontokotlin.ConfigManager
+import wu.seal.jsontokotlin.addComponentIntoVerticalBoxAlignmentLeft
+import java.awt.FlowLayout
+import java.awt.LayoutManager
+import javax.swing.Box
+import javax.swing.BoxLayout
+import javax.swing.JPanel
+import javax.swing.border.EmptyBorder
+
+/**
+ * others settings tab in config settings dialog
+ * Created by Seal.Wu on 2018/2/6.
+ */
+class ConfigSettingsOthersTab(layout: LayoutManager?, isDoubleBuffered: Boolean) : JPanel(layout, isDoubleBuffered) {
+
+    constructor(layout: LayoutManager?) : this(layout, false)
+
+    constructor(isDoubleBuffered: Boolean) : this(FlowLayout(), isDoubleBuffered)
+
+    init {
+        val boxLayout = BoxLayout(this, BoxLayout.PAGE_AXIS)
+        setLayout(boxLayout)
+        val bordWidth = JBUI.scale(10)
+        border = EmptyBorder(bordWidth, bordWidth, bordWidth, bordWidth)
+
+        val enableComment = JBCheckBox("enable comment")
+        enableComment.isSelected = ConfigManager.isCommentOff.not()
+        enableComment.addActionListener { ConfigManager.isCommentOff = enableComment.isSelected.not() }
+
+
+
+        val enableInnerClassModel = JBCheckBox("enable inner class model")
+        enableInnerClassModel.isSelected = ConfigManager.isInnerClassModel
+        enableInnerClassModel.addActionListener { ConfigManager.isInnerClassModel = enableInnerClassModel.isSelected }
+
+        add(Box.createVerticalStrut(JBUI.scale(10)))
+
+        addComponentIntoVerticalBoxAlignmentLeft(enableComment)
+
+        add(Box.createVerticalStrut(JBUI.scale(20)))
+
+        addComponentIntoVerticalBoxAlignmentLeft(enableInnerClassModel)
+    }
+
+}