Merge pull request #214 from wuseal/3.4.0

3.4.0 Released merge it back to Master

Author: wuseal

build.gradle

@@ -20,7 +20,7 @@ apply plugin: 'kotlin'
 apply plugin: 'org.jetbrains.intellij'
 
 group 'wu.seal'
-version '3.4.0-EAP-2'
+version '3.4.0'
 
 intellij {
     version '2017.1'

src/main/kotlin/wu/seal/jsontokotlin/feedback/Actions.kt

@@ -11,6 +11,7 @@ import java.util.*
 const val ACTION_START = "action_start"
 const val ACTION_SUCCESS_COMPLETE = "action_success_complete"
 const val ACTION_FORMAT_JSON = "action_format_json"
+const val ACTION_CLICK_PROJECT_URL = "action_click_project_url"
 
 data class StartAction(
     val uuid: String = UUID,
@@ -34,4 +35,12 @@ data class FormatJSONAction(
     val actionType: String = ACTION_FORMAT_JSON,
     val time: String = Date().time.toString(),
     val daytime: String = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).format(Date())
+)
+
+data class ClickProjectURLAction(
+        val uuid: String = UUID,
+        val pluginVersion: String = PLUGIN_VERSION,
+        val actionType: String = ACTION_CLICK_PROJECT_URL,
+        val time: String = Date().time.toString(),
+        val daytime: String = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).format(Date())
 )

src/main/kotlin/wu/seal/jsontokotlin/feedback/NetWork.kt

@@ -48,43 +48,45 @@ fun sendHistoryActionInfo() {
 }
 
 fun sendData(url: String, log: String) {
-    try {
-        with(URL(url).openConnection() as HttpURLConnection) {
-            when (url) {
-                actionInfoUrl, configLogUrl -> {
-                    doOutput = true
-                    requestMethod = "POST"
-                    addRequestProperty("Content-Type", "application/json;charset=UTF-8")
+    Thread {
+        try {
+            with(URL(url).openConnection() as HttpURLConnection) {
+                when (url) {
+                    actionInfoUrl, configLogUrl -> {
+                        doOutput = true
+                        requestMethod = "POST"
+                        addRequestProperty("Content-Type", "application/json;charset=UTF-8")
+                    }
+
+                    exceptionLogUrl -> {
+                        doOutput = true
+                        doInput = true
+                        addRequestProperty("Content-Type", "application/text")
+                    }
                 }
-
-                exceptionLogUrl -> {
-                    doOutput = true
-                    doInput = true
-                    addRequestProperty("Content-Type", "application/text")
+                outputStream.use {
+                    val writer = it.writer()
+                    writer.write(log)
+                    writer.flush()
                 }
+                if (responseCode != HttpURLConnection.HTTP_OK) {
+                    val a = responseMessage + "\n" + errorStream.use { it.reader().readText() }
+                    println(a)
+                }
+                disconnect()
             }
-            outputStream.use {
-                val writer = it.writer()
-                writer.write(log)
-                writer.flush()
-            }
-            if (responseCode != HttpURLConnection.HTTP_OK) {
-                val a = responseMessage + "\n" + errorStream.use { it.reader().readText() }
-                println(a)
-            }
-            disconnect()
-        }
-    } catch (e: Exception) {
+        } catch (e: Exception) {
 
-        e.printStackTrace()
+            e.printStackTrace()
 
-        when (url) {
+            when (url) {
 
-            actionInfoUrl -> PersistCache.saveActionInfo(log)
+                actionInfoUrl -> PersistCache.saveActionInfo(log)
 
-            exceptionLogUrl -> PersistCache.saveExceptionInfo(log)
+                exceptionLogUrl -> PersistCache.saveExceptionInfo(log)
 
-            else -> Unit//Do nothing
+                else -> Unit//Do nothing
+            }
         }
-    }
+    }.start()
 }

src/main/kotlin/wu/seal/jsontokotlin/ui/JsonInputDialog.kt

@@ -15,6 +15,7 @@ import com.intellij.openapi.util.IconLoader
 import com.intellij.ui.components.JBLabel
 import com.intellij.util.ui.JBDimension
 import com.intellij.util.ui.JBEmptyBorder
+import wu.seal.jsontokotlin.feedback.ClickProjectURLAction
 import wu.seal.jsontokotlin.feedback.FormatJSONAction
 import wu.seal.jsontokotlin.feedback.sendActionInfo
 import wu.seal.jsontokotlin.utils.addComponentIntoVerticalBoxAlignmentLeft
@@ -198,6 +199,7 @@ class JsonInputDialog(classsName: String, private val project: Project) : Messag
 
         projectLink.addMouseListener(object : MouseAdapter() {
             override fun mouseClicked(e: MouseEvent?) {
+                sendActionInfo(prettyGson.toJson(ClickProjectURLAction()))
                 Desktop.getDesktop().browse(URI("https://github.com/wuseal/JsonToKotlinClass"))
             }