From bb6e5398a66597b02b01ad71d2c4f7bf2cb0008b Mon Sep 17 00:00:00 2001
From: Matthias Gugel <matthias.gugel@idetools.de>
Date: Sat, 18 Mar 2023 06:21:10 +0100
Subject: [PATCH] Make plugin compatible with idea version 2022.3

---
 .idea/compiler.xml                                        | 2 +-
 .idea/kotlinc.xml                                         | 6 ++++++
 .idea/misc.xml                                            | 2 +-
 .idea/modules.xml                                         | 8 --------
 build.gradle.kts                                          | 4 ++--
 gradle.properties                                         | 4 ++--
 .../CreateWithFilenameTemplateDialogPanel.kt              | 6 ++++--
 7 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 .idea/kotlinc.xml
 delete mode 100644 .idea/modules.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..4251b72
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.7.22" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4d2d62d..24a2080 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_14" default="true" project-jdk-name="openjdk-14" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="openjdk-19" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index d73ddd0..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/filename_template-merge.iml" filepath="$PROJECT_DIR$/.idea/filename_template-merge.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 7df9521..555d454 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 fun properties(key: String) = project.findProperty(key).toString()
 
 plugins {
-    id("org.jetbrains.intellij") version "1.5.2"
-    id("org.jetbrains.kotlin.jvm") version "1.6.20"
+    id("org.jetbrains.intellij") version "1.10.0"
+    id("org.jetbrains.kotlin.jvm") version "1.7.22"
 }
 
 group = properties("pluginGroup")
diff --git a/gradle.properties b/gradle.properties
index 6d0e1cf..4179949 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,8 +3,8 @@ kotlin.code.style=official
 
 pluginGroup = de.idetools
 pluginName = filename_template
-pluginVersion = 1.2.0-222
-platformVersion = 2022.2
+pluginVersion = 1.2.0-223
+platformVersion = 2022.3
 
 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
 javaVersion = 11
diff --git a/src/main/kotlin/de/idetools/filename_template/CreateWithFilenameTemplateDialogPanel.kt b/src/main/kotlin/de/idetools/filename_template/CreateWithFilenameTemplateDialogPanel.kt
index 39ef2f1..cf11daf 100644
--- a/src/main/kotlin/de/idetools/filename_template/CreateWithFilenameTemplateDialogPanel.kt
+++ b/src/main/kotlin/de/idetools/filename_template/CreateWithFilenameTemplateDialogPanel.kt
@@ -5,7 +5,9 @@ import com.intellij.openapi.util.Trinity
 import javax.swing.Icon
 
 class CreateWithFilenameTemplateDialogPanel(templates: List<Trinity<String, Icon, String>>) :
-    CreateWithTemplatesDialogPanel(templates, templates.first().first) {
+    CreateWithTemplatesDialogPanel(templates.first().first, templates.map {
+        trinity -> TemplatePresentation(trinity.first, trinity.second, trinity.third)
+    }) {
 
     init {
         updateSelectedText()
@@ -15,7 +17,7 @@ class CreateWithFilenameTemplateDialogPanel(templates: List<Trinity<String, Icon
     private fun updateSelectedText() {
         val selectedValue = myTemplatesList.selectedValue
         if (selectedValue != null) {
-            var filename = selectedValue.third
+            var filename = selectedValue.templateName
             val caretPosition = determineCaretPosition(filename)
             filename = filename.replace("{|}", "")