From eca12e7b6ae3956a5e04c6fd61a9577bcde3c528 Mon Sep 17 00:00:00 2001
From: "caikang.ck" <caikang.ck@alibaba-inc.com>
Date: Mon, 20 Apr 2020 10:14:07 +0800
Subject: [PATCH] fix compatibility issue with new idea version

---
 idea-plugin/gradle.properties                      |  2 +-
 .../p3c/idea/component/AliProjectComponent.kt      | 14 +++++++++-----
 .../CommonSettingsApplicationComponent.kt          | 10 ----------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/idea-plugin/gradle.properties b/idea-plugin/gradle.properties
index 87c72ad..9c33810 100644
--- a/idea-plugin/gradle.properties
+++ b/idea-plugin/gradle.properties
@@ -5,4 +5,4 @@ plugin_name=Alibaba Java Coding Guidelines
 gradle_jetbrains_version=0.4.5
 systemProp.file.encoding=UTF-8
 
-plugin_version=2.0.1
+plugin_version=2.0.2
diff --git a/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/component/AliProjectComponent.kt b/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/component/AliProjectComponent.kt
index 67b6ffc..f8681e0 100644
--- a/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/component/AliProjectComponent.kt
+++ b/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/component/AliProjectComponent.kt
@@ -16,7 +16,6 @@
 package com.alibaba.p3c.idea.component
 
 import com.alibaba.p3c.idea.compatible.inspection.Inspections
-import com.alibaba.p3c.idea.component.CommonSettingsApplicationComponent.Companion
 import com.alibaba.p3c.idea.config.P3cConfig
 import com.alibaba.p3c.idea.i18n.P3cBundle
 import com.alibaba.p3c.idea.inspection.AliPmdInspectionInvoker
@@ -36,8 +35,8 @@ import com.intellij.psi.PsiManager
  * @date 2016/12/13
  */
 class AliProjectComponent(
-        private val project: Project,
-        val p3cConfig: P3cConfig
+    private val project: Project,
+    val p3cConfig: P3cConfig
 ) : AliBaseProjectComponent {
     private val listener: VirtualFileListener
     private val javaExtension = ".java"
@@ -64,8 +63,8 @@ class AliProjectComponent(
 
     override fun initComponent() {
         I18nResources.changeLanguage(p3cConfig.locale)
-        val analyticsGroup = ActionManager.getInstance().getAction(CommonSettingsApplicationComponent.analyticsGroupId)
-        analyticsGroup.templatePresentation.text = P3cBundle.getMessage(CommonSettingsApplicationComponent.analyticsGroupText)
+        val analyticsGroup = ActionManager.getInstance().getAction(analyticsGroupId)
+        analyticsGroup.templatePresentation.text = P3cBundle.getMessage(analyticsGroupText)
     }
 
     override fun projectOpened() {
@@ -76,4 +75,9 @@ class AliProjectComponent(
     override fun projectClosed() {
         VirtualFileManager.getInstance().removeVirtualFileListener(listener)
     }
+
+    companion object {
+        val analyticsGroupId = "com.alibaba.p3c.analytics.action_group"
+        val analyticsGroupText = "$analyticsGroupId.text"
+    }
 }
diff --git a/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/component/CommonSettingsApplicationComponent.kt b/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/component/CommonSettingsApplicationComponent.kt
index 81b7aa5..7be5613 100644
--- a/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/component/CommonSettingsApplicationComponent.kt
+++ b/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/component/CommonSettingsApplicationComponent.kt
@@ -15,15 +15,10 @@
  */
 package com.alibaba.p3c.idea.component
 
-import com.alibaba.p3c.idea.config.P3cConfig
-import com.alibaba.p3c.idea.i18n.P3cBundle
 import com.alibaba.p3c.idea.util.HighlightInfoTypes
 import com.alibaba.p3c.idea.util.HighlightSeverities
-import com.alibaba.p3c.pmd.I18nResources
 import com.alibaba.smartfox.idea.common.component.AliBaseApplicationComponent
 import com.intellij.codeInsight.daemon.impl.SeverityRegistrar
-import com.intellij.openapi.actionSystem.ActionManager
-import com.intellij.openapi.components.ServiceManager
 
 /**
  *
@@ -37,9 +32,4 @@ class CommonSettingsApplicationComponent : AliBaseApplicationComponent {
         SeverityRegistrar.registerStandard(HighlightInfoTypes.CRITICAL, HighlightSeverities.CRITICAL)
         SeverityRegistrar.registerStandard(HighlightInfoTypes.MAJOR, HighlightSeverities.MAJOR)
     }
-
-    companion object {
-        val analyticsGroupId = "com.alibaba.p3c.analytics.action_group"
-        val analyticsGroupText = "$analyticsGroupId.text"
-    }
 }