add generate model checkbox state save

Author: longforus

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.61'
+    ext.kotlin_version = '1.2.60'
 
     repositories {
         mavenCentral()
@@ -49,10 +49,10 @@ compileTestKotlin {
 
 
 intellij {
-    version '2018.2'
-    plugins 'org.jetbrains.kotlin:1.2.61-release-IJ2018.2-1' //here
-//    version '2018.1'
-//    plugins 'org.jetbrains.kotlin:1.2.61-release-IJ2018.1-1' //here
+//    version '2018.2'
+//    plugins 'org.jetbrains.kotlin:1.2.61-release-IJ2018.2-1' //here
+    version '2018.1'
+    plugins 'org.jetbrains.kotlin:1.2.60-release-IJ2018.1-1' //here
 //    version '2017.3'
 //    plugins 'org.jetbrains.kotlin:1.2.61-release-IJ2017.3-1' //here
 }

src/main/java/com/longforus/mvpautocodeplus/ui/EnterKeywordDialog.java

@@ -84,10 +84,13 @@ public void windowClosing(WindowEvent e) {
             }
             if (mGlobalRadioButton.isSelected()) {
                 mState = PropertiesComponent.getInstance();
-                PropertiesComponent.getInstance(mProject).setValue(ConsKt.USE_PROJECT_CONFIG, false);
+                PropertiesComponent instance = PropertiesComponent.getInstance(mProject);
+                instance.setValue(ConsKt.USE_PROJECT_CONFIG, false);
+                instance.setValue(ConsKt.GENERATE_MODEL_CONFIG, mcbModel.isSelected());
             } else {
                 mState = PropertiesComponent.getInstance(mProject);
                 mState.setValue(ConsKt.USE_PROJECT_CONFIG, true);
+                mState.setValue(ConsKt.GENERATE_MODEL_CONFIG, mcbModel.isSelected());
             }
             setSavedSuperClass(this, mState);
         });
@@ -110,6 +113,8 @@ public static EnterKeywordDialog getDialog(Project project, OnOkListener onOkLis
             dialog.mState = PropertiesComponent.getInstance();
             setSavedSuperClass(dialog, dialog.mState);
         }
+        boolean generateModel = state.getBoolean(ConsKt.GENERATE_MODEL_CONFIG, true);
+        dialog.mcbModel.setSelected(generateModel);
         dialog.pack();
         dialog.setVisible(true);
         return dialog;

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

@@ -12,6 +12,7 @@ fun getPresenterInfName(name: String) = "I${name}Presenter"
 fun getModelInfName(name: String) = "I${name}Model"
 
 const val USE_PROJECT_CONFIG = "use_project_config"
+const val GENERATE_MODEL_CONFIG = "generate_model_config"
 const val GOTO_SETTING = "Please go to File-> Settings -> OtherSettings -> MvpAutoCodePlus set."
 const val IS_NOT_SET = "Is not set"
 const val NO_SUPER_CLASS = "The implementation class will have no superclass"

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

@@ -41,8 +41,14 @@ class MainAction : AnAction("main", "auto make mvp code", PlatformIcons.CLASS_IC
             val textEditor = openFile[0] as TextEditor
             var clazz: PsiClass? = null
             if (psiFile is PsiJavaFile) {
+                if (psiFile.classes.isEmpty()) {
+                    return psiFile
+                }
                 clazz = psiFile.classes[0]
             } else if (psiFile is KtFile) {
+                if (psiFile.classes.isEmpty()) {
+                    return psiFile
+                }
                 clazz = psiFile.classes[0]
             }
             FeatureUsageTracker.getInstance().triggerFeatureUsed(ProductivityFeatureNames.CODEASSISTS_OVERRIDE_IMPLEMENT)

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

@@ -6,7 +6,8 @@ import com.intellij.codeInsight.generation.OverrideImplementUtil.*
 import com.intellij.codeInsight.generation.PsiGenerationInfo
 import com.intellij.codeInsight.generation.PsiMethodMember
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.command.WriteCommandAction.writeCommandAction
+import com.intellij.openapi.application.Result
+import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.JavaPsiFacade
@@ -46,16 +47,16 @@ fun kotlinDoMultiOverrideImplement(aClass: KtLightClass, project: Project, edito
 
     val chooserObjects = implementMembersHandler.collectMembersToGenerate(
         classOrObject).sortedBy { it.descriptor.name.asString() + " in " + it.immediateSuper.containingDeclaration.name.asString() }
-    writeCommandAction(project, aClass.containingFile).run<Throwable> {
-        OverrideImplementMembersHandler.generateMembers(editor, classOrObject, chooserObjects, false)
-    }
+//    writeCommandAction(project, aClass.containingFile).run<Throwable> {
+//        OverrideImplementMembersHandler.generateMembers(editor, classOrObject, chooserObjects, false)
+//    }
 //    <182
-//    object : WriteCommandAction<Any?>(project, aClass.containingFile) {
-//        @Throws()
-//        override fun run(result: Result<Any?>) {
-//            OverrideImplementMembersHandler.generateMembers(editor, classOrObject, chooserObjects, false)
-//        }
-//    }.executeSilently()
+    object : WriteCommandAction<Any?>(project, aClass.containingFile) {
+        @Throws()
+        override fun run(result: Result<Any?>) {
+            OverrideImplementMembersHandler.generateMembers(editor, classOrObject, chooserObjects, false)
+        }
+    }.executeSilently()
 }
 
 
@@ -91,16 +92,16 @@ fun javaOverrideOrImplementMethods(project: Project,
     for (member in onlyPrimary) {
         allList.add(member)
     }
-    writeCommandAction(project, aClass.containingFile).run<Throwable> {
-        overrideOrImplementMethodsInRightPlace(editor, aClass, allList, false, true)
-    }
+//    writeCommandAction(project, aClass.containingFile).run<Throwable> {
+//        overrideOrImplementMethodsInRightPlace(editor, aClass, allList, false, true)
+//    }
 //    <182
-//    object : WriteCommandAction<Any?>(project, aClass.containingFile) {
-//        @Throws()
-//        override fun run(result: Result<Any?>) {
-//            overrideOrImplementMethodsInRightPlace(editor, aClass, allList, false, true)
-//        }
-//    }.executeSilently()
+    object : WriteCommandAction<Any?>(project, aClass.containingFile) {
+        @Throws()
+        override fun run(result: Result<Any?>) {
+            overrideOrImplementMethodsInRightPlace(editor, aClass, allList, false, true)
+        }
+    }.executeSilently()
 }
 
 

src/main/resources/META-INF/plugin.xml

@@ -39,7 +39,7 @@
 
   <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="171"/>
-
+  <!--<idea-version since-build="173.3727" until-build="182.*"/>-->
   <depends>org.jetbrains.kotlin</depends>
   <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
        on how to target different products -->