diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/committed/ChangeListFilteringStrategy.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/committed/ChangeListFilteringStrategy.java index c2659818cd23..a02cd87338de 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/committed/ChangeListFilteringStrategy.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/committed/ChangeListFilteringStrategy.java @@ -16,12 +16,12 @@ package com.intellij.openapi.vcs.changes.committed; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; -import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.event.ChangeListener; +import java.util.ArrayList; import java.util.List; /** @@ -79,7 +79,7 @@ public interface ChangeListFilteringStrategy { @Override @NotNull public List filterChangeLists(List changeLists) { - return ContainerUtil.immutableList(changeLists); + return new ArrayList<>(changeLists); } @Override diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java index 3e22c80be606..1fffc1c84475 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java @@ -137,7 +137,7 @@ public class ColumnFilteringStrategy implements ChangeListFilteringStrategy { public List filterChangeLists(List changeLists) { final Object[] selection = myValueList.getSelectedValues(); if (myValueList.getSelectedIndex() == 0 || selection.length == 0) { - return ContainerUtil.immutableList(changeLists); + return new ArrayList<>(changeLists); } List result = new ArrayList<>(); for (CommittedChangeList changeList : changeLists) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/StructureFilteringStrategy.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/StructureFilteringStrategy.java index c80983c5d770..dd37089c9fef 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/StructureFilteringStrategy.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/StructureFilteringStrategy.java @@ -97,7 +97,7 @@ public class StructureFilteringStrategy implements ChangeListFilteringStrategy { @NotNull public List filterChangeLists(List changeLists) { if (mySelection.size() == 0) { - return ContainerUtil.immutableList(changeLists); + return new ArrayList<>(changeLists); } final ArrayList result = new ArrayList<>(); for (CommittedChangeList list : changeLists) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java index 766caf1f97a4..d06c69953c85 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java @@ -17,7 +17,6 @@ import com.intellij.openapi.vcs.RepositoryLocation; import com.intellij.openapi.vcs.changes.committed.*; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.util.containers.ContainerUtil; import com.intellij.util.messages.Topic; import com.intellij.util.ui.JBUI; import icons.SvnIcons; @@ -694,7 +693,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator { @NotNull public List filterChangeLists(final List changeLists) { if ((!myFilterAlien.mySelected) && (!myFilterNotMerged.mySelected) && (!myFilterMerged.mySelected)) { - return ContainerUtil.immutableList(changeLists); + return new ArrayList<>(changeLists); } final List result = new ArrayList<>();