From 235cc660fd2cc97fc3ac922cd8a81f8548e628fa Mon Sep 17 00:00:00 2001 From: MonkAlex <3amepob@gmail.com> Date: Sun, 10 Mar 2019 11:27:51 +0400 Subject: [PATCH] #1052 Rename TreeContainerIndex.Items to Containers --- src/Avalonia.Controls/Generators/TreeContainerIndex.cs | 2 +- src/Avalonia.Controls/TreeView.cs | 2 +- tests/Avalonia.Controls.UnitTests/TreeViewTests.cs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Avalonia.Controls/Generators/TreeContainerIndex.cs b/src/Avalonia.Controls/Generators/TreeContainerIndex.cs index 0a65dd9ff1..c831b7985c 100644 --- a/src/Avalonia.Controls/Generators/TreeContainerIndex.cs +++ b/src/Avalonia.Controls/Generators/TreeContainerIndex.cs @@ -34,7 +34,7 @@ namespace Avalonia.Controls.Generators /// /// Gets the currently materialized containers. /// - public IEnumerable Items => _containerToItem.Keys; + public IEnumerable Containers => _containerToItem.Keys; /// /// Gets the items of currently materialized containers. diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs index abd9bc4232..8236c11983 100644 --- a/src/Avalonia.Controls/TreeView.cs +++ b/src/Avalonia.Controls/TreeView.cs @@ -245,7 +245,7 @@ namespace Avalonia.Controls break; case NotifyCollectionChangedAction.Reset: - foreach (IControl container in ItemContainerGenerator.Index.Items) + foreach (IControl container in ItemContainerGenerator.Index.Containers) { MarkContainerSelected(container, false); } diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs index f65ef7d08e..519872f9f2 100644 --- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs +++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs @@ -54,7 +54,7 @@ namespace Avalonia.Controls.UnitTests ApplyTemplates(target); - var items = target.ItemContainerGenerator.Index.Items + var items = target.ItemContainerGenerator.Index.Containers .OfType() .ToList(); @@ -463,11 +463,11 @@ namespace Avalonia.Controls.UnitTests CreateNodeDataTemplate(target); ApplyTemplates(target); - Assert.Equal(5, target.ItemContainerGenerator.Index.Items.Count()); + Assert.Equal(5, target.ItemContainerGenerator.Index.Containers.Count()); tree[0].Children.RemoveAt(1); - Assert.Equal(3, target.ItemContainerGenerator.Index.Items.Count()); + Assert.Equal(3, target.ItemContainerGenerator.Index.Containers.Count()); } [Fact]