Skip to content

Commit 3a6095e

Browse files
committed
Remove PdVersion check
This is because this plugin now only support latest version of PD. It's quite hard to follow all other versions since v3 had mejor update.
1 parent f281585 commit 3a6095e

File tree

3 files changed

+3
-54
lines changed

3 files changed

+3
-54
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.shiraji.permissionsdispatcherplugin.views;
22

3-
import com.github.shiraji.permissionsdispatcherplugin.data.PdVersion;
43
import com.intellij.openapi.project.Project;
54
import com.intellij.openapi.ui.DialogBuilder;
65
import org.jetbrains.annotations.Nullable;
@@ -53,10 +52,9 @@ public class GeneratePMCodeDialog extends DialogBuilder {
5352

5453
private GeneratePMCodeDialogDelegate generatePMCodeDialogDelegate;
5554

56-
public GeneratePMCodeDialog(@Nullable Project project, PdVersion pdVersion) {
55+
public GeneratePMCodeDialog(@Nullable Project project) {
5756
super(project);
5857
generatePMCodeDialogDelegate = new GeneratePMCodeDialogDelegate(this);
59-
generatePMCodeDialogDelegate.initDialog(pdVersion);
6058
setCenterPanel(contentPane);
6159
}
6260

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

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,18 @@
11
package com.github.shiraji.permissionsdispatcherplugin.actions
22

33
import com.github.shiraji.permissionsdispatcherplugin.config.GeneratePMCodeConfig
4-
import com.github.shiraji.permissionsdispatcherplugin.data.PdVersion
54
import com.github.shiraji.permissionsdispatcherplugin.data.RebuildType
6-
import com.github.shiraji.permissionsdispatcherplugin.extentions.generateVersionNumberFrom
75
import com.github.shiraji.permissionsdispatcherplugin.handlers.GeneratePMCodeHandlerJava
86
import com.github.shiraji.permissionsdispatcherplugin.handlers.GeneratePMCodeHandlerKt
97
import com.github.shiraji.permissionsdispatcherplugin.models.GeneratePMCodeModel
108
import com.github.shiraji.permissionsdispatcherplugin.views.GeneratePMCodeDialog
119
import com.intellij.codeInsight.CodeInsightActionHandler
1210
import com.intellij.codeInsight.actions.CodeInsightAction
1311
import com.intellij.compiler.actions.CompileProjectAction
14-
import com.intellij.notification.Notification
15-
import com.intellij.notification.NotificationType
16-
import com.intellij.notification.Notifications
1712
import com.intellij.openapi.actionSystem.AnActionEvent
1813
import com.intellij.openapi.actionSystem.CommonDataKeys
1914
import com.intellij.psi.PsiJavaFile
20-
import com.intellij.psi.PsiManager
21-
import com.intellij.psi.search.FilenameIndex
22-
import com.intellij.psi.search.GlobalSearchScope
2315
import org.jetbrains.kotlin.psi.KtFile
24-
import org.jetbrains.kotlin.psi.psiUtil.findDescendantOfType
25-
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
26-
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrCommandArgumentList
27-
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrMethodCallExpression
2816
import javax.swing.JOptionPane
2917

3018
class GeneratePMCodeAction : CodeInsightAction() {
@@ -67,23 +55,8 @@ class GeneratePMCodeAction : CodeInsightAction() {
6755
isKotlin = false
6856
}
6957

70-
var pdVersion: PdVersion = PdVersion.NOTFOUND
71-
72-
fun updatePdVersion(dependenciesBlock: GrMethodCallExpression) {
73-
val pdLine = dependenciesBlock.findDescendantOfType<GrCommandArgumentList> {
74-
it.text.contains("com.github.hotchemi:permissionsdispatcher:")
75-
}
76-
77-
pdLine?.text?.let {
78-
text ->
79-
// for now, forget about variables...
80-
val versionText = text.generateVersionNumberFrom()
81-
pdVersion = PdVersion.fromText(versionText)
82-
}
83-
}
84-
8558
fun generatePMCode() {
86-
val dialog = GeneratePMCodeDialog(project, pdVersion)
59+
val dialog = GeneratePMCodeDialog(project)
8760
if (dialog.showAndGet()) {
8861
model = GeneratePMCodeModel(project)
8962

@@ -104,24 +77,6 @@ class GeneratePMCodeAction : CodeInsightAction() {
10477
}
10578
}
10679

107-
FilenameIndex.getAllFilesByExt(project, "gradle", GlobalSearchScope.projectScope(project)).forEach {
108-
val groovyFile = PsiManager.getInstance(project).findFile(it) as? GroovyFile ?: return@forEach
109-
val dependenciesBlock = groovyFile.findDescendantOfType<GrMethodCallExpression> {
110-
it.invokedExpression.text == "dependencies"
111-
} ?: return@forEach
112-
updatePdVersion(dependenciesBlock)
113-
}
114-
115-
// comment out until I found the best way to find a dependency version.
116-
// if (pdVersion == PdVersion.NOTFOUND) {
117-
// // no dependencies found for PermissionsDispatcher!
118-
// Notifications.Bus.notify(Notification(
119-
// "PermissionsManager Plugin",
120-
// "No PermissionsDispatcher dependency",
121-
// "Please add PermissionsDispatcher dependency",
122-
// NotificationType.WARNING))
123-
// }
124-
12580
generatePMCode()
12681
}
12782

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.shiraji.permissionsdispatcherplugin.views
22

3-
import com.github.shiraji.permissionsdispatcherplugin.data.PdVersion
43
import com.intellij.openapi.ui.DialogWrapper
54
import javax.swing.JCheckBox
65
import javax.swing.JOptionPane
@@ -24,7 +23,7 @@ class GeneratePMCodeDialogDelegate(val dialog: GeneratePMCodeDialog) {
2423
dialog.onPermissionDeniedTextField to dialog.onPermissionDeniedCheckBox,
2524
dialog.onNeverAskAgainTextField to dialog.onNeverAskAgainCheckBox)
2625

27-
fun initDialog(pdVersion: PdVersion) {
26+
init {
2827
dialog.apply {
2928
setTitle("PermissionsDispatcher Plugin")
3029
addOkAction().setText("Generate")
@@ -74,9 +73,6 @@ class GeneratePMCodeDialogDelegate(val dialog: GeneratePMCodeDialog) {
7473
}
7574
}
7675

77-
if (pdVersion == PdVersion.VERSION_2_1_3) {
78-
dialog.otherOptionPanel.isVisible = false
79-
}
8076
}
8177

8278
private fun isValidInfo(): Boolean {

0 commit comments

Comments
 (0)