From bae0b8b29b53289aca55a4c397b90d548eea0d11 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 17 Aug 2015 12:33:40 +0200 Subject: [PATCH] IDEA-143968 New Library from maven doesn't work anymore --- .../com/intellij/ui/AbstractCollectionComboBoxModel.java | 6 +++--- .../src/com/intellij/ui/CollectionListModel.java | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/AbstractCollectionComboBoxModel.java b/platform/platform-api/src/com/intellij/ui/AbstractCollectionComboBoxModel.java index 996ae90ea7b4..1fce5a333a96 100644 --- a/platform/platform-api/src/com/intellij/ui/AbstractCollectionComboBoxModel.java +++ b/platform/platform-api/src/com/intellij/ui/AbstractCollectionComboBoxModel.java @@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import java.util.Collection; +import java.util.List; /** * @author traff @@ -31,8 +31,8 @@ public abstract class AbstractCollectionComboBoxModel extends CollectionListM mySelection = selection; } - public AbstractCollectionComboBoxModel(@Nullable T selection, @NotNull Collection items) { - super(items); + public AbstractCollectionComboBoxModel(@Nullable T selection, @NotNull List items) { + super(items, true); mySelection = selection; } diff --git a/platform/platform-api/src/com/intellij/ui/CollectionListModel.java b/platform/platform-api/src/com/intellij/ui/CollectionListModel.java index 0b05bc334b59..aa51ac5ff9c1 100644 --- a/platform/platform-api/src/com/intellij/ui/CollectionListModel.java +++ b/platform/platform-api/src/com/intellij/ui/CollectionListModel.java @@ -35,8 +35,13 @@ public class CollectionListModel extends AbstractListModel implements Editabl myItems = new ArrayList(items); } + @SuppressWarnings("UnusedParameters") + protected CollectionListModel(@NotNull List items, boolean useListAsIs) { + myItems = items; + } + public CollectionListModel(@NotNull final List items) { - this((Collection)items); + myItems = new ArrayList(items); } public CollectionListModel(final T... items) {