From 889dbf399196ddc1a3ba91c7e9a37809fda41014 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Thu, 2 Apr 2015 21:13:40 +0300
Subject: [PATCH] Configurable refactoring: suppress warnings

---
 .../openapi/options/ex/ConfigurableExtensionPointUtil.java | 2 +-
 .../platform-resources/src/META-INF/PlatformExtensions.xml | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java
index 0dd11ffbbca1..e0356f93201e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java
@@ -164,7 +164,7 @@ public class ConfigurableExtensionPointUtil {
               LOG.warn("ignore deprecated groupId: " + groupId + " for id: " + id);
             }
             else {
-              LOG.warn("use deprecated groupId instead of parentId: " + groupId + " for id: " + id);
+              //TODO:LOG.warn("use deprecated groupId: " + groupId + " for id: " + id);
               parentId = groupId;
             }
           }
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index dcc548e91057..f860a95f5f4a 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -96,9 +96,10 @@
     <applicationService serviceInterface="com.intellij.diff.tools.external.ExternalDiffSettings"
                         serviceImplementation="com.intellij.diff.tools.external.ExternalDiffSettings"/>
     <applicationConfigurable groupId="tools" id="diff.base" displayName="Diff"
-                             instance="com.intellij.diff.settings.DiffSettingsConfigurable"/>
-    <applicationConfigurable groupId="tools" id="diff.external" displayName="External Diff Tools" parentId="diff.base"
-                             instance="com.intellij.diff.settings.ExternalDiffSettingsConfigurable"/>
+                             instance="com.intellij.diff.settings.DiffSettingsConfigurable">
+      <configurable id="diff.external" displayName="External Diff Tools"
+                    instance="com.intellij.diff.settings.ExternalDiffSettingsConfigurable"/>
+    </applicationConfigurable>
 
     <applicationService serviceInterface="com.intellij.ui.SystemNotifications"
                         serviceImplementation="com.intellij.ui.SystemNotificationsImpl"/>