From cf787d53f647eb310e42b0728920eb8433011108 Mon Sep 17 00:00:00 2001
From: u215942 <stefan.zeller@sbb.ch>
Date: Wed, 2 Jun 2021 13:18:22 +0200
Subject: [PATCH] fix: compatibility for IntelliJ 2021.1+

---
 .idea/misc.xml                                          | 2 +-
 META-INF/plugin.xml                                     | 8 ++++++--
 intellij-reference-diagram.iml                          | 2 +-
 src/ch/docksnet/rgraph/ReferenceDiagramProvider.java    | 2 +-
 src/ch/docksnet/rgraph/ReferenceUmlCategoryManager.java | 2 +-
 src/ch/docksnet/rgraph/method/ReferenceNode.java        | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 84d99e8..33fdda8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="IdProvider" IDEtalkID="8EBDEB830F2806379D856F21D180D95D" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="IntelliJ IDEA IU-191.7479.19" project-jdk-type="IDEA JDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="IntelliJ IDEA IU-211.7442.40" project-jdk-type="IDEA JDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
index 0251626..c8950aa 100644
--- a/META-INF/plugin.xml
+++ b/META-INF/plugin.xml
@@ -17,9 +17,10 @@
 <idea-plugin version="2">
     <id>ch.docksnet.rgraph</id>
     <name>Java Method Reference Diagram</name>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <vendor>Stefan Zeller</vendor>
     <depends>com.intellij.diagram</depends>
+    <depends>com.intellij.modules.java</depends>
     <description><![CDATA[
 		Java Reference Diagram<br>
 		This plugins gives an overview about coupling and cohesion of java files in a package, methods in a class.
@@ -42,6 +43,9 @@
 
     <change-notes><![CDATA[
 		<ul>
+		    <li>
+				Version 3.0.1: IntelliJ 2021.1+ support
+			</li>
 		    <li>
 				Version 3.0.0
 				<ul>
@@ -105,7 +109,7 @@
             <add-to-group group-id="Graph.DefaultGraphToolbar"/>
         </action>
         <action id="RGRAPH.ShowClusterCount" class="ch.docksnet.rgraph.actions.ShowOuterReferencesAction"
-                description="same package/same package hierarchy/other package hierarchy">
+                description="Same package/same package hierarchy/other package hierarchy">
             <add-to-group group-id="Graph.DefaultGraphToolbar"/>
         </action>
         <action id="RGRAPH.MarkNode" class="ch.docksnet.rgraph.actions.MarkAction"></action>
diff --git a/intellij-reference-diagram.iml b/intellij-reference-diagram.iml
index fcb1bc0..b70818f 100644
--- a/intellij-reference-diagram.iml
+++ b/intellij-reference-diagram.iml
@@ -8,7 +8,7 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test/java" isTestSource="true" />
     </content>
-    <orderEntry type="jdk" jdkName="IntelliJ IDEA IU-191.7479.19" jdkType="IDEA JDK" />
+    <orderEntry type="jdk" jdkName="IntelliJ IDEA IU-211.7442.40" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="jdepend-2.9.5" level="project" />
     <orderEntry type="library" name="uml-support" level="project" />
diff --git a/src/ch/docksnet/rgraph/ReferenceDiagramProvider.java b/src/ch/docksnet/rgraph/ReferenceDiagramProvider.java
index f5fcd75..a86548e 100644
--- a/src/ch/docksnet/rgraph/ReferenceDiagramProvider.java
+++ b/src/ch/docksnet/rgraph/ReferenceDiagramProvider.java
@@ -93,7 +93,7 @@ public DiagramColorManager getColorManager() {
     }
 
     public static ReferenceDiagramProvider getInstance() {
-        return (ReferenceDiagramProvider) DiagramProvider.findByID(ID);
+        return (ReferenceDiagramProvider) DiagramProvider.<PsiElement>findByID(ID);
     }
 
     @Override
diff --git a/src/ch/docksnet/rgraph/ReferenceUmlCategoryManager.java b/src/ch/docksnet/rgraph/ReferenceUmlCategoryManager.java
index 0ffaf0f..c53d558 100644
--- a/src/ch/docksnet/rgraph/ReferenceUmlCategoryManager.java
+++ b/src/ch/docksnet/rgraph/ReferenceUmlCategoryManager.java
@@ -25,7 +25,7 @@
 import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiMethod;
 import com.intellij.ui.LayeredIcon;
-import icons.UmlIcons;
+import com.intellij.uml.UmlIcons;
 
 /**
  * @author Stefan Zeller
diff --git a/src/ch/docksnet/rgraph/method/ReferenceNode.java b/src/ch/docksnet/rgraph/method/ReferenceNode.java
index 266ef79..de937b9 100644
--- a/src/ch/docksnet/rgraph/method/ReferenceNode.java
+++ b/src/ch/docksnet/rgraph/method/ReferenceNode.java
@@ -21,7 +21,7 @@
 import com.intellij.openapi.util.Iconable;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiMethod;
-import icons.UmlIcons;
+import com.intellij.uml.UmlIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;