devonfw/IDEasy#52 intellij settings cleanup (#56)

devonfw · Sep 16, 2024 · 24d7e11 · 24d7e11
1 parent 5905e26
commit 24d7e11
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/intellij/plugins/EclipseCodeFormatter.properties b/intellij/plugins/EclipseCodeFormatter.properties
diff --git a/intellij/workspace/setup/.idea/saveactions_settings.xml b/intellij/workspace/setup/.idea/saveactions_settings.xml
diff --git a/intellij/workspace/update/.intellij/config/inspection/Default.xml b/intellij/workspace/update/.intellij/config/inspection/Default.xml
@@ -1,5 +1,7 @@
-<profile version="1.0">
-  <option name="myName" value="Default" />
-  <inspection_tool class="MissingJavadoc" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" editorAttributes="WARNING_ATTRIBUTES"/>
-</profile>
+<?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"/>
+  <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" merge:id="@class"/>
+  <inspection_tool class="MissingOverrideAnnotation" editorAttributes="WARNING_ATTRIBUTES" enabled="true" enabled_by_default="true" level="WARNING" merge:id="@class"/>
+</profile>