feat: update gui (#578)

tangcent · Sep 5, 2021 · c4c9c19 · c4c9c19
1 parent 36b3388
commit c4c9c19
Show file tree

Hide file tree

Showing 22 changed files with 1,838 additions and 1,440 deletions.
diff --git a/idea-plugin/build.gradle b/idea-plugin/build.gradle
@@ -31,7 +31,7 @@ intellij {
     updateSinceUntilBuild false
     sameSinceUntilBuild false
 
-    plugins "org.jetbrains.kotlin:1.3.11-release-IJ2017.3-1"
+    //plugins "org.jetbrains.kotlin:1.3.11-release-IJ2017.3-1"
     //plugins "org.jetbrains.kotlin:1.3.11-release-IJ2017.3-1", "org.intellij.scala:2017.3.11"
     //plugins 'org.jetbrains.kotlin:1.3.21-release-IJ2018.2-1' //dependency kotlin
 

diff --git a/...dea/plugin/actions/EasyApiConfigurable.kt → ...nfigurable/AbstractEasyApiConfigurable.kt b/...dea/plugin/actions/EasyApiConfigurable.kt → ...nfigurable/AbstractEasyApiConfigurable.kt
@@ -1,13 +1,10 @@
-package com.itangcent.idea.plugin.actions
+package com.itangcent.idea.plugin.configurable
 
 import com.google.inject.Inject
 import com.intellij.openapi.options.SearchableConfigurable
 import com.intellij.openapi.project.Project
 import com.itangcent.idea.plugin.api.export.core.EasyApiConfigReader
-import com.itangcent.idea.plugin.dialog.EasyApiSettingGUI
 import com.itangcent.idea.plugin.settings.SettingBinder
-import com.itangcent.idea.plugin.settings.helper.MemoryPostmanSettingsHelper
-import com.itangcent.idea.plugin.settings.helper.PostmanSettingsHelper
 import com.itangcent.intellij.config.ConfigReader
 import com.itangcent.intellij.context.ActionContext
 import com.itangcent.intellij.extend.guice.singleton
@@ -20,34 +17,28 @@ import com.itangcent.suv.http.ConfigurableHttpClientProvider
 import com.itangcent.suv.http.HttpClientProvider
 import javax.swing.JComponent
 
-class EasyApiConfigurable(private var myProject: Project?) : SearchableConfigurable {
+abstract class AbstractEasyApiConfigurable(private var myProject: Project?) : SearchableConfigurable {
 
-    private var easyApiConfigurableGUI: EasyApiSettingGUI? = null
+    private lateinit var easyApiConfigurableGUI: EasyApiSettingGUI
 
     @Inject
     private lateinit var settingBinder: SettingBinder
 
     override fun isModified(): Boolean {
-        return settingBinder.read() != easyApiConfigurableGUI?.getSettings()
-    }
-
-    override fun getId(): String {
-        return "preference.EasyApiConfigurable"
-    }
-
-    override fun getDisplayName(): String {
-        return "EasyApi"
+        return settingBinder.read() != easyApiConfigurableGUI.getSettings()
     }
 
     override fun apply() {
-        settingBinder.save(easyApiConfigurableGUI!!.getSettings().copy())
+        settingBinder.read()
+            .also { easyApiConfigurableGUI.readSettings(it) }
+            .let { settingBinder.save(it) }
     }
 
     private var context: ActionContext? = null
 
     override fun createComponent(): JComponent? {
 
-        LOG.info("create component of EasyApiConfigurable")
+        LOG.info("create component of ${this::class.qualifiedName}")
 
         val builder = ActionContext.builder()
 
@@ -57,28 +48,33 @@ class EasyApiConfigurable(private var myProject: Project?) : SearchableConfigura
         builder.bind(HttpClientProvider::class) { it.with(ConfigurableHttpClientProvider::class).singleton() }
         builder.bind(ConfigReader::class) { it.with(EasyApiConfigReader::class).singleton() }
         builder.bind(LocalFileRepository::class) { it.with(DefaultLocalFileRepository::class).singleton() }
-        builder.bind(PostmanSettingsHelper::class) { it.with(MemoryPostmanSettingsHelper::class).singleton() }
+
+        afterBuildActionContext(builder)
 
         val context = builder.build()
 
         this.context = context
 
         context.init(this)
 
-        easyApiConfigurableGUI = EasyApiSettingGUI()
+        easyApiConfigurableGUI = createGUI()
 
-        context.init(easyApiConfigurableGUI!!)
+        context.init(easyApiConfigurableGUI)
         context.runAsync {
             context.runInSwingUI {
-                easyApiConfigurableGUI!!.onCreate()
-                easyApiConfigurableGUI!!.setSettings(settingBinder.read().copy())
+                easyApiConfigurableGUI.onCreate()
+                easyApiConfigurableGUI.setSettings(settingBinder.read().copy())
             }
         }
-        return easyApiConfigurableGUI!!.getRootPanel()
+        return easyApiConfigurableGUI.getRootPanel()
     }
 
+    open fun afterBuildActionContext(builder: ActionContext.ActionContextBuilder) {}
+
+    protected abstract fun createGUI(): EasyApiSettingGUI
+
     override fun reset() {
-        easyApiConfigurableGUI!!.setSettings(settingBinder.read().copy())
+        easyApiConfigurableGUI.setSettings(settingBinder.read().copy())
     }
 
     override fun disposeUIResources() {
@@ -87,7 +83,7 @@ class EasyApiConfigurable(private var myProject: Project?) : SearchableConfigura
     }
 
     init {
-        LOG.info("create instance of EasyApiConfigurable")
+        LOG.info("create instance of ${this::class.qualifiedName}")
     }
 }
 

diff --git a/...lugin/src/main/kotlin/com/itangcent/idea/plugin/configurable/AbstractEasyApiSettingGUI.kt b/...lugin/src/main/kotlin/com/itangcent/idea/plugin/configurable/AbstractEasyApiSettingGUI.kt
@@ -0,0 +1,27 @@
+package com.itangcent.idea.plugin.configurable
+
+import com.itangcent.idea.plugin.settings.Settings
+import com.itangcent.intellij.extend.rx.AutoComputer
+import javax.swing.JComponent
+
+abstract class AbstractEasyApiSettingGUI : EasyApiSettingGUI {
+
+    protected var settingsInstance: Settings? = null
+
+    protected var autoComputer: AutoComputer = AutoComputer()
+
+    override fun getSettings(): Settings {
+        return (settingsInstance ?: Settings()).copy()
+    }
+
+    override fun setSettings(settings: Settings) {
+        autoComputer.value(this::settingsInstance, settings.copy())
+    }
+
+    override fun readSettings(settings: Settings) {
+        this.settingsInstance?.let { readSettings(settings, it) }
+
+    }
+
+    protected abstract fun readSettings(settings: Settings, from: Settings)
+}
diff --git a/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/configurable/EasyApiConfigurable.kt b/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/configurable/EasyApiConfigurable.kt
@@ -0,0 +1,35 @@
+package com.itangcent.idea.plugin.configurable
+
+import com.intellij.openapi.project.Project
+import com.itangcent.idea.plugin.api.export.core.EasyApiConfigReader
+import com.itangcent.idea.plugin.dialog.EasyApiSettingGUI
+import com.itangcent.idea.plugin.settings.helper.MemoryPostmanSettingsHelper
+import com.itangcent.idea.plugin.settings.helper.PostmanSettingsHelper
+import com.itangcent.intellij.config.ConfigReader
+import com.itangcent.intellij.context.ActionContext
+import com.itangcent.intellij.extend.guice.singleton
+import com.itangcent.intellij.extend.guice.with
+import com.itangcent.intellij.file.DefaultLocalFileRepository
+import com.itangcent.intellij.file.LocalFileRepository
+import com.itangcent.suv.http.ConfigurableHttpClientProvider
+import com.itangcent.suv.http.HttpClientProvider
+
+class EasyApiConfigurable(myProject: Project?) : AbstractEasyApiConfigurable(myProject) {
+
+    override fun getId(): String {
+        return "preference.EasyApiConfigurable"
+    }
+
+    override fun getDisplayName(): String {
+        return "EasyApi"
+    }
+
+    override fun createGUI(): com.itangcent.idea.plugin.configurable.EasyApiSettingGUI {
+        return EasyApiSettingGUI()
+    }
+
+    override fun afterBuildActionContext(builder: ActionContext.ActionContextBuilder) {
+        super.afterBuildActionContext(builder)
+        builder.bind(PostmanSettingsHelper::class) { it.with(MemoryPostmanSettingsHelper::class).singleton() }
+    }
+}
diff --git a/...plugin/src/main/kotlin/com/itangcent/idea/plugin/configurable/EasyApiOtherConfigurable.kt b/...plugin/src/main/kotlin/com/itangcent/idea/plugin/configurable/EasyApiOtherConfigurable.kt
@@ -0,0 +1,19 @@
+package com.itangcent.idea.plugin.configurable
+
+import com.intellij.openapi.project.Project
+import com.itangcent.idea.plugin.dialog.EasyApiSettingOtherGUI
+
+class EasyApiOtherConfigurable(myProject: Project?) : AbstractEasyApiConfigurable(myProject) {
+
+    override fun getId(): String {
+        return "preference.EasyApiConfigurable.Other"
+    }
+
+    override fun getDisplayName(): String {
+        return "Other"
+    }
+
+    override fun createGUI(): EasyApiSettingGUI {
+        return EasyApiSettingOtherGUI()
+    }
+}
diff --git a/...in/src/main/kotlin/com/itangcent/idea/plugin/configurable/EasyApiRecommendConfigurable.kt b/...in/src/main/kotlin/com/itangcent/idea/plugin/configurable/EasyApiRecommendConfigurable.kt
@@ -0,0 +1,19 @@
+package com.itangcent.idea.plugin.configurable
+
+import com.intellij.openapi.project.Project
+import com.itangcent.idea.plugin.dialog.EasyApiSettingRecommendGUI
+
+class EasyApiRecommendConfigurable(myProject: Project?) : AbstractEasyApiConfigurable(myProject) {
+
+    override fun getId(): String {
+        return "preference.EasyApiConfigurable.Recommend"
+    }
+
+    override fun getDisplayName(): String {
+        return "Recommend"
+    }
+
+    override fun createGUI(): EasyApiSettingGUI {
+        return EasyApiSettingRecommendGUI()
+    }
+}
diff --git a/.../kotlin/com/itangcent/idea/plugin/configurable/EasyApiSettingBuiltInConfigConfigurable.kt b/.../kotlin/com/itangcent/idea/plugin/configurable/EasyApiSettingBuiltInConfigConfigurable.kt
@@ -0,0 +1,19 @@
+package com.itangcent.idea.plugin.configurable
+
+import com.intellij.openapi.project.Project
+import com.itangcent.idea.plugin.dialog.EasyApiSettingBuiltInConfigGUI
+
+class EasyApiSettingBuiltInConfigConfigurable(myProject: Project?) : AbstractEasyApiConfigurable(myProject) {
+
+    override fun getId(): String {
+        return "preference.EasyApiConfigurable.BuiltInConfig"
+    }
+
+    override fun getDisplayName(): String {
+        return "BuiltInConfig"
+    }
+
+    override fun createGUI(): EasyApiSettingGUI {
+        return EasyApiSettingBuiltInConfigGUI()
+    }
+}
diff --git a/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/configurable/EasyApiSettingGUI.kt b/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/configurable/EasyApiSettingGUI.kt
@@ -0,0 +1,16 @@
+package com.itangcent.idea.plugin.configurable
+
+import com.itangcent.idea.plugin.settings.Settings
+import javax.swing.JComponent
+
+interface EasyApiSettingGUI {
+    fun getRootPanel(): JComponent?
+
+    fun onCreate()
+
+    fun getSettings(): Settings
+
+    fun setSettings(settings: Settings)
+
+    fun readSettings(settings: Settings)
+}