Merge pull request #370 from wuseal/optimize-extension-link-ui

Optimize Extensions' UI

Author: wuseal

Diff for: src/main/kotlin/extensions/ExtensionsCollector.kt

@@ -36,6 +36,6 @@ object ExtensionsCollector {
         BuildFromJsonObjectSupport,
         NeedNonNullableClassesSupport,
         InternalModifierSupport,
-        AddGsonExposeAnnotation,
+        AddGsonExposeAnnotationSupport,
     )
 }

Diff for: src/main/kotlin/extensions/jose/han/ParcelableAnnotationSupport.kt

@@ -33,15 +33,6 @@ object ParcelableAnnotationSupport : Extension() {
 
         if (kotlinClass is DataClass) {
             if (getConfig(configKey).toBoolean()) {
-
-//                val classAnnotationString1 = "@SuppressLint(\"ParcelCreator\")"
-//                val classAnnotationString2 = "@Parcelize"
-//
-//                val classAnnotation1 = Annotation.fromAnnotationString(classAnnotationString1)
-//                val classAnnotation2 = Annotation.fromAnnotationString(classAnnotationString2)
-//
-//                val newAnnotations = mutableListOf(classAnnotation1, classAnnotation2).also { it.addAll(kotlinClass.annotations) }
-                // modify for kotlin-android-extensions is abandoned and kotlin-parcelize is used
                 val classAnnotation = Annotation.fromAnnotationString("@Parcelize")
                 val newAnnotations = kotlinClass.annotations.plus(classAnnotation)
 

Diff for: src/main/kotlin/extensions/nstd/ReplaceConstructorParametersByMemberVariablesSupport.kt

@@ -1,12 +1,11 @@
 package extensions.nstd
 
 import extensions.Extension
-import wu.seal.jsontokotlin.model.builder.CodeBuilderConfig
-import wu.seal.jsontokotlin.model.builder.KotlinDataClassCodeBuilder
 import wu.seal.jsontokotlin.model.classscodestruct.DataClass
 import wu.seal.jsontokotlin.model.classscodestruct.KotlinClass
 import wu.seal.jsontokotlin.ui.jCheckBox
 import wu.seal.jsontokotlin.ui.jHorizontalLinearLayout
+import wu.seal.jsontokotlin.ui.jLink
 import javax.swing.JPanel
 
 /**
@@ -37,10 +36,14 @@ object ReplaceConstructorParametersByMemberVariablesSupport : Extension() {
 
         return jHorizontalLinearLayout {
             jCheckBox(
-                "Replace constructor parameters by member variables",
+                "",
                 getConfig(configKey).toBoolean(),
                 { isSelected -> setConfig(configKey, isSelected.toString()) }
             )
+            jLink(
+                "Replace constructor parameters by member variables",
+                "https://github.com/wuseal/JsonToKotlinClass/blob/master/src/main/kotlin/extensions/nstd/ReplaceConstructorParametersByMemberVariablesSupport.kt"
+            )
             fillSpace()
         }
     }

Diff for: src/main/kotlin/extensions/wu/seal/AddGsonExposeAnnotation.kt renamed to src/main/kotlin/extensions/wu/seal/AddGsonExposeAnnotationSupport.kt

@@ -10,14 +10,14 @@ import wu.seal.jsontokotlin.ui.jCheckBox
 import wu.seal.jsontokotlin.ui.jHorizontalLinearLayout
 import javax.swing.JPanel
 
-object AddGsonExposeAnnotation : Extension() {
+object AddGsonExposeAnnotationSupport : Extension() {
 
     @Expose
     val config_key = "wu.seal.add_gson_expose_annotation"
 
     override fun createUI(): JPanel {
         return jHorizontalLinearLayout {
-            jCheckBox("Add Gson Expose Annotation", config_key.booleanConfigValue) {
+            jCheckBox("Add Gson @Expose Annotation", config_key.booleanConfigValue) {
                 addSelectListener { setConfig(config_key, it.toString()) }
             }
             fillSpace()

Diff for: src/main/kotlin/extensions/yuan/varenyzc/BuildFromJsonObjectSupport.kt

@@ -1,8 +1,6 @@
 package extensions.yuan.varenyzc
 
 import extensions.Extension
-import wu.seal.jsontokotlin.model.builder.CodeBuilderConfig
-import wu.seal.jsontokotlin.model.builder.KotlinDataClassCodeBuilder
 import wu.seal.jsontokotlin.model.classscodestruct.DataClass
 import wu.seal.jsontokotlin.model.classscodestruct.KotlinClass
 import wu.seal.jsontokotlin.ui.jCheckBox
@@ -17,15 +15,13 @@ object BuildFromJsonObjectSupport : Extension() {
     override fun createUI(): JPanel {
         return jHorizontalLinearLayout {
             jCheckBox(
-                "Make a static function that can build from JSONObject",
+                "",
                 getConfig(configKey).toBoolean(),
                 { isSelected -> setConfig(configKey, isSelected.toString()) }
             )
-            add(
-                jLink(
-                    "Know about this extension",
-                    "https://github.com/wuseal/JsonToKotlinClass/blob/master/build_from_jsonobject_tip.md"
-                )
+            jLink(
+                "Make a static function that can build from JSONObject",
+                "https://github.com/wuseal/JsonToKotlinClass/blob/master/doc/build_from_jsonobject_tip.md"
             )
             fillSpace()
         }

Diff for: src/main/kotlin/extensions/yuan/varenyzc/CamelCaseSupport.kt

@@ -5,8 +5,6 @@ import wu.seal.jsontokotlin.model.classscodestruct.DataClass
 import wu.seal.jsontokotlin.model.classscodestruct.KotlinClass
 import wu.seal.jsontokotlin.ui.jCheckBox
 import wu.seal.jsontokotlin.ui.jHorizontalLinearLayout
-import wu.seal.jsontokotlin.utils.LogUtil
-import java.lang.StringBuilder
 import javax.swing.JPanel
 
 object CamelCaseSupport : Extension() {

Diff for: src/main/kotlin/extensions/yuan/varenyzc/NeedNonNullableClassesSupport.kt

@@ -1,5 +1,6 @@
 package extensions.yuan.varenyzc
 
+import com.intellij.util.ui.JBDimension
 import extensions.Extension
 import wu.seal.jsontokotlin.model.classscodestruct.DataClass
 import wu.seal.jsontokotlin.model.classscodestruct.KotlinClass
@@ -21,21 +22,18 @@ object NeedNonNullableClassesSupport : Extension() {
             }
         }
 
-        return jVerticalLinearLayout {
-            jHorizontalLinearLayout {
-                jCheckBox("Classes non-nullable: ", getConfig(prefixKeyEnable).toBoolean(), { isSelected ->
-                    setConfig(prefixKeyEnable, isSelected.toString())
-                    prefixJField.isEnabled = isSelected
-                })
-                add(prefixJField)
-            }
-            jHorizontalLinearLayout {
-                fixedSpace(30)
-                jLink("Know about this extension", "https://github.com/wuseal/JsonToKotlinClass/blob/master/classes_non_nullable.md")
-                fillSpace()
-            }
+        return jHorizontalLinearLayout {
+            jCheckBox("", getConfig(prefixKeyEnable).toBoolean(), { isSelected ->
+                setConfig(prefixKeyEnable, isSelected.toString())
+                prefixJField.isEnabled = isSelected
+            })
+            jLink(
+                text = "Classes non-nullable: ",
+                linkURL = "https://github.com/wuseal/JsonToKotlinClass/blob/master/doc/classes_non_nullable.md",
+                maxSize = JBDimension(160,30)
+            )
+            add(prefixJField)
         }
-
     }
 
     override fun intercept(kotlinClass: KotlinClass): KotlinClass {

Diff for: src/test/kotlin/extensions/wu/seal/AddGsonExposeAnnotationTest.kt

@@ -3,7 +3,6 @@ package extensions.wu.seal
 import com.winterbe.expekt.should
 import org.junit.Test
 
-import org.junit.Assert.*
 import wu.seal.jsontokotlin.generateKotlinClass
 import wu.seal.jsontokotlin.utils.BaseTest
 
@@ -18,14 +17,14 @@ class AddGsonExposeAnnotationTest : BaseTest() {
     """.trimIndent()
     @Test
     fun intercept() {
-        AddGsonExposeAnnotation.testHelper.setConfig(AddGsonExposeAnnotation.config_key, true.toString())
-        val result = json.generateKotlinClass().applyInterceptor(AddGsonExposeAnnotation).getCode()
+        AddGsonExposeAnnotationSupport.testHelper.setConfig(AddGsonExposeAnnotationSupport.config_key, true.toString())
+        val result = json.generateKotlinClass().applyInterceptor(AddGsonExposeAnnotationSupport).getCode()
         result.should.be.equal(expected)
     }
 
     @Test
     fun testIntercept() {
-        AddGsonExposeAnnotation.testHelper.setConfig(AddGsonExposeAnnotation.config_key, true.toString())
-        AddGsonExposeAnnotation.intercept("").should.equal("\nimport com.google.gson.annotations.Expose")
+        AddGsonExposeAnnotationSupport.testHelper.setConfig(AddGsonExposeAnnotationSupport.config_key, true.toString())
+        AddGsonExposeAnnotationSupport.intercept("").should.equal("\nimport com.google.gson.annotations.Expose")
     }
 }