devonfw/IDEasy#582: reworked all IntelliJ XML templates (devonfw#72)

hohwille · Jan 23, 2025 · bbbc7d5 · bbbc7d5
1 parent 4fd9e40
commit bbbc7d5
Show file tree

Hide file tree

Showing 11 changed files with 217 additions and 217 deletions.
diff --git a/intellij/workspace/update/.idea/encodings.xml b/intellij/workspace/update/.idea/encodings.xml
diff --git a/intellij/workspace/update/.idea/mavenProjectSettings.xml b/intellij/workspace/update/.idea/mavenProjectSettings.xml
diff --git a/intellij/workspace/update/.idea/misc.xml b/intellij/workspace/update/.idea/misc.xml
diff --git a/intellij/workspace/update/.idea/workspace.xml b/intellij/workspace/update/.idea/workspace.xml
diff --git a/intellij/workspace/update/.intellij/config/inspection/Default.xml b/intellij/workspace/update/.intellij/config/inspection/Default.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profile version="1.0" xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="COMBINE">
-  <option name="myName" value="Default" merge:id="@name"/>
+<profile version="1.0" xmlns:merge="https://github.com/devonfw/IDEasy/merge">
+  <option name="myName" value="Default"/>
   <inspection_tool class="AmbiguousFieldAccess" enabled="true" enabled_by_default="true" level="WARNING" merge:id="@class"/>
   <inspection_tool class="MissingJavadoc" enabled="true" enabled_by_default="true" level="WARNING"/>
   <inspection_tool class="MissingOverrideAnnotation" editorAttributes="WARNING_ATTRIBUTES" enabled="true" enabled_by_default="true" level="WARNING"/>

diff --git a/intellij/workspace/update/.intellij/config/options/code.style.schemes.xml b/intellij/workspace/update/.intellij/config/options/code.style.schemes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="combine" version="4">
-  <component name="CodeStyleSchemeSettings" merge:id="@name">
-    <option name="CURRENT_SCHEME_NAME" value="Default" merge:id="@name" />
+<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" version="4">
+  <component name="CodeStyleSchemeSettings">
+    <option name="CURRENT_SCHEME_NAME" value="Default"/>
   </component>
 </application>
diff --git a/intellij/workspace/update/.intellij/config/options/ide.general.xml b/intellij/workspace/update/.intellij/config/options/ide.general.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="combine" version="4">
-  <component name="GeneralSettings" merge:id="@name">
-    <option name="showTipsOnStartup" value="false" merge:id="@name"/>
-    <option name="confirmOpenNewProject2" value="0" />
+<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" version="4">
+  <component name="GeneralSettings">
+    <option name="showTipsOnStartup" value="false"/>
+    <option name="confirmOpenNewProject2" value="0"/>
   </component>
 </application>