Fix bug,support custom super interface name. update to 1.3

Author: longforus

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 
 
+## [v1.3](https://plugins.jetbrains.com/plugin/10907-mvpautocodeplus)(2018-11-27)
+- Fix bug.
+- Support custom super interface name..
+
 ## [v1.2](https://plugins.jetbrains.com/plugin/10907-mvpautocodeplus)(2018-11-27)
 
 - Add generate model checkbox state save.

build.gradle

@@ -14,7 +14,7 @@ plugins {
     id 'org.jetbrains.intellij' version '0.3.4'
 }
 
-version '1.2'
+version '1.3'
 group 'com.longforus'
 
 
@@ -52,6 +52,7 @@ if (!hasProperty('StudioCompilePath')) {
 intellij {
 //        version '2018.3'
         plugins 'org.jetbrains.kotlin:1.3.10-release-IJ2018.3-1' //here
+//        plugins 'org.jetbrains.kotlin:1.3.21-release-IJ2018.2-1' //here
     //    version '2018.2'
     //    plugins 'org.jetbrains.kotlin:1.2.61-release-IJ2018.2-1' //here
     //    version '2018.1'
@@ -74,7 +75,7 @@ dependencies {
 }
 
 patchPluginXml {
-    changeNotes """<h3>Add generate model checkbox state save,change file template format,fix bug</h3>
+    changeNotes """<h3>Fix bug,support custom super interface name. Thank you klxy1990 for your feedback.</h3>
 <br/>
 <a href="https://github.com/longforus/MvpAutoCodePlus/blob/master/CHANGELOG.md"><b>Full Changelog History</b></a>"""
 }

src/main/kotlin/com/longforus/mvpautocodeplus/MainAction.kt

@@ -77,7 +77,7 @@ class MainAction : AnAction("main", "auto make mvp code", PlatformIcons.CLASS_IC
             runWriteAction {
                 if (it.isJava) {
                     val contractJ = createFile(it.name, if (it.generateModel) CONTRACT_TP_NAME_JAVA else CONTRACT_TP_NO_MODEL_NAME_JAVA, getSubDir(dir, CONTRACT),
-                        "") as PsiJavaFile
+                        "")
                     if (!it.vImpl.isEmpty() && !it.vImpl.startsWith(IS_NOT_SET)) {
                         val sdV = getSubDir(dir, VIEW)
                         if (it.isActivity) {

src/main/kotlin/com/longforus/mvpautocodeplus/TemplateCons.java

@@ -10,21 +10,21 @@ public interface TemplateCons {
     String CONTRACT_TP_CONTENT_JAVA =
         "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME};#end\n" + "\n" + "import ${V};\n" + "import ${P};\n" + "import ${M};\n" + "/**\n" + " * @describe \n" +
             " * @author  ${USER}\n" + " * @date ${DATE}  ${TIME}\n" + " * \t\t\t\t\t\t\t\t - generate by MvpAutoCodePlus plugin.\n" + " */\n" + "\n" +
-            "public interface I${NAME}Contract {\n" + "    interface View extends IView${VG}{}\n" + "    interface Presenter extends IPresenter${PG}{}\n" +
-            "    interface Model extends IModel${MG}{}\n" + "}\n";
+            "public interface I${NAME}Contract {\n" + "    interface View extends ${VN}${VG}{}\n" + "    interface Presenter extends ${PN}${PG}{}\n" +
+            "    interface Model extends ${MN}${MG}{}\n" + "}\n";
     String CONTRACT_TP_CONTENT_NO_MODEL_JAVA =
         "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME};#end\n" + "\n" + "import ${V};\n" + "import ${P};\n" + "/**\n" + " * @describe \n" + " * @author  ${USER}\n" +
             " * @date ${DATE}  ${TIME}\n" + " * \t\t\t\t\t\t\t\t - generate by MvpAutoCodePlus plugin.\n" + " */\n" + "\n" + "public interface I${NAME}Contract {\n" +
-            "    interface View extends IView${VG}{}\n" + "    interface Presenter extends IPresenter${PG}{}\n" + "}\n";
+            "    interface View extends ${VN}${VG}{}\n" + "    interface Presenter extends ${PN}${PG}{}\n" + "}\n";
 
     String CONTRACT_TP_CONTENT_KOTLIN =
         "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME}#end\n" + "\n" + "import ${V}\n" + "import ${P}\n" + "import ${M}\n" + "/**\n" + " * @describe \n" +
             " * @author  ${USER}\n" + " * @date ${DATE}  ${TIME}\n" + " * \t\t\t\t\t\t\t\t - generate by MvpAutoCodePlus plugin.\n" + " */\n" + "\n" + "interface ${NAME} {\n" +
-            "    interface View : IView${VG}{}\n" + "    interface Presenter : IPresenter${PG}{}\n" + "    interface Model : IModel${MG}{}\n" + "}\n";
+            "    interface View : ${VN}${VG}{}\n" + "    interface Presenter : ${PN}${PG}{}\n" + "    interface Model : ${MN}${MG}{}\n" + "}\n";
     String CONTRACT_TP_CONTENT_NO_MODEL_KOTLIN =
         "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME}#end\n" + "\n" + "import ${V}\n" + "import ${P}\n" + "/**\n" + " * @describe \n" + " * @author  ${USER}\n" +
             " * @date ${DATE}  ${TIME}\n" + " * \t\t\t\t\t\t\t\t - generate by MvpAutoCodePlus plugin.\n" + " */\n" + "\n" + "interface ${NAME} {\n" +
-            "    interface View : IView${VG}{}\n" + "    interface Presenter : IPresenter${PG}{}\n" + "}\n";
+            "    interface View : ${VN}${VG}{}\n" + "    interface Presenter : ${PN}${PG}{}\n" + "}\n";
 
     String COMMON_IMPL_TP_CONTENT_JAVA =
         "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME};#end\n" + "\n" + "import ${CONTRACT};\n" + "#if (${IMPL} != \"\")import ${IMPL};#end\n" + "\n" + "\n" + "/**\n" +

src/main/kotlin/com/longforus/mvpautocodeplus/maker/TemplateParamFactory.kt

@@ -28,6 +28,10 @@ object TemplateParamFactory {
                 liveTemplateParam["V"] = superVNameNoGeneric
                 liveTemplateParam["M"] = superMNameNoGeneric
                 liveTemplateParam["P"] = superPNameNoGeneric
+                liveTemplateParam["VN"] = superVNameNoGeneric?.substring(superVNameNoGeneric.lastIndexOf('.')+1..(superVNameNoGeneric.length-1))?: "IView"
+                liveTemplateParam["MN"] = superMNameNoGeneric?.substring(superMNameNoGeneric.lastIndexOf('.')+1..(superMNameNoGeneric.length-1))?: "IModel"
+                liveTemplateParam["PN"] = superPNameNoGeneric?.substring(superPNameNoGeneric.lastIndexOf('.')+1..(superPNameNoGeneric.length-1))?: "IPresenter"
+
                 liveTemplateParam["VG"] = superVGenericValue
                 liveTemplateParam["PG"] = superPGenericValue
                 liveTemplateParam["MG"] = superMGenericValue
@@ -102,14 +106,14 @@ object TemplateParamFactory {
             Messages.showErrorDialog("Super Interface name is null !", "Error")
             throw IllegalArgumentException("Super Interface name is null !")
         }
-        val indexOf = setValue?.indexOf("<") ?: -1
+        val indexOf = setValue.indexOf("<")
         var generic = ""
         var resultName = setValue
         if (indexOf > -1) {
-            resultName = setValue?.substring(0, indexOf)
-            val g = setValue?.substring(indexOf, setValue.length)
+            resultName = setValue.substring(0, indexOf)
+            val g = setValue.substring(indexOf, setValue.length)
             val sb = StringBuilder()
-            g?.forEach {
+            g.forEach {
                 when (it) {
                     "V"[0] -> sb.append(if (isContract) "View" else "${getContractName(enterName)}.View")
                     "P"[0] -> sb.append(if (isContract) "Presenter" else "${getContractName(enterName)}.Presenter")