Refactor PropertyGridView to use List<GridEntryCollection> instead of…

… ArrayList (#8210) * Refactor PropertyGridView to use List<GridEntryCollection> instead of ArrayList * Remove blank line
dotnet · Nov 17, 2022 · f21bb59 · f21bb59
1 parent 1030aac
commit f21bb59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/....Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridPositionData.cs b/....Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridPositionData.cs
@@ -4,15 +4,13 @@
 
 #nullable disable
 
-using System.Collections;
-
 namespace System.Windows.Forms.PropertyGridInternal
 {
  internal partial class PropertyGridView
  {
  internal class GridPositionData
  {
- private readonly ArrayList _expandedState;
+ private readonly List<GridEntryCollection> _expandedState;
  private readonly GridEntryCollection _selectedItemTree;
  private readonly int _itemRow;
 

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs
@@ -4,7 +4,6 @@
 
 #nullable disable
 
-using System.Collections;
 using System.ComponentModel;
 using System.ComponentModel.Design;
 using System.Diagnostics;
@@ -4226,7 +4225,7 @@ public void Reset()
 
  private static void ResetOrigin(Graphics g) => g.ResetTransform();
 
- internal void RestoreHierarchyState(ArrayList expandedItems)
+ internal void RestoreHierarchyState(List<GridEntryCollection> expandedItems)
  {
  if (expandedItems is null)
  {
@@ -4239,14 +4238,14 @@ internal void RestoreHierarchyState(ArrayList expandedItems)
  }
  }
 
- internal ArrayList SaveHierarchyState(GridEntryCollection entries, ArrayList expandedItems = null)
+ internal List<GridEntryCollection> SaveHierarchyState(GridEntryCollection entries, List<GridEntryCollection> expandedItems = null)
  {
  if (entries is null)
  {
- return new ArrayList();
+ return new();
  }
 
- expandedItems ??= new ArrayList();
+ expandedItems ??= new();
 
  for (int i = 0; i < entries.Count; i++)
  {