add class chooser support

Author: longforus

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 
 
+## [v1.0-beat2](https://plugins.jetbrains.com/plugin/10907-mvpautocodeplus)(2018-7-9)
+
+- 添加配置界面的Class选择支持
+
 ## [v1.0-beat1](https://plugins.jetbrains.com/plugin/10907-mvpautocodeplus)(2018-7-5)
 
 - 结合新版的mvp接口做出调整

README.md

@@ -39,13 +39,21 @@ MvpAutoCodePlus
 
 1. 配置父接口:
 
-   -  <kbd>File</kbd> > <kbd>Preferences(Settings)</kbd> > <kbd>Other Settings</kbd> > <kbd>MvpAutoCodePlus</kbd> > 
+   - <kbd>File</kbd> > <kbd>Preferences(Settings)</kbd> > <kbd>Other Settings</kbd> > <kbd>MvpAutoCodePlus</kbd> > 
 
      ![settings](./images/settings.png)
-     
+
      基于[`这一套Java接口`][my_interface_java]的配置示例:
      ![settings1](./images/settings1.png)
 
+     项目内的Class已经在V1.0beta2支持选择,但是如果有泛型限定的话,泛型还是需要手动添加,比如选择的类签名为:**com.longforus.base.java.BasePresenterJv<V extends IView,M extends IModel>**
+
+     ![use3](./images/use3.png)
+
+     需要手动添加后面的泛型限定<V,M>:
+
+     ![use4](./images/use4.png)
+
 2. 生成:
 
    ![use1](./images/use1.png)
@@ -68,7 +76,7 @@ MvpAutoCodePlus
 
 ## 存在问题
 
-- 父接口和父类的输入比较麻烦,还没有找到能在设置界面选择项目中的class的方法,好在只用设置一次就可保存了,项目中也不会经常变动.
+- 父接口和父类如果有泛型限定在选择后还需要手动输入泛型,好在只用设置一次就可保存了,项目中也不会经常变动.
 - 其他未知问题,此插件是作者首次开发插件,完全从0开始,官方的文档不是很详细,英语水平更是不堪,国内的参考资料也不多,做这个纯粹是忽然想到了,就开始做了.难免有未尽之处,欢迎各位star,issue.
 
 

build.gradle

@@ -15,7 +15,7 @@ plugins {
 }
 
 group 'com.longforus'
-version '1.0-beta1'
+version '1.0-beta2'
 
 apply plugin: 'java'
 apply plugin: 'kotlin'
@@ -58,12 +58,7 @@ publishPlugin {
     password publishPassword
 }
 
-//
-//patchPluginXml {
-//    changeNotes """第一版盛大发布<br>
-//init first version.
-//      """
-//}
+
 
 
 //指定编译的编码

images/use3.png

@@ -243,7 +243,7 @@
           <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value=" 实现类支持指定多个,用 ; 隔开. class的直接选择功能还未实现,望大佬指点."/>
+          <text value=" 实现类支持指定多个,用 ; 隔开. 如果需要泛型限定,选择Class后需要手动添加."/>
         </properties>
       </component>
       <component id="8eb09" class="com.intellij.ui.components.labels.LinkLabel" binding="lk_look_detail">

images/use4.png

@@ -1,16 +1,16 @@
 package com.longforus.mvpautocodeplus.config
 
-import com.intellij.icons.AllIcons
 import com.intellij.ide.BrowserUtil
+import com.intellij.ide.util.TreeClassChooserFactory
 import com.intellij.openapi.components.ServiceManager
-import com.intellij.openapi.fileChooser.FileChooserDescriptor
 import com.intellij.openapi.options.SearchableConfigurable
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
-import com.intellij.openapi.ui.Messages
 import com.longforus.mvpautocodeplus.*
 import com.longforus.mvpautocodeplus.ui.ConfigForm
+import javax.swing.JButton
 import javax.swing.JComponent
+import javax.swing.JTextField
 
 /**
  * Created by XQ Yang on 2018/6/25  14:12.
@@ -25,15 +25,15 @@ class ConfigComponent : SearchableConfigurable {
 
     private val mCp: ConfigForm by lazy { ConfigForm() }
     private val state: PersistentState by lazy { ServiceManager.getService(PersistentState::class.java) }
-    private val fcd = FileChooserDescriptor(true, false, false, false, false, false)
 
-    private val project: Project by lazy {
+    private val mProject: Project by lazy {
         if (ProjectManager.getInstance().openProjects.isNotEmpty()) {
             ProjectManager.getInstance().openProjects[0]
         } else {
             ProjectManager.getInstance().defaultProject
         }
     }
+    private val classChooserFactory by lazy { TreeClassChooserFactory.getInstance(mProject) }
 
     override fun isModified(): Boolean {
         return mCp.tv_v_name.text != state.getValue(SUPER_VIEW) ||
@@ -61,28 +61,41 @@ class ConfigComponent : SearchableConfigurable {
         state.setValue(COMMENT_AUTHOR, mCp.et_comment_author.text)
     }
 
+
     override fun createComponent(): JComponent? {
-        val value = state.getValue(SUPER_VIEW)
-        mCp.tv_v_name.text = value
-        // TODO: 2018/7/2  实现class选择  http://www.jetbrains.org/intellij/sdk/docs/user_interface_components/file_and_class_choosers.html?search=File
-//        val dialogImpl = FileChooserDialogImpl(fcd, project)
-//        val split = value?.split(";")
-//        project.projectFile.findChild()
-        mCp.btn_view_select.addActionListener {
-            //            val choose = dialogImpl.choose(project, null)
-            Messages.showMessageDialog("还没有找到合适的方法来实现class的选择", "待开发", AllIcons.General.ErrorDialog)
-        }
+        mCp.tv_v_name.text = state.getValue(SUPER_VIEW)
+        setClassChooser(mCp.btn_view_select, "Select Super View Interface", mCp.tv_v_name)
         mCp.tv_p_name.text = state.getValue(SUPER_PRESENTER)
+        setClassChooser(mCp.btn_p_select, "Select Super Presenter Interface", mCp.tv_p_name)
         mCp.tv_m_name.text = state.getValue(SUPER_MODEL)
+        setClassChooser(mCp.btn_m_select, "Select Super Model Interface", mCp.tv_m_name)
         mCp.tv_view_activity.text = state.getValue(SUPER_VIEW_ACTIVITY)
+        setClassChooser(mCp.btn_view_a_select, "Select View extends super Activity", mCp.tv_view_activity, true)
         mCp.tv_view_fragment.text = state.getValue(SUPER_VIEW_FRAGMENT)
+        setClassChooser(mCp.btn_view_f_select, "Select View extends super Fragment", mCp.tv_view_fragment, true)
         mCp.tv_presenter_impl.text = state.getValue(SUPER_PRESENTER_IMPL)
+        setClassChooser(mCp.btn_pi_select, "Select Presenter extends super Class", mCp.tv_presenter_impl, true)
         mCp.tv_model_impl.text = state.getValue(SUPER_MODEL_IMPL)
+        setClassChooser(mCp.btn_mi_select, "Select Model extends super Class", mCp.tv_model_impl, true)
         mCp.et_comment_author.text = state.getValue(COMMENT_AUTHOR)
         mCp.lk_look_detail.setListener({ _, _ ->
             BrowserUtil.browse("https://github.com/longforus/MvpAutoCodePlus/blob/master/README.md")
         }, "https://github.com/longforus")
         return mCp.mPanel
     }
 
+    private fun setClassChooser(jButton: JButton?, title: String, tv: JTextField?, append: Boolean = false) {
+        jButton?.addActionListener {
+            val projectScopeChooser = classChooserFactory.createProjectScopeChooser(title)
+            projectScopeChooser.showDialog()
+            if (projectScopeChooser.selected != null) {
+                if (append && !tv?.text.isNullOrEmpty()) {
+                    tv?.text = "${tv?.text};${projectScopeChooser.selected.qualifiedName}"
+                } else {
+                    tv?.text = projectScopeChooser.selected.qualifiedName
+                }
+            }
+        }
+    }
+
 }