Migradoc/DocumentObjectModel: Replaced some SortedList/Comparer with generic versions.

NOTE: Part of table rendering speedup.

Author: Florian Krabbenhoeft

MigraDocCore.DocumentObjectModel/MigraDoc.DocumentObjectModel.Visitors/CellComparer.cs

@@ -31,7 +31,7 @@
 #endregion
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using MigraDocCore.DocumentObjectModel.Tables;
 using MigraDocCore.DocumentObjectModel.MigraDoc.DocumentObjectModel.Resources;
 
@@ -41,23 +41,21 @@ namespace MigraDocCore.DocumentObjectModel.Visitors
   /// Comparer for the cell positions within a table.
   /// It compares the cell positions from top to bottom and left to right.
   /// </summary>
-  public class CellComparer : IComparer
+  public class CellComparer : IComparer<Cell>
   {
-    public int Compare(object lhs, object rhs)
+    public int Compare(Cell lhs, Cell rhs)
     {
-      if (!(lhs is Cell))
-        throw new ArgumentException(AppResources.CompareJustCells, "lhs");
+      if (ReferenceEquals(lhs, null))
+        throw new ArgumentNullException(nameof(lhs));
 
-      if (!(rhs is Cell))
-        throw new ArgumentException(AppResources.CompareJustCells, "rhs");
+      if (ReferenceEquals(rhs, null))
+        throw new ArgumentNullException(nameof(rhs));
 
-      Cell cellLhs = lhs as Cell;
-      Cell cellRhs = rhs as Cell;
-      int rowCmpr = cellLhs.Row.Index - cellRhs.Row.Index;
+      int rowCmpr = lhs.Row.Index - rhs.Row.Index;
       if (rowCmpr != 0)
         return rowCmpr;
 
-      return cellLhs.Column.Index - cellRhs.Column.Index;
+      return lhs.Column.Index - rhs.Column.Index;
     }
   }
 }

MigraDocCore.DocumentObjectModel/MigraDoc.DocumentObjectModel.Visitors/MergedCellList.cs

@@ -32,6 +32,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using MigraDocCore.DocumentObjectModel.IO;
 using MigraDocCore.DocumentObjectModel.Tables;
 using MigraDocCore.DocumentObjectModel.Visitors;
@@ -42,49 +43,8 @@ namespace MigraDocCore.DocumentObjectModel.Visitors
   /// <summary>
   /// Represents a merged list of cells of a table.
   /// </summary>
-  public class MergedCellList : ArrayList
+  public class MergedCellList : List<Cell>
   {
-
-    /// <summary>
-    /// Enumerator that can iterate through the MergedCellList.
-    /// </summary>
-    public class Enumerator : IEnumerator
-    {
-      internal Enumerator(MergedCellList list)
-      {
-        this.list = list;
-      }
-
-      #region IEnumerator Members
-
-      public void Reset()
-      {
-        this.index = -1;
-      }
-
-      public Cell Current
-      {
-        get
-        {
-          return (Cell)this.list[this.index];
-        }
-      }
-
-      object IEnumerator.Current
-      {
-        get { return Current; }
-      }
-
-      public bool MoveNext()
-      {
-        return ++index < this.list.Count;
-      }
-      #endregion
-
-      MergedCellList list;
-      int index = -1;
-    }
-
     /// <summary>
     /// Enumeration of neighbor positions of cells in a table.
     /// </summary>
@@ -144,14 +104,6 @@ private bool IsAlreadyCovered(Cell cell)
       return false;
     }
 
-    /// <summary>
-    /// Gets the Enumerator for this list.
-    /// </summary>
-    public override IEnumerator GetEnumerator()
-    {
-      return new Enumerator(this);
-    }
-
     /// <summary>
     /// Gets the cell at the specified position.
     /// </summary>

MigraDocCore.Rendering/MigraDoc.Rendering/TableFormatInfo.cs

@@ -30,8 +30,11 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using MigraDocCore.DocumentObjectModel;
+using MigraDocCore.DocumentObjectModel.Tables;
 using MigraDocCore.DocumentObjectModel.Visitors;
+using PdfSharpCore.Drawing;
 
 namespace MigraDocCore.Rendering
 {
@@ -86,9 +89,9 @@ internal override bool IsStarting
     internal int endRow = -1;
 
     internal int lastHeaderRow = -1;
-    internal SortedList formattedCells;
+    internal SortedList<Cell, FormattedCell> formattedCells;
     internal MergedCellList mergedCells;
-    internal SortedList bottomBorderMap;
-    internal SortedList connectedRowsMap;
+    internal SortedList<int, XUnit> bottomBorderMap;
+    internal SortedList<int, int> connectedRowsMap;
   }
 }

MigraDocCore.Rendering/MigraDoc.Rendering/TableRenderer.cs

@@ -30,6 +30,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using PdfSharpCore.Drawing;
 using MigraDocCore.DocumentObjectModel;
 using MigraDocCore.DocumentObjectModel.Visitors;
@@ -278,7 +279,7 @@ void InitFormat(Area area, FormatInfo previousFormatInfo)
 
     void FormatCells()
     {
-      this.formattedCells = new SortedList(new CellComparer());
+      this.formattedCells = new SortedList<Cell, FormattedCell>(new CellComparer());
       foreach (Cell cell in this.mergedCells)
       {
         FormattedCell formattedCell = new FormattedCell(cell, this.documentRenderer, this.mergedCells.GetEffectiveBorders(cell), this.fieldInfos, 0, 0);
@@ -491,7 +492,7 @@ void CalcLastHeaderRow()
 
     void CreateConnectedRows()
     {
-      this.connectedRowsMap = new SortedList();
+      this.connectedRowsMap = new SortedList<int, int>();
       foreach (Cell cell in this.mergedCells)
       {
         if (!this.connectedRowsMap.ContainsKey(cell.Row.Index))
@@ -504,7 +505,7 @@ void CreateConnectedRows()
 
     void CreateConnectedColumns()
     {
-      this.connectedColumnsMap = new SortedList();
+      this.connectedColumnsMap = new SortedList<int, int>();
       foreach (Cell cell in this.mergedCells)
       {
         if (!this.connectedColumnsMap.ContainsKey(cell.Column.Index))
@@ -517,7 +518,7 @@ void CreateConnectedColumns()
 
     void CreateBottomBorderMap()
     {
-      this.bottomBorderMap = new SortedList();
+      this.bottomBorderMap = new SortedList<int, XUnit>();
       this.bottomBorderMap.Add(0, XUnit.FromPoint(0));
       while (!this.bottomBorderMap.ContainsKey(this.table.Rows.Count))
       {
@@ -562,8 +563,8 @@ XUnit CalcMaxTopBorderWidth(int row)
     void CreateNextBottomBorderPosition()
     {
       int lastIdx = bottomBorderMap.Count - 1;
-      int lastBorderRow = (int)bottomBorderMap.GetKey(lastIdx);
-      XUnit lastPos = (XUnit)bottomBorderMap.GetByIndex(lastIdx);
+      int lastBorderRow = (int)bottomBorderMap.Keys[lastIdx];
+      XUnit lastPos = (XUnit)bottomBorderMap.Values[lastIdx];
       Cell minMergedCell = GetMinMergedCell(lastBorderRow);
       FormattedCell minMergedFormattedCell = (FormattedCell)this.formattedCells[minMergedCell];
       XUnit maxBottomBorderPosition = lastPos + minMergedFormattedCell.InnerHeight;
@@ -686,10 +687,10 @@ int CalcLastConnectedColumn(int column)
 
     Table table;
     MergedCellList mergedCells;
-    SortedList formattedCells;
-    SortedList bottomBorderMap;
-    SortedList connectedRowsMap;
-    SortedList connectedColumnsMap;
+    SortedList<Cell, FormattedCell> formattedCells;
+    SortedList<int, XUnit> bottomBorderMap;
+    SortedList<int, int> connectedRowsMap;
+    SortedList<int, int> connectedColumnsMap;
 
     int lastHeaderRow;
     int lastHeaderColumn;