Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git

Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd

1 files changed, 6 insertions, 2 deletions

diff --git a/platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java b/platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java
index aa6d9618482a..34eaf920d78d 100644
--- a/platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java
+++ b/platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java
@@ -41,21 +41,25 @@ public abstract class ShowSettingsUtil {
 
   public abstract boolean editConfigurable(@Nullable Project project, Configurable configurable, @Nullable Runnable advancedInitialization);
 
-  public abstract boolean editConfigurable(Component parent, Configurable configurable);
+  public abstract boolean editConfigurable(@Nullable Component parent, @NotNull Configurable configurable);
 
-  public abstract boolean editConfigurable(Component parent, Configurable configurable, Runnable advancedInitialization);
+  public abstract boolean editConfigurable(Component parent, Configurable configurable, @NotNull Runnable advancedInitialization);
 
   public abstract boolean editConfigurable(Project project, @NonNls String dimensionServiceKey, Configurable configurable);
 
+  public abstract boolean editConfigurable(Project project, @NonNls String dimensionServiceKey, Configurable configurable, boolean showApplyButton);
+
   public abstract boolean editConfigurable(Component parent, String dimensionServiceKey, Configurable configurable);
 
   /**
    * @deprecated create a new instance of configurable instead
+   * to remove in IDEA 15
    */
   public abstract <T extends Configurable> T findProjectConfigurable(Project project, Class<T> confClass);
 
   /**
    * @deprecated create a new instance of configurable instead
+   * to remove in IDEA 15
    */
   public abstract <T extends Configurable> T findApplicationConfigurable(Class<T> confClass);