From 7058ea244adf7336cbbcf0e6315033297130b8dc Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Fri, 21 Feb 2014 11:38:01 +0400
Subject: [PATCH] IDEA-80056 Column selection mode improvement

small API change, as per review - partial revert
---
 .../src/com/intellij/openapi/editor/CaretModel.java            | 3 ++-
 .../src/com/intellij/injected/editor/CaretModelWindow.java     | 2 +-
 .../src/com/intellij/openapi/editor/impl/CaretModelImpl.java   | 2 +-
 .../openapi/editor/textarea/TextComponentCaretModel.java       | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/CaretModel.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/CaretModel.java
index 41750a8e1f1c..f92b5741ae5d 100644
--- a/platform/editor-ui-api/src/com/intellij/openapi/editor/CaretModel.java
+++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/CaretModel.java
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * Provides services for moving the caret and retrieving information about caret position.
@@ -221,7 +222,7 @@ public interface CaretModel {
    *
    * @see #supportsMultipleCarets()
    */
-  void setCaretsAndSelections(@NotNull Collection<LogicalPosition> caretPositions, @NotNull Collection<? extends Segment> selections);
+  void setCaretsAndSelections(@NotNull List<LogicalPosition> caretPositions, @NotNull List<? extends Segment> selections);
 
   /**
    * Executes the given task for each existing caret. Carets are iterated in their position order. Set of carets to iterate over is
diff --git a/platform/lang-impl/src/com/intellij/injected/editor/CaretModelWindow.java b/platform/lang-impl/src/com/intellij/injected/editor/CaretModelWindow.java
index bdaa6bd6734c..85f92f8737cd 100644
--- a/platform/lang-impl/src/com/intellij/injected/editor/CaretModelWindow.java
+++ b/platform/lang-impl/src/com/intellij/injected/editor/CaretModelWindow.java
@@ -205,7 +205,7 @@ public class CaretModelWindow implements CaretModel {
   }
 
   @Override
-  public void setCaretsAndSelections(@NotNull Collection<LogicalPosition> caretPositions, @NotNull Collection<? extends Segment> selections) {
+  public void setCaretsAndSelections(@NotNull List<LogicalPosition> caretPositions, @NotNull List<? extends Segment> selections) {
     List<LogicalPosition> convertedPositions = new ArrayList<LogicalPosition>(caretPositions);
     for (LogicalPosition position : caretPositions) {
       convertedPositions.add(myEditorWindow.injectedToHost(position));
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
index 0603100696a9..69678c7cfba9 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
@@ -452,7 +452,7 @@ public class CaretModelImpl implements CaretModel, PrioritizedDocumentListener,
   }
 
   @Override
-  public void setCaretsAndSelections(@NotNull final Collection<LogicalPosition> caretPositions, @NotNull final Collection<? extends Segment> selections) {
+  public void setCaretsAndSelections(@NotNull final List<LogicalPosition> caretPositions, @NotNull final List<? extends Segment> selections) {
     myEditor.assertIsDispatchThread();
     if (caretPositions.isEmpty()) {
       throw new IllegalArgumentException("At least one caret should exist");
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaretModel.java b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaretModel.java
index ec8c6693b265..6e4ea35a7f1f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaretModel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaretModel.java
@@ -180,7 +180,7 @@ public class TextComponentCaretModel implements CaretModel {
   }
 
   @Override
-  public void setCaretsAndSelections(@NotNull Collection<LogicalPosition> caretPositions, @NotNull Collection<? extends Segment> selections) {
+  public void setCaretsAndSelections(@NotNull List<LogicalPosition> caretPositions, @NotNull List<? extends Segment> selections) {
     throw new UnsupportedOperationException("Multiple carets are not supported");
   }