From 63c673d5c394e15a76834f70b19f5f05af8cc281 Mon Sep 17 00:00:00 2001
From: ducvu <duc.vu@tuta.com>
Date: Thu, 25 Jun 2026 14:06:17 +0200
Subject: [PATCH 1/3] #1676: Added template-based IntelliJ import for extra
 Java SDKs

---
 .../repository/.idea/jdk-extra-java.xml       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 intellij/workspace/repository/.idea/jdk-extra-java.xml

diff --git a/intellij/workspace/repository/.idea/jdk-extra-java.xml b/intellij/workspace/repository/.idea/jdk-extra-java.xml
new file mode 100644
index 0000000..f65a24b
--- /dev/null
+++ b/intellij/workspace/repository/.idea/jdk-extra-java.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="combine">
+  <component name="ProjectJdkTable">
+    <jdk version="2" merge:id="./jdk/name[@value='$[EXTRA_NAME]']/.." merge:strategy="override">
+      <name value="$[EXTRA_NAME]"/>
+      <type value="JavaSDK"/>
+      <version value="OpenJDK $[EXTRA_VERSION]"/>
+      <homePath value="$[EXTRA_HOME]"/>
+      <roots>
+        <annotationsPath>
+          <root type="composite">
+            <root type="simple" url="jar://$APPLICATION_HOME_DIR$/plugins/java/lib/resources/jdkAnnotations.jar!/"/>
+          </root>
+        </annotationsPath>
+        <classPath>
+          <root type="composite">
+            <root type="simple" url="jrt://$[EXTRA_HOME]!/java.base"/>
+          </root>
+        </classPath>
+        <javadocPath>
+          <root type="composite"/>
+        </javadocPath>
+        <sourcePath>
+          <root type="composite">
+            <root type="simple" url="jar://$[EXTRA_HOME]/lib/src.zip!/java.se"/>
+          </root>
+        </sourcePath>
+      </roots>
+      <additional/>
+    </jdk>
+  </component>
+</application>
\ No newline at end of file

From 4c15a7dbcf6dbcb59f6ec6970582d9e8858d4f64 Mon Sep 17 00:00:00 2001
From: ducvu <duc.vu@tuta.com>
Date: Wed, 1 Jul 2026 08:08:56 +0200
Subject: [PATCH 2/3] #1676: Refined IntelliJ extra Java template placeholders

---
 .../workspace/repository/.idea/jdk-extra-java.xml  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/intellij/workspace/repository/.idea/jdk-extra-java.xml b/intellij/workspace/repository/.idea/jdk-extra-java.xml
index f65a24b..08edcfc 100644
--- a/intellij/workspace/repository/.idea/jdk-extra-java.xml
+++ b/intellij/workspace/repository/.idea/jdk-extra-java.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <application xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="combine">
   <component name="ProjectJdkTable">
-    <jdk version="2" merge:id="./jdk/name[@value='$[EXTRA_NAME]']/.." merge:strategy="override">
-      <name value="$[EXTRA_NAME]"/>
+    <jdk version="2" merge:id="./jdk/name[@value='$[EXTRA_JAVA_NAME]']/.." merge:strategy="override">
+      <name value="$[EXTRA_JAVA_NAME]"/>
       <type value="JavaSDK"/>
-      <version value="OpenJDK $[EXTRA_VERSION]"/>
-      <homePath value="$[EXTRA_HOME]"/>
+      <version value="$[EXTRA_JAVA_VERSION]"/>
+      <homePath value="$[EXTRA_JAVA_HOME]"/>
       <roots>
         <annotationsPath>
           <root type="composite">
@@ -14,7 +14,7 @@
         </annotationsPath>
         <classPath>
           <root type="composite">
-            <root type="simple" url="jrt://$[EXTRA_HOME]!/java.base"/>
+            <root type="simple" url="jrt://$[EXTRA_JAVA_HOME]!/java.base"/>
           </root>
         </classPath>
         <javadocPath>
@@ -22,11 +22,11 @@
         </javadocPath>
         <sourcePath>
           <root type="composite">
-            <root type="simple" url="jar://$[EXTRA_HOME]/lib/src.zip!/java.se"/>
+            <root type="simple" url="jar://$[EXTRA_JAVA_HOME]/lib/src.zip!/java.se"/>
           </root>
         </sourcePath>
       </roots>
       <additional/>
     </jdk>
   </component>
-</application>
\ No newline at end of file
+</application>

From b0dc814946d9ceacbea29c4ef71b61499a9ee37a Mon Sep 17 00:00:00 2001
From: ducvu <duc.vu@tuta.com>
Date: Tue, 7 Jul 2026 13:56:22 +0200
Subject: [PATCH 3/3] refactored template

---
 .../jdk-extra-java.xml => .intellij/config/options/jdk.table.xml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename intellij/workspace/repository/{.idea/jdk-extra-java.xml => .intellij/config/options/jdk.table.xml} (100%)

diff --git a/intellij/workspace/repository/.idea/jdk-extra-java.xml b/intellij/workspace/repository/.intellij/config/options/jdk.table.xml
similarity index 100%
rename from intellij/workspace/repository/.idea/jdk-extra-java.xml
rename to intellij/workspace/repository/.intellij/config/options/jdk.table.xml