Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 9 insertions, 3 deletions

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/NodeConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/NodeConfigurable.java
index 6571c7a63746..609943d02943 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/ex/NodeConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/NodeConfigurable.java
@@ -27,9 +27,15 @@ import java.util.ArrayList;
 public final class NodeConfigurable extends SearchableConfigurable.Parent.Abstract {
   private final ArrayList<Configurable> myConfigurables = new ArrayList<Configurable>();
   private final String myId;
+  private final int myWeight;
 
-  public NodeConfigurable(@NotNull String id) {
+  public NodeConfigurable(@NotNull String id, int weight) {
     myId = id;
+    myWeight = weight;
+  }
+
+  public int getGroupWeight() {
+    return myWeight;
   }
 
   public void add(Configurable configurable) {
@@ -48,13 +54,13 @@ public final class NodeConfigurable extends SearchableConfigurable.Parent.Abstra
   @NotNull
   @Override
   public String getId() {
-    return myId;
+    return "node.configurable." + myId;
   }
 
   @Nullable
   @Override
   public String getHelpTopic() {
-    return myId;
+    return "node.configurable." + myId + ".help.topic";
   }
 
   @Nls