From 742e68d32bb57ac599df9e602da3d61f12d38cfd Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 20 May 2010 20:20:57 +0400
Subject: [PATCH] fix searchable configurable test for Mercurial

---
 .../configurable/VcsManagerConfigurable.java  |  8 +++----
 plugins/hg4idea/src/META-INF/plugin.xml       |  5 +----
 .../org/zmlx/hg4idea/HgIdeConfigurable.java   | 21 +++++++------------
 .../zmlx/hg4idea/HgProjectConfigurable.java   | 14 +++++++++----
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
index 8b5df0be3893..fd667a129a05 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
@@ -142,7 +142,7 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
     });
   }
 
-  private Configurable createVcsComposeConfigurable(final AbstractVcs[] vcses) {
+  private static Configurable createVcsComposeConfigurable(final AbstractVcs[] vcses) {
     return new SearchableConfigurable.Parent.Abstract(){
       protected Configurable[] buildConfigurables() {
         List<Configurable> result = new ArrayList<Configurable>();
@@ -171,7 +171,7 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
     };
   }
 
-  private Configurable createVcsConfigurableWrapper(final AbstractVcs vcs) {
+  private static Configurable createVcsConfigurableWrapper(final AbstractVcs vcs) {
     final Configurable delegate = vcs.getConfigurable();
     return new SearchableConfigurable(){
       @Nls
@@ -208,11 +208,11 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
       }
 
       public String getId() {
-        return getHelpTopic();
+        return delegate instanceof SearchableConfigurable ? ((SearchableConfigurable) delegate).getId() : getHelpTopic();
       }
 
       public Runnable enableSearch(String option) {
-        return null;
+        return delegate instanceof SearchableConfigurable ? ((SearchableConfigurable) delegate).enableSearch(option) : null;
       }
     };
   }
diff --git a/plugins/hg4idea/src/META-INF/plugin.xml b/plugins/hg4idea/src/META-INF/plugin.xml
index 1c47d200ca35..4ebba9888e94 100644
--- a/plugins/hg4idea/src/META-INF/plugin.xml
+++ b/plugins/hg4idea/src/META-INF/plugin.xml
@@ -1,4 +1,3 @@
-<!DOCTYPE idea-plugin PUBLIC "Plugin/DTD" "http://plugins.intellij.net/plugin.dtd">
 <idea-plugin>
   <id>hg4idea</id>
   <name>hg4idea</name>
@@ -32,6 +31,7 @@
   <extensions defaultExtensionNs="com.intellij">
     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <vcs name="hg4idea" vcsClass="org.zmlx.hg4idea.HgVcs"/>
+    <applicationConfigurable implementation="org.zmlx.hg4idea.HgIdeConfigurable"/>
   </extensions>
   <actions>
     <group id="hg4idea.file.menu" popup="true" icon="/images/mercurial.png" class="org.zmlx.hg4idea.action.HgMercurialMenu">
@@ -61,9 +61,6 @@
     <component>
       <implementation-class>org.zmlx.hg4idea.HgGlobalSettings</implementation-class>
     </component>
-    <component>
-      <implementation-class>org.zmlx.hg4idea.HgIdeConfigurable</implementation-class>
-    </component>
   </application-components>
   <project-components>
     <component>
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgIdeConfigurable.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgIdeConfigurable.java
index 931b0088cd3c..c360e1089dd8 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgIdeConfigurable.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgIdeConfigurable.java
@@ -12,18 +12,14 @@
 // limitations under the License.
 package org.zmlx.hg4idea;
 
-import com.intellij.openapi.components.ApplicationComponent;
-import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.openapi.options.SearchableConfigurable;
 import org.jetbrains.annotations.Nls;
-import org.jetbrains.annotations.NotNull;
 import org.zmlx.hg4idea.ui.HgConfigurationIdePanel;
 
-import javax.swing.Icon;
-import javax.swing.JComponent;
-
-public class HgIdeConfigurable implements ApplicationComponent, Configurable {
+import javax.swing.*;
 
+public class HgIdeConfigurable implements SearchableConfigurable {
   private final HgConfigurationIdePanel panel;
 
   public HgIdeConfigurable(HgGlobalSettings globalSettings) {
@@ -63,14 +59,11 @@ public class HgIdeConfigurable implements ApplicationComponent, Configurable {
   public void disposeUIResources() {
   }
 
-  @NotNull
-  public String getComponentName() {
-    return getClass().getName();
+  public String getId() {
+    return "Mercurial";
   }
 
-  public void initComponent() {
-  }
-
-  public void disposeComponent() {
+  public Runnable enableSearch(String option) {
+    return null;
   }
 }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectConfigurable.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectConfigurable.java
index fbaa1f637929..ad3b27528469 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectConfigurable.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectConfigurable.java
@@ -12,15 +12,14 @@
 // limitations under the License.
 package org.zmlx.hg4idea;
 
-import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.openapi.options.SearchableConfigurable;
 import org.jetbrains.annotations.Nls;
 import org.zmlx.hg4idea.ui.HgConfigurationProjectPanel;
 
-import javax.swing.Icon;
-import javax.swing.JComponent;
+import javax.swing.*;
 
-public class HgProjectConfigurable implements Configurable {
+public class HgProjectConfigurable implements SearchableConfigurable {
 
   private final HgConfigurationProjectPanel hgConfigurationProjectPanel;
 
@@ -60,4 +59,11 @@ public class HgProjectConfigurable implements Configurable {
   public void disposeUIResources() {
   }
 
+  public String getId() {
+    return "Mercurial.Project";
+  }
+
+  public Runnable enableSearch(String option) {
+    return null;
+  }
 }