beautify config settings dialog layout

optimize some code logic

Author: seal

src/wu/seal/jsontokotlin/ConfigSettingDialog.kt

@@ -20,7 +20,6 @@ interface IConfigSettingDialog {
 
 }
 
-//todo : change the tab of TargetJson Lib postion to make it more pre
 class ConfigSettingDialog(canBeParent: Boolean) : DialogWrapper(canBeParent), IConfigSettingDialog {
 
     init {

src/wu/seal/jsontokotlin/JsonToKotlinApplication.kt

@@ -1,8 +1,6 @@
 package wu.seal.jsontokotlin
 
 import com.intellij.openapi.components.ApplicationComponent
-import com.intellij.openapi.ui.Messages
-import wu.seal.jsontokotlin.statistics.handlerException
 import wu.seal.jsontokotlin.statistics.sendHistoryExceptionInfo
 import wu.seal.jsontokotlin.statistics.sendHistoryActionInfo
 

src/wu/seal/jsontokotlin/MakeKotlinClassAction.kt

@@ -10,7 +10,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.Messages
 import wu.seal.jsontokotlin.statistics.StartAction
 import wu.seal.jsontokotlin.statistics.SuccessCompleteAction
-import wu.seal.jsontokotlin.statistics.handlerException
+import wu.seal.jsontokotlin.statistics.getUncaughtExceptionHandler
 import wu.seal.jsontokotlin.statistics.sendActionInfo
 
 import java.util.IllegalFormatFlagsException
@@ -60,7 +60,7 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
             }
 
             executeCouldRollBackAction(project) {
-                var offset = 0
+                var offset: Int
 
                 if (caret != null) {
 
@@ -77,7 +77,7 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
             Messages.showMessageDialog(project, "Kotlin Code insert successfully!", "Information", Messages.getInformationIcon())
             sendActionInfo(gson.toJson(SuccessCompleteAction()))
         } catch(e: Exception) {
-            handlerException(jsonString) {
+            getUncaughtExceptionHandler(jsonString) {
                 Messages.showErrorDialog("I am sorry,JsonToKotlin may occur a RuntimeException,You could try again later or recover to the old version", "Occur a fatal error")
             }.uncaughtException(Thread.currentThread(), e)
         }

src/wu/seal/jsontokotlin/Panel.kt

@@ -1,5 +1,8 @@
 package wu.seal.jsontokotlin
 
+import com.intellij.util.ui.JBDimension
+import com.intellij.util.ui.JBUI
+import com.intellij.util.xml.ui.TextPanel
 import java.awt.*
 import javax.swing.*
 import javax.swing.border.EmptyBorder
@@ -21,7 +24,8 @@ class PropertyPanel(layout: LayoutManager?, isDoubleBuffered: Boolean) : JPanel(
 
         val boxLayout = BoxLayout(this, BoxLayout.PAGE_AXIS)
         setLayout(boxLayout)
-        border = EmptyBorder(10, 10, 10, 10)
+        val bordWidth = JBUI.scale(10)
+        border = EmptyBorder(bordWidth, bordWidth, bordWidth, bordWidth)
 
         val keywordLable = JLabel("Keyword")
 
@@ -56,11 +60,10 @@ class PropertyPanel(layout: LayoutManager?, isDoubleBuffered: Boolean) : JPanel(
         add(Box.createVerticalStrut(20))
 
 
-        val line = JPanel()
-        line.maximumSize = Dimension(1000, 1)
-        line.minimumSize = Dimension(500, 1)
-        line.preferredSize = Dimension(800, 1)
-        line.background = Color.BLACK
+        val line = TextPanel()
+        line.maximumSize = JBDimension(480, 1)
+        line.minimumSize = JBDimension(480, 1)
+        line.background = Color.GRAY
 
         add(line)
 
@@ -103,9 +106,9 @@ class CommentConfigPanel(layout: LayoutManager?, isDoubleBuffered: Boolean) : JP
 
     init {
 
-        border = EmptyBorder(10, 10, 10, 10)
-
-        setLayout(GridLayout(5, 1, 10, 10))
+        val bordWidth = JBUI.scale(10)
+        border = EmptyBorder(bordWidth, bordWidth, bordWidth, bordWidth)
+        setLayout(GridLayout(6, 1, 10, 10))
 
         val radioButtonOpen = JRadioButton("On")
 
@@ -145,9 +148,10 @@ class TargetJsonLibConfigPanel(layout: LayoutManager?, isDoubleBuffered: Boolean
 
     init {
 
-        border = EmptyBorder(10, 10, 10, 10)
+        val bordWidth = JBUI.scale(10)
+        border = EmptyBorder(bordWidth, bordWidth, bordWidth, bordWidth)
 
-        setLayout(GridLayout(5, 1, 10, 10))
+        setLayout(GridLayout(6, 1, 10, 10))
 
         val radioButtonNone = JRadioButton("None")
 

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

@@ -10,7 +10,7 @@ import java.util.*
  */
 
 const val ACTION_START = "action_start"
-const val ACTION_SUCCESS_COMPLETE = "action_sucess_complete"
+const val ACTION_SUCCESS_COMPLETE = "action_success_complete"
 
 data class StartAction(
         val uuid: String = UUID,

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

@@ -15,7 +15,7 @@ import java.util.*
 /**
  * handler the exception
  */
-fun handlerException(jsonString: String, callBack: () -> Unit): Thread.UncaughtExceptionHandler = Thread.UncaughtExceptionHandler { t, e ->
+fun getUncaughtExceptionHandler(jsonString: String, callBack: () -> Unit): Thread.UncaughtExceptionHandler = Thread.UncaughtExceptionHandler { _, e ->
     val logBuilder = StringBuilder()
     logBuilder.append("PluginVersion:$PLUGIN_VERSION\n")
     logBuilder.append("user: $UUID").append("\n")

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

@@ -57,7 +57,7 @@ fun sendHistoryExceptionInfo() {
         PersistCache.readAllCachedExceptionInfo().split("#").filter { it.isNotBlank() }.forEach {
             sendExceptionLog(it)
         }
-    }
+    }.start()
     PersistCache.deleteAllExceptionInfoCache()
 }
 

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

@@ -57,7 +57,9 @@ object PersistCache : IPersistCache {
     override fun readAllCachedExceptionInfo(): String {
         val builder = StringBuilder()
         exceptionDir.listFiles().forEach {
-            builder.append(it.readText()).append("#")
+            if (it.exists()) {
+                builder.append(it.readText()).append("#")
+            }
         }
         return builder.toString()
     }
@@ -73,12 +75,15 @@ object PersistCache : IPersistCache {
     override fun readAllCachedActionInfo(): String {
         val builder = StringBuilder()
         actionDir.listFiles().forEach {
-            builder.append(it.readText()).append("#")
+            if (it.exists()) {
+                builder.append(it.readText()).append("#")
+            }
         }
         return builder.toString()
     }
 
     override fun deleteAllActionInfo() {
+        actionDir.listFiles().forEach { it.delete() }
     }
 
 }