From a6a4226bd8ebd3d401fc0768089658ba410aacea Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Fri, 27 Feb 2015 16:48:06 +0300
Subject: [PATCH] gradle: code cleanup

---
 .../GradleProjectSettingsControl.java         |  4 +--
 .../GradleProjectSettingsControlBuilder.java  | 29 +++++++++++++++++--
 ...eaGradleProjectSettingsControlBuilder.java | 15 ++++++----
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleProjectSettingsControl.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleProjectSettingsControl.java
index 416c0b9e2cb0..fe32c8f694a1 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleProjectSettingsControl.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleProjectSettingsControl.java
@@ -64,7 +64,7 @@ public class GradleProjectSettingsControl extends AbstractExternalProjectSetting
 
   @Override
   protected boolean isExtraSettingModified() {
-    return myBuilder.isModified(getInitialSettings());
+    return myBuilder.isModified();
   }
 
   @Override
@@ -79,7 +79,7 @@ public class GradleProjectSettingsControl extends AbstractExternalProjectSetting
   @Override
   public void showUi(boolean show) {
     super.showUi(show);
-    ExternalSystemUiUtil.showUi(myBuilder, show);
+    myBuilder.showUi(show);
   }
 
   /**
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleProjectSettingsControlBuilder.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleProjectSettingsControlBuilder.java
index cde018bbb636..6c904d61c089 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleProjectSettingsControlBuilder.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleProjectSettingsControlBuilder.java
@@ -28,21 +28,42 @@ import org.jetbrains.plugins.gradle.settings.GradleProjectSettings;
  */
 public interface GradleProjectSettingsControlBuilder {
 
+  /**
+   * Hides/shows components added by the current control}.
+   * @param show  flag which indicates if current control' components should be visible
+   */
+  void showUi(boolean show);
+
+  /**
+   * get initial settings
+   * @return
+   */
   GradleProjectSettings getInitialSettings();
 
+  /**
+   * Add Gradle home components to the panel
+   */
   IdeaGradleProjectSettingsControlBuilder addGradleHomeComponents(PaintAwarePanel content, int indentLevel);
 
+  /**
+   * Add Gradle JDK component to the panel
+   */
   IdeaGradleProjectSettingsControlBuilder addGradleJdkComponents(PaintAwarePanel content, int indentLevel);
 
+  /**
+   * Add Gradle distribution chooser component to the panel
+   */
   IdeaGradleProjectSettingsControlBuilder addGradleChooserComponents(PaintAwarePanel content, int indentLevel);
 
-  void disposeUIResources();
-
   boolean validate(GradleProjectSettings settings) throws ConfigurationException;
 
   void apply(GradleProjectSettings settings);
 
-  boolean isModified(GradleProjectSettings settings);
+  /**
+   * check if something was changed against initial settings
+   * @return
+   */
+  boolean isModified();
 
   void reset(Project project, GradleProjectSettings settings, boolean isDefaultModuleCreation);
 
@@ -52,4 +73,6 @@ public interface GradleProjectSettingsControlBuilder {
 
   @Nullable
   ExternalSystemSettingsControlCustomizer getExternalSystemSettingsControlCustomizer();
+
+  void disposeUIResources();
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java
index 891ba0fd7f97..fd29900546b7 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java
@@ -186,6 +186,11 @@ public class IdeaGradleProjectSettingsControlBuilder implements GradleProjectSet
     return this;
   }
 
+  @Override
+  public void showUi(boolean show) {
+    ExternalSystemUiUtil.showUi(this, show);
+  }
+
   @NotNull
   public GradleProjectSettings getInitialSettings() {
     return myInitialSettings;
@@ -352,8 +357,8 @@ public class IdeaGradleProjectSettingsControlBuilder implements GradleProjectSet
   }
 
   @Override
-  public boolean isModified(GradleProjectSettings settings) {
-    DistributionType distributionType = settings.getDistributionType();
+  public boolean isModified() {
+    DistributionType distributionType = myInitialSettings.getDistributionType();
     if (myUseBundledDistributionButton != null &&
         myUseBundledDistributionButton.isSelected() &&
         distributionType != DistributionType.BUNDLED) {
@@ -374,17 +379,17 @@ public class IdeaGradleProjectSettingsControlBuilder implements GradleProjectSet
       return true;
     }
 
-    if (myGradleJdkComboBox != null && !StringUtil.equals(myGradleJdkComboBox.getSelectedValue(), settings.getGradleJvm())) {
+    if (myGradleJdkComboBox != null && !StringUtil.equals(myGradleJdkComboBox.getSelectedValue(), myInitialSettings.getGradleJvm())) {
       return true;
     }
 
     if (myGradleHomePathField == null) return false;
     String gradleHome = FileUtil.toCanonicalPath(myGradleHomePathField.getText());
     if (StringUtil.isEmpty(gradleHome)) {
-      return !StringUtil.isEmpty(settings.getGradleHome());
+      return !StringUtil.isEmpty(myInitialSettings.getGradleHome());
     }
     else {
-      return !gradleHome.equals(settings.getGradleHome());
+      return !gradleHome.equals(myInitialSettings.getGradleHome());
     }
   }