From 591fdc7b7a8b720e33464a1a41b5e5d95679d094 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 8 Feb 2018 19:41:06 +0300 Subject: [PATCH] vcs: turn option to enable partial changelists into application-wide follow-up: 009b59cc8ddfa6d53f4cfbdeac71073cf7ee6ca7 --- .../openapi/vcs/VcsApplicationSettings.java | 1 + .../com/intellij/openapi/vcs/VcsConfiguration.java | 1 - .../conflicts/ChangelistConflictConfigurable.java | 14 +++++++------- .../openapi/vcs/impl/LineStatusTrackerManager.kt | 4 ++-- .../vcs/statistics/VcsOptionsUsagesCollector.java | 4 +--- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsApplicationSettings.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsApplicationSettings.java index 45206d8ce675..c2bdccce2e39 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsApplicationSettings.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsApplicationSettings.java @@ -21,6 +21,7 @@ public class VcsApplicationSettings implements PersistentStateComponent IGNORED_UNREGISTERED_ROOTS = ContainerUtil.newArrayList(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java index 0bd4c85747fd..23914ab1999c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java @@ -22,8 +22,8 @@ import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.options.binding.BindControl; import com.intellij.openapi.options.binding.BindableConfigurable; import com.intellij.openapi.options.binding.ControlBinder; +import com.intellij.openapi.vcs.VcsApplicationSettings; import com.intellij.openapi.vcs.VcsBundle; -import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vcs.changes.ChangeListManagerImpl; import com.intellij.openapi.vcs.impl.LineStatusTrackerSettingListener; import com.intellij.ui.components.JBList; @@ -63,11 +63,11 @@ public class ChangelistConflictConfigurable extends BindableConfigurable impleme private boolean myIgnoredFilesCleared; private final ChangelistConflictTracker myConflictTracker; - private final VcsConfiguration myVcsConfiguration; + private final VcsApplicationSettings myVcsApplicationSettings; public ChangelistConflictConfigurable(ChangeListManagerImpl manager) { super(new ControlBinder(manager.getConflictTracker().getOptions())); - myVcsConfiguration = VcsConfiguration.getInstance(manager.getProject()); + myVcsApplicationSettings = VcsApplicationSettings.getInstance(); myEnableConflictTrackingCheckBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -95,7 +95,7 @@ public class ChangelistConflictConfigurable extends BindableConfigurable impleme @Override public void reset() { super.reset(); - myEnablePartialChangelists.setSelected(myVcsConfiguration.ENABLE_PARTIAL_CHANGELISTS); + myEnablePartialChangelists.setSelected(myVcsApplicationSettings.ENABLE_PARTIAL_CHANGELISTS); Collection conflicts = myConflictTracker.getIgnoredConflicts(); myIgnoredFiles.setListData(ArrayUtil.toStringArray(conflicts)); @@ -111,8 +111,8 @@ public class ChangelistConflictConfigurable extends BindableConfigurable impleme conflict.ignored = false; } } - if (myEnablePartialChangelists.isSelected() != myVcsConfiguration.ENABLE_PARTIAL_CHANGELISTS) { - myVcsConfiguration.ENABLE_PARTIAL_CHANGELISTS = myEnablePartialChangelists.isSelected(); + if (myEnablePartialChangelists.isSelected() != myVcsApplicationSettings.ENABLE_PARTIAL_CHANGELISTS) { + myVcsApplicationSettings.ENABLE_PARTIAL_CHANGELISTS = myEnablePartialChangelists.isSelected(); ApplicationManager.getApplication().getMessageBus().syncPublisher(LineStatusTrackerSettingListener.TOPIC).settingsUpdated(); } myConflictTracker.optionsChanged(); @@ -122,7 +122,7 @@ public class ChangelistConflictConfigurable extends BindableConfigurable impleme public boolean isModified() { return super.isModified() || myIgnoredFiles.getModel().getSize() != myConflictTracker.getIgnoredConflicts().size() || - myEnablePartialChangelists.isSelected() != myVcsConfiguration.ENABLE_PARTIAL_CHANGELISTS; + myEnablePartialChangelists.isSelected() != myVcsApplicationSettings.ENABLE_PARTIAL_CHANGELISTS; } @Nls diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt index e5bde896b6c0..e7baa6ebefb3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt @@ -84,7 +84,7 @@ class LineStatusTrackerManager( private val trackers = HashMap() private val forcedDocuments = HashMap>() - private var partialChangeListsEnabled = VcsConfiguration.getInstance(project).ENABLE_PARTIAL_CHANGELISTS && Registry.`is`("vcs.enable.partial.changelists") + private var partialChangeListsEnabled = VcsApplicationSettings.getInstance().ENABLE_PARTIAL_CHANGELISTS && Registry.`is`("vcs.enable.partial.changelists") private val documentsInDefaultChangeList = HashSet() private val filesWithDamagedInactiveRanges = HashSet() @@ -649,7 +649,7 @@ class LineStatusTrackerManager( private inner class MyLineStatusTrackerSettingListener : LineStatusTrackerSettingListener { override fun settingsUpdated() { - partialChangeListsEnabled = VcsConfiguration.getInstance(project).ENABLE_PARTIAL_CHANGELISTS && Registry.`is`("vcs.enable.partial.changelists") + partialChangeListsEnabled = VcsApplicationSettings.getInstance().ENABLE_PARTIAL_CHANGELISTS && Registry.`is`("vcs.enable.partial.changelists") updateTrackingModes() } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/statistics/VcsOptionsUsagesCollector.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/statistics/VcsOptionsUsagesCollector.java index 831dc7de71d3..ef7247fa90b4 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/statistics/VcsOptionsUsagesCollector.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/statistics/VcsOptionsUsagesCollector.java @@ -20,9 +20,9 @@ import com.intellij.internal.statistic.beans.GroupDescriptor; import com.intellij.internal.statistic.beans.UsageDescriptor; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.VcsConfiguration; -import java.util.HashSet; import org.jetbrains.annotations.NotNull; +import java.util.HashSet; import java.util.Set; import static com.intellij.internal.statistic.utils.StatisticsUtilKt.getBooleanUsage; @@ -71,8 +71,6 @@ public class VcsOptionsUsagesCollector extends AbstractProjectsUsagesCollector { usages.add(getBooleanUsage("include.text.into.shelf", configuration.INCLUDE_TEXT_INTO_SHELF)); usages.add(getBooleanUsage("check.conflicts.in.background", configuration.CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND)); - usages.add(getBooleanUsage("enable.partial.changelists", configuration.ENABLE_PARTIAL_CHANGELISTS)); - return usages; } }