Merge pull request #86 from permissions-dispatcher/update_to_latest

Update to latest

Author: shiraji

README.md

@@ -54,13 +54,7 @@ There are 3 behaviors for rebuilding project after generating PermissionsDispatc
 
 # Supported PermissionsDispatcher version
 
-* [2.1.3](https://github.com/hotchemi/PermissionsDispatcher/releases/tag/2.1.3)
-* [2.2.0](https://github.com/hotchemi/PermissionsDispatcher/releases/tag/2.2.0)
-* [2.2.1](https://github.com/hotchemi/PermissionsDispatcher/releases/tag/2.2.1)
-* [2.3.0](https://github.com/hotchemi/PermissionsDispatcher/releases/tag/2.3.0)
-* [2.3.1](https://github.com/hotchemi/PermissionsDispatcher/releases/tag/2.3.1)
-* [2.3.2](https://github.com/hotchemi/PermissionsDispatcher/releases/tag/2.3.2)
-* [2.4.0](https://github.com/hotchemi/PermissionsDispatcher/releases/tag/2.4.0)
+* [3.1.0](https://github.com/hotchemi/PermissionsDispatcher/releases/tag/3.1.0)
 
 ## License
 

src/main/java/com/github/shiraji/permissionsdispatcherplugin/views/GeneratePMCodeDialog.java

@@ -1,6 +1,5 @@
 package com.github.shiraji.permissionsdispatcherplugin.views;
 
-import com.github.shiraji.permissionsdispatcherplugin.data.PdVersion;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogBuilder;
 import org.jetbrains.annotations.Nullable;
@@ -53,10 +52,9 @@ public class GeneratePMCodeDialog extends DialogBuilder {
 
     private GeneratePMCodeDialogDelegate generatePMCodeDialogDelegate;
 
-    public GeneratePMCodeDialog(@Nullable Project project, PdVersion pdVersion) {
+    public GeneratePMCodeDialog(@Nullable Project project) {
         super(project);
         generatePMCodeDialogDelegate = new GeneratePMCodeDialogDelegate(this);
-        generatePMCodeDialogDelegate.initDialog(pdVersion);
         setCenterPanel(contentPane);
     }
 

src/main/kotlin/com/github/shiraji/permissionsdispatcherplugin/actions/AddDelegationMethod.kt

@@ -50,7 +50,7 @@ class AddDelegationMethod : CodeInsightAction() {
 
             runWriteAction {
                 val factory = JavaPsiFacade.getElementFactory(project)
-                val newExpression = factory.createStatementFromText("${clazz.name}PermissionsDispatcher.${methodName}WithCheck(this);", element)
+                val newExpression = factory.createStatementFromText("${clazz.name}PermissionsDispatcher.${methodName}WithPermissionCheck(this);", element)
                 element?.parent?.addAfter(newExpression, element)
             }
         }

src/main/kotlin/com/github/shiraji/permissionsdispatcherplugin/actions/GeneratePMCodeAction.kt

@@ -1,30 +1,18 @@
 package com.github.shiraji.permissionsdispatcherplugin.actions
 
 import com.github.shiraji.permissionsdispatcherplugin.config.GeneratePMCodeConfig
-import com.github.shiraji.permissionsdispatcherplugin.data.PdVersion
 import com.github.shiraji.permissionsdispatcherplugin.data.RebuildType
-import com.github.shiraji.permissionsdispatcherplugin.extentions.generateVersionNumberFrom
 import com.github.shiraji.permissionsdispatcherplugin.handlers.GeneratePMCodeHandlerJava
 import com.github.shiraji.permissionsdispatcherplugin.handlers.GeneratePMCodeHandlerKt
 import com.github.shiraji.permissionsdispatcherplugin.models.GeneratePMCodeModel
 import com.github.shiraji.permissionsdispatcherplugin.views.GeneratePMCodeDialog
 import com.intellij.codeInsight.CodeInsightActionHandler
 import com.intellij.codeInsight.actions.CodeInsightAction
 import com.intellij.compiler.actions.CompileProjectAction
-import com.intellij.notification.Notification
-import com.intellij.notification.NotificationType
-import com.intellij.notification.Notifications
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.psi.PsiJavaFile
-import com.intellij.psi.PsiManager
-import com.intellij.psi.search.FilenameIndex
-import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.psi.psiUtil.findDescendantOfType
-import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrCommandArgumentList
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrMethodCallExpression
 import javax.swing.JOptionPane
 
 class GeneratePMCodeAction : CodeInsightAction() {
@@ -67,23 +55,8 @@ class GeneratePMCodeAction : CodeInsightAction() {
             isKotlin = false
         }
 
-        var pdVersion: PdVersion = PdVersion.NOTFOUND
-
-        fun updatePdVersion(dependenciesBlock: GrMethodCallExpression) {
-            val pdLine = dependenciesBlock.findDescendantOfType<GrCommandArgumentList> {
-                it.text.contains("com.github.hotchemi:permissionsdispatcher:")
-            }
-
-            pdLine?.text?.let {
-                text ->
-                // for now, forget about variables...
-                val versionText = text.generateVersionNumberFrom()
-                pdVersion = PdVersion.fromText(versionText)
-            }
-        }
-
         fun generatePMCode() {
-            val dialog = GeneratePMCodeDialog(project, pdVersion)
+            val dialog = GeneratePMCodeDialog(project)
             if (dialog.showAndGet()) {
                 model = GeneratePMCodeModel(project)
 
@@ -104,24 +77,6 @@ class GeneratePMCodeAction : CodeInsightAction() {
             }
         }
 
-        FilenameIndex.getAllFilesByExt(project, "gradle", GlobalSearchScope.projectScope(project)).forEach {
-            val groovyFile = PsiManager.getInstance(project).findFile(it) as? GroovyFile ?: return@forEach
-            val dependenciesBlock = groovyFile.findDescendantOfType<GrMethodCallExpression> {
-                it.invokedExpression.text == "dependencies"
-            } ?: return@forEach
-            updatePdVersion(dependenciesBlock)
-        }
-
-//        comment out until I found the best way to find a dependency version.
-//        if (pdVersion == PdVersion.NOTFOUND) {
-//            // no dependencies found for PermissionsDispatcher!
-//            Notifications.Bus.notify(Notification(
-//                    "PermissionsManager Plugin",
-//                    "No PermissionsDispatcher dependency",
-//                    "Please add PermissionsDispatcher dependency",
-//                    NotificationType.WARNING))
-//        }
-
         generatePMCode()
     }
 

src/main/kotlin/com/github/shiraji/permissionsdispatcherplugin/data/PdVersion.kt

@@ -6,13 +6,6 @@ enum class PdVersion {
     UNKNOWN;
 
     companion object {
-        fun fromText(versionText: String): PdVersion {
-            return when (versionText) {
-                "2.1.3" -> VERSION_2_1_3
-                else -> UNKNOWN
-            }
-        }
-
-        const val latestVersion = "3.0.1"
+        const val latestVersion = "3.1.0"
     }
 }

src/main/kotlin/com/github/shiraji/permissionsdispatcherplugin/views/GeneratePMCodeDialogDelegate.kt

@@ -1,6 +1,5 @@
 package com.github.shiraji.permissionsdispatcherplugin.views
 
-import com.github.shiraji.permissionsdispatcherplugin.data.PdVersion
 import com.intellij.openapi.ui.DialogWrapper
 import javax.swing.JCheckBox
 import javax.swing.JOptionPane
@@ -24,7 +23,7 @@ class GeneratePMCodeDialogDelegate(val dialog: GeneratePMCodeDialog) {
             dialog.onPermissionDeniedTextField to dialog.onPermissionDeniedCheckBox,
             dialog.onNeverAskAgainTextField to dialog.onNeverAskAgainCheckBox)
 
-    fun initDialog(pdVersion: PdVersion) {
+    init {
         dialog.apply {
             setTitle("PermissionsDispatcher Plugin")
             addOkAction().setText("Generate")
@@ -74,9 +73,6 @@ class GeneratePMCodeDialogDelegate(val dialog: GeneratePMCodeDialog) {
             }
         }
 
-        if (pdVersion == PdVersion.VERSION_2_1_3) {
-            dialog.otherOptionPanel.isVisible = false
-        }
     }
 
     private fun isValidInfo(): Boolean {