From cd190d17cb81137c6c97e06b05d8a42067b164f2 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Wed, 12 Jul 2017 15:15:16 +0300
Subject: [PATCH] vcs: return actual values from ChangesTreeList

---
 .../intellij/openapi/vcs/changes/ui/ChangesTreeList.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
index 7decfe1a15e7..ec4f1e550b6e 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
@@ -385,14 +385,9 @@ public abstract class ChangesTreeList<T> extends Tree implements TypeSafeDataPro
     toggleChanges(getSelectedChanges());
   }
 
-  /**
-   * TODO: This method does not respect T type parameter while filling the result - just "Change" class is used
-   * TODO: ("ChangesBrowserNode.getAllChangesUnder()").
-   */
   @NotNull
   public List<T> getChanges() {
-    //noinspection unchecked
-    return ((ChangesBrowserNode)getRoot()).getAllChangesUnder();
+    return getSelectedObjects(getRoot());
   }
 
   @NotNull
@@ -500,7 +495,7 @@ public abstract class ChangesTreeList<T> extends Tree implements TypeSafeDataPro
 
   @NotNull
   public Collection<T> getIncludedChanges() {
-    return myIncludedChanges;
+    return ContainerUtil.filter(getChanges(), change -> myIncludedChanges.contains(change));
   }
 
   public void expandAll() {