From c1dcb93539b1b20f371c1afcc30b3f27baea789d Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Fri, 22 Jan 2010 16:44:18 +0300
Subject: [PATCH] fix Configurables test, sorry

---
 .../VcsBackgroundOperationsConfigurationPanel.form |  2 +-
 .../VcsBackgroundOperationsConfigurationPanel.java | 69 +++++++++++++---------
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.form
index 224bf43af9..ce284bfc60 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.form
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.form
@@ -84,7 +84,7 @@
                   </component>
                 </children>
               </grid>
-              <grid id="d20ff" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+              <grid id="d20ff" binding="myBackgroundProcesses" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.java
index 4051c509f8..b3831f573c 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.java
@@ -46,25 +46,29 @@ public class VcsBackgroundOperationsConfigurationPanel implements Configurable {
   private JCheckBox myEnableBackgroundProcesses;
   private JComponent myCachePanel;
   private JSpinner myChangedOnServerInterval;
+  private JPanel myBackgroundProcesses;
   private JPanel myCachedCommittedChanges;
   private CacheSettingsPanel myCacheSettingsPanel;
 
   public VcsBackgroundOperationsConfigurationPanel(final Project project) {
     myProject = project;
 
-    myEnableBackgroundProcesses.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        final boolean backgroundEnabled = myEnableBackgroundProcesses.isSelected();
-        if (! backgroundEnabled) {
-          myCacheSettingsPanel.setEnableCaching(false);
-          myTrackChangedOnServer.setSelected(false);
+    if (! myProject.isDefault()) {
+      myEnableBackgroundProcesses.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          final boolean backgroundEnabled = myEnableBackgroundProcesses.isSelected();
+          if (! backgroundEnabled) {
+            myCacheSettingsPanel.setEnableCaching(false);
+            myTrackChangedOnServer.setSelected(false);
+          }
+          myTrackChangedOnServer.setEnabled(backgroundEnabled);
+          myCacheSettingsPanel.setEnabled(backgroundEnabled);
         }
-        myTrackChangedOnServer.setEnabled(backgroundEnabled);
-        myCacheSettingsPanel.setEnabled(backgroundEnabled);
-      }
-    });
-    myCacheSettingsPanel.initPanel(project);
-    myChangedOnServerInterval.setModel(new SpinnerNumberModel(5, 5, 48 * 10 * 60, 5));
+      });
+      myCacheSettingsPanel.initPanel(project);
+      myChangedOnServerInterval.setModel(new SpinnerNumberModel(5, 5, 48 * 10 * 60, 5));
+    }
+    myBackgroundProcesses.setVisible(! myProject.isDefault());
   }
 
   public void apply() throws ConfigurationException {
@@ -77,18 +81,21 @@ public class VcsBackgroundOperationsConfigurationPanel implements Configurable {
     settings.PERFORM_EDIT_IN_BACKGROUND = myCbEditInBackground.isSelected();
     settings.PERFORM_ADD_REMOVE_IN_BACKGROUND = myCbAddRemoveInBackground.isSelected();
     settings.PERFORM_ROLLBACK_IN_BACKGROUND = myPerformRevertInBackgroundCheckBox.isSelected();
-    if ((! settings.CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND) && myTrackChangedOnServer.isSelected()) {
-      RemoteRevisionsCache.getInstance(myProject).startRefreshInBackground();
+
+    if (! myProject.isDefault()) {
+      if ((! settings.CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND) && myTrackChangedOnServer.isSelected()) {
+        RemoteRevisionsCache.getInstance(myProject).startRefreshInBackground();
+      }
+      settings.CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND = myTrackChangedOnServer.isSelected();
+      settings.CHANGED_ON_SERVER_INTERVAL = ((Number) myChangedOnServerInterval.getValue()).intValue();
+      settings.ENABLE_BACKGROUND_PROCESSES = myEnableBackgroundProcesses.isSelected();
+
+      myCacheSettingsPanel.apply();
     }
-    settings.CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND = myTrackChangedOnServer.isSelected();
-    settings.CHANGED_ON_SERVER_INTERVAL = ((Number) myChangedOnServerInterval.getValue()).intValue();
-    settings.ENABLE_BACKGROUND_PROCESSES = myEnableBackgroundProcesses.isSelected();
 
     for (VcsShowOptionsSettingImpl setting : myPromptOptions.keySet()) {
       setting.setValue(myPromptOptions.get(setting).isSelected());
     }
-
-    myCacheSettingsPanel.apply();
   }
 
   public boolean isModified() {
@@ -115,12 +122,15 @@ public class VcsBackgroundOperationsConfigurationPanel implements Configurable {
     if (settings.PERFORM_ROLLBACK_IN_BACKGROUND != myPerformRevertInBackgroundCheckBox.isSelected()) {
       return true;
     }
-    if (settings.CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND != myTrackChangedOnServer.isSelected()) {
-      return true;
+
+    if (! myProject.isDefault()) {
+      if (settings.CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND != myTrackChangedOnServer.isSelected()) {
+        return true;
+      }
+      if (settings.ENABLE_BACKGROUND_PROCESSES != myEnableBackgroundProcesses.isSelected()) return true;
+      if (myCacheSettingsPanel.isModified()) return true;
+      if (settings.CHANGED_ON_SERVER_INTERVAL != ((Number) myChangedOnServerInterval.getValue()).intValue()) return true;
     }
-    if (settings.ENABLE_BACKGROUND_PROCESSES != myEnableBackgroundProcesses.isSelected()) return true;
-    if (myCacheSettingsPanel.isModified()) return true;
-    if (settings.CHANGED_ON_SERVER_INTERVAL != ((Number) myChangedOnServerInterval.getValue()).intValue()) return true;
     return false;
   }
 
@@ -132,13 +142,16 @@ public class VcsBackgroundOperationsConfigurationPanel implements Configurable {
     myCbEditInBackground.setSelected(settings.PERFORM_EDIT_IN_BACKGROUND);
     myCbAddRemoveInBackground.setSelected(settings.PERFORM_ADD_REMOVE_IN_BACKGROUND);
     myPerformRevertInBackgroundCheckBox.setSelected(settings.PERFORM_ROLLBACK_IN_BACKGROUND);
-    myTrackChangedOnServer.setSelected(settings.CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND);
     for (VcsShowOptionsSettingImpl setting : myPromptOptions.keySet()) {
       myPromptOptions.get(setting).setSelected(setting.getValue());
     }
-    myEnableBackgroundProcesses.setSelected(settings.ENABLE_BACKGROUND_PROCESSES);
-    myChangedOnServerInterval.setValue(settings.CHANGED_ON_SERVER_INTERVAL);
-    myCacheSettingsPanel.reset();
+    
+    if (! myProject.isDefault()) {
+      myTrackChangedOnServer.setSelected(settings.CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND);
+      myEnableBackgroundProcesses.setSelected(settings.ENABLE_BACKGROUND_PROCESSES);
+      myChangedOnServerInterval.setValue(settings.CHANGED_ON_SERVER_INTERVAL);
+      myCacheSettingsPanel.reset();
+    }
   }
 
   public JComponent getPanel() {
-- 
2.11.4.GIT