Refactor TableLayout to replace ArrayList (#8151)

dotnet · Nov 10, 2022 · a979ed8 · a979ed8
1 parent 00b4091
commit a979ed8
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Layout/TableLayout.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Layout/TableLayout.cs
@@ -765,7 +765,7 @@ private static int InflateColumns(ContainerInfo containerInfo, Size proposedCons
                     Strip strip = strips[i];
                     if (i < styles.Count)
                     {
-                        TableLayoutStyle style = (TableLayoutStyle)styles[i];
+                        TableLayoutStyle style = styles[i];
                         if (style.SizeType == SizeType.Percent)
                         {
                             totalPercent += style.Size;
@@ -784,7 +784,7 @@ private static int InflateColumns(ContainerInfo containerInfo, Size proposedCons
                 {
                     if (i < styles.Count)
                     {
-                        TableLayoutStyle style = (TableLayoutStyle)styles[i];
+                        TableLayoutStyle style = styles[i];
                         if (style.SizeType == SizeType.Percent)
                         {
                             float percentageOfTotal = style.Size / (float)totalPercent;
@@ -1207,7 +1207,7 @@ private static void SetElementBounds(ContainerInfo containerInfo, RectangleF dis
             Sort(childrenInfo, PostAssignedPositionComparer.GetInstance);
             for (int i = 0; i < childrenInfo.Length; i++)
             {
-                LayoutInfo layoutInfo = (LayoutInfo)childrenInfo[i];
+                LayoutInfo layoutInfo = childrenInfo[i];
 
                 IArrangedElement element = layoutInfo.Element;
 
@@ -1421,9 +1421,9 @@ internal static ContainerInfo GetContainerInfo(IArrangedElement container)
         private static void Debug_VerifyAssignmentsAreCurrent(IArrangedElement container, ContainerInfo containerInfo)
         {
 #if DEBUG
-            Hashtable oldLayoutInfo = new Hashtable();
+            Dictionary<IArrangedElement, LayoutInfo> oldLayoutInfo = new();
             ArrangedElementCollection children = container.Children;
-            ArrayList childrenInfo = new ArrayList(children.Count);
+            List<LayoutInfo> childrenInfo = new(children.Count);
 
             int minSpace = 0;
             int minColumn = 0;
@@ -1466,10 +1466,10 @@ private static void Debug_VerifyAssignmentsAreCurrent(IArrangedElement container
             {
                 Debug.Assert(layoutInfo.Equals(oldLayoutInfo[layoutInfo.Element]),
                     "Cached assignment info is invalid: LayoutInfo has changed."
-                    + " old layoutinfo: " + ((LayoutInfo)oldLayoutInfo[layoutInfo.Element]).RowStart + " " + ((LayoutInfo)oldLayoutInfo[layoutInfo.Element]).ColumnStart
+                    + " old layoutinfo: " + oldLayoutInfo[layoutInfo.Element].RowStart + " " + oldLayoutInfo[layoutInfo.Element].ColumnStart
                     + " new layoutinfo: " + layoutInfo.RowStart + " " + layoutInfo.ColumnStart
                     + " and the element is " + layoutInfo.Element.ToString());
-                SetLayoutInfo(layoutInfo.Element, (LayoutInfo)oldLayoutInfo[layoutInfo.Element]);
+                SetLayoutInfo(layoutInfo.Element, oldLayoutInfo[layoutInfo.Element]);
             }
 
             // Restore the information in row and column strips. Note that whenever we do a AssignRowAndColumns()
@@ -1487,7 +1487,7 @@ private static void Debug_VerifyNoOverlapping(IArrangedElement container)
             // this code may be useful for debugging, but doesnt work well with
             // row styles
 
-            ArrayList layoutInfos = new ArrayList(container.Children.Count);
+            List<LayoutInfo> layoutInfos = new(container.Children.Count);
             ContainerInfo containerInfo = GetContainerInfo(container);
             Strip[] rows = containerInfo.Rows;
             Strip[] columns = containerInfo.Columns;
@@ -1506,13 +1506,13 @@ private static void Debug_VerifyNoOverlapping(IArrangedElement container)
 
             for (int i = 0; i < layoutInfos.Count; i++)
             {
-                LayoutInfo layoutInfo1 = (LayoutInfo)layoutInfos[i];
+                LayoutInfo layoutInfo1 = layoutInfos[i];
 
                 Rectangle elementBounds1 = layoutInfo1.Element.Bounds;
                 Rectangle cellsOccupied1 = new Rectangle(layoutInfo1.ColumnStart, layoutInfo1.RowStart, layoutInfo1.ColumnSpan, layoutInfo1.RowSpan);
                 for (int j = i + 1; j < layoutInfos.Count; j++)
                 {
-                    LayoutInfo layoutInfo2 = (LayoutInfo)layoutInfos[j];
+                    LayoutInfo layoutInfo2 = layoutInfos[j];
                     Rectangle elementBounds2 = layoutInfo2.Element.Bounds;
                     Rectangle cellsOccupied2 = new Rectangle(layoutInfo2.ColumnStart, layoutInfo2.RowStart, layoutInfo2.ColumnSpan, layoutInfo2.RowSpan);
                     Debug.Assert(!cellsOccupied1.IntersectsWith(cellsOccupied2), "controls overlap in the same cell");