Seal private and internal types

main/DDF/AbstractEscherOptRecord.cs

@@ -127,7 +127,8 @@ public override int Serialize(int offset, byte[] data,
             listener.AfterRecordSerialize(pos, RecordId, pos - offset, this);
             return pos - offset;
         }
-        internal class EscherPropertyComparer : IComparer<EscherProperty>
+
+        internal sealed class EscherPropertyComparer : IComparer<EscherProperty>
         {
             public int Compare(EscherProperty p1, EscherProperty p2)
             {
@@ -136,6 +137,7 @@ public int Compare(EscherProperty p1, EscherProperty p2)
                 return s1 < s2 ? -1 : s1 == s2 ? 0 : 1;
             }
         }
+
         /**
          * Records should be sorted by property number before being stored.
          */

main/DDF/EscherArrayProperty.cs

@@ -259,7 +259,7 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
             return this.GetEnumerator();
         }
 
-        private class EscherArrayEnumerator : IEnumerator<byte[]>
+        private sealed class EscherArrayEnumerator : IEnumerator<byte[]>
         {
             EscherArrayProperty dataHolder;
             public EscherArrayEnumerator(EscherArrayProperty eap)

main/DDF/EscherDggRecord.cs

@@ -282,7 +282,7 @@ public void AddCluster(int dgId, int numShapedUsed)
         }
 
 
-        private class EscherDggRecordComparer : IComparer<FileIdCluster>
+        private sealed class EscherDggRecordComparer : IComparer<FileIdCluster>
         {
 
             #region IComparer Members

main/DDF/EscherDump.cs

@@ -424,7 +424,7 @@ public void DumpOld(long maxLength, Stream in1)
             }
         }
 
-        private class PropName
+        private sealed class PropName
         {
             public PropName(int id, String name)
             {

main/DDF/EscherRecord.cs

@@ -236,7 +236,7 @@ public virtual void Display(int indent)
         /// <summary>
         /// This class Reads the standard escher header.
         /// </summary>
-        internal class DeleteEscherRecordHeader
+        internal sealed class DeleteEscherRecordHeader
         {
             private short options;
             private short recordId;
@@ -275,7 +275,7 @@ public short Options
             /// Gets the record id.
             /// </summary>
             /// <value>The record id.</value>
-            public virtual short RecordId
+            public short RecordId
             {
                 get { return recordId; }
             }

main/HPSF/Array.cs

@@ -22,123 +22,123 @@ namespace NPOI.HPSF
 {
     public class Array
     {
-         internal class ArrayDimension
-    {
-        public const int SIZE = 8;
+        internal sealed class ArrayDimension
+        {
+            public const int SIZE = 8;
 
-        private int _indexOffset;
-        internal long _size;
+            private int _indexOffset;
+            internal long _size;
 
-        public ArrayDimension( byte[] data, int offset )
-        {
-            _size = LittleEndian.GetUInt( data, offset );
-            _indexOffset = LittleEndian.GetInt( data, offset
-                    + LittleEndian.INT_SIZE );
+            public ArrayDimension(byte[] data, int offset)
+            {
+                _size = LittleEndian.GetUInt(data, offset);
+                _indexOffset = LittleEndian.GetInt(data, offset
+                                                         + LittleEndian.INT_SIZE);
+            }
         }
-    }
-
-    internal class ArrayHeader
-    {
-        private readonly ArrayDimension[] _dimensions;
-        internal int _type;
 
-        public ArrayHeader( byte[] data, int startOffset )
+        internal sealed class ArrayHeader
         {
-            int offset = startOffset;
+            private readonly ArrayDimension[] _dimensions;
+            internal int _type;
 
-            _type = LittleEndian.GetInt( data, offset );
-            offset += LittleEndian.INT_SIZE;
+            public ArrayHeader(byte[] data, int startOffset)
+            {
+                int offset = startOffset;
+
+                _type = LittleEndian.GetInt(data, offset);
+                offset += LittleEndian.INT_SIZE;
 
-            long numDimensionsUnsigned = LittleEndian.GetUInt( data, offset );
-            offset += LittleEndian.INT_SIZE;
+                long numDimensionsUnsigned = LittleEndian.GetUInt(data, offset);
+                offset += LittleEndian.INT_SIZE;
 
-            if ( !( 1 <= numDimensionsUnsigned && numDimensionsUnsigned <= 31 ) )
-                throw new IllegalPropertySetDataException(
+                if(!(1 <= numDimensionsUnsigned && numDimensionsUnsigned <= 31))
+                    throw new IllegalPropertySetDataException(
                         "Array dimension number " + numDimensionsUnsigned
-                                + " is not in [1; 31] range" );
-            int numDimensions = (int) numDimensionsUnsigned;
+                                                  + " is not in [1; 31] range");
+                int numDimensions = (int) numDimensionsUnsigned;
+
+                _dimensions = new ArrayDimension[numDimensions];
+                for(int i = 0; i < numDimensions; i++)
+                {
+                    _dimensions[i] = new ArrayDimension(data, offset);
+                    offset += ArrayDimension.SIZE;
+                }
+            }
 
-            _dimensions = new ArrayDimension[numDimensions];
-            for ( int i = 0; i < numDimensions; i++ )
+            public long NumberOfScalarValues
             {
-                _dimensions[i] = new ArrayDimension( data, offset );
-                offset += ArrayDimension.SIZE;
+                get
+                {
+                    long result = 1;
+                    foreach(ArrayDimension dimension in _dimensions)
+                        result *= dimension._size;
+                    return result;
+                }
             }
-        }
 
-        public long NumberOfScalarValues
-        {
-            get
+            public int Size
             {
-                long result = 1;
-                foreach (ArrayDimension dimension in _dimensions)
-                    result *= dimension._size;
-                return result;
+                get
+                {
+                    return LittleEndian.INT_SIZE * 2 + _dimensions.Length
+                        * ArrayDimension.SIZE;
+                }
             }
-        }
 
-        public int Size
-        {
-            get
+            public int Type
             {
-                return LittleEndian.INT_SIZE*2 + _dimensions.Length
-                       *ArrayDimension.SIZE;
+                get { return _type; }
             }
         }
 
-        public int Type
+        private ArrayHeader _header;
+        private TypedPropertyValue[] _values;
+
+        public Array()
         {
-            get { return _type; }
         }
-    }
 
-    private ArrayHeader _header;
-    private TypedPropertyValue[] _values;
-
-    public Array()
-    {
-    }
-
-    public Array( byte[] data, int offset )
-    {
-        Read(data, offset);
-    }
+        public Array(byte[] data, int offset)
+        {
+            Read(data, offset);
+        }
 
-    public int Read( byte[] data, int startOffset )
-    {
-        int offset = startOffset;
+        public int Read(byte[] data, int startOffset)
+        {
+            int offset = startOffset;
 
-        _header = new ArrayHeader( data, offset );
-        offset += _header.Size;
+            _header = new ArrayHeader(data, offset);
+            offset += _header.Size;
 
-        long numberOfScalarsLong = _header.NumberOfScalarValues;
-        if ( numberOfScalarsLong > int.MaxValue )
-            throw new InvalidOperationException(
+            long numberOfScalarsLong = _header.NumberOfScalarValues;
+            if(numberOfScalarsLong > int.MaxValue)
+                throw new InvalidOperationException(
                     "Sorry, but POI can't store array of properties with size of "
-                            + numberOfScalarsLong + " in memory" );
-        int numberOfScalars = (int) numberOfScalarsLong;
+                    + numberOfScalarsLong + " in memory");
+            int numberOfScalars = (int) numberOfScalarsLong;
 
-        _values = new TypedPropertyValue[numberOfScalars];
-        int type = _header._type;
-        if ( type == Variant.VT_VARIANT )
-        {
-            for ( int i = 0; i < numberOfScalars; i++ )
+            _values = new TypedPropertyValue[numberOfScalars];
+            int type = _header._type;
+            if(type == Variant.VT_VARIANT)
             {
-                TypedPropertyValue typedPropertyValue = new TypedPropertyValue();
-                offset += typedPropertyValue.Read( data, offset );
+                for(int i = 0; i < numberOfScalars; i++)
+                {
+                    TypedPropertyValue typedPropertyValue = new TypedPropertyValue();
+                    offset += typedPropertyValue.Read(data, offset);
+                }
             }
-        }
-        else
-        {
-            for ( int i = 0; i < numberOfScalars; i++ )
+            else
             {
-                TypedPropertyValue typedPropertyValue = new TypedPropertyValue(
-                        type, null );
-                offset += typedPropertyValue.ReadValuePadded( data, offset );
+                for(int i = 0; i < numberOfScalars; i++)
+                {
+                    TypedPropertyValue typedPropertyValue = new TypedPropertyValue(
+                        type, null);
+                    offset += typedPropertyValue.ReadValuePadded(data, offset);
+                }
             }
-        }
 
-        return offset - startOffset;
-    }
+            return offset - startOffset;
+        }
     }
 }

main/HPSF/Blob.cs

@@ -2,7 +2,7 @@
 
 namespace NPOI.HPSF
 {
-    internal class Blob
+    internal sealed class Blob
     {
         private readonly byte[] _value;
 

main/HPSF/Currency.cs

@@ -18,7 +18,7 @@ limitations Under the License.
 
 namespace NPOI.HPSF
 {
-    internal class Currency
+    internal sealed class Currency
     {
         public const int SIZE = 8;
 

main/HPSF/Date.cs

@@ -19,7 +19,7 @@ limitations Under the License.
 
 namespace NPOI.HPSF
 {
-    internal class Date
+    internal sealed class Date
     {
         public const int SIZE = 8;
 

main/HPSF/MutableSection.cs

@@ -307,7 +307,7 @@ private int CalcSize()
         }
 
 
-        private class PropertyComparer : IComparer
+        private sealed class PropertyComparer : IComparer
         {
             #region IComparer Members
 

main/HSSF/Extractor/EventBasedExcelExtractor.cs

@@ -155,7 +155,7 @@ private TextListener TriggerExtraction()
             return tl;
         }
 
-        private class TextListener : IHSSFListener
+        private sealed class TextListener : IHSSFListener
         {
             public FormatTrackingHSSFListener ft;
             private SSTRecord sstRecord;

main/HSSF/Model/InternalChart.cs

@@ -133,7 +133,7 @@ public InternalChart(RecordStream rs)
             }
 
         }
-        private class PLSAggregateVisitor : RecordVisitor
+        private sealed class PLSAggregateVisitor : RecordVisitor
         {
             private List<RecordBase> container;
             public PLSAggregateVisitor(List<RecordBase> container)

main/HSSF/Model/InternalSheet.cs

@@ -177,7 +177,7 @@ public static InternalSheet CreateSheet(RecordStream rs)
             return new InternalSheet(rs);
         }
 
-        private class RecordCloner : RecordVisitor
+        private sealed class RecordCloner : RecordVisitor
         {
             private readonly IList<Record> _destList;
 
@@ -450,7 +450,7 @@ private InternalSheet(RecordStream rs)
             //    log.Log(POILogger.DEBUG, "sheet createSheet (existing file) exited");
 
         }
-        private class RecordVisitor1:RecordVisitor
+        private sealed class RecordVisitor1:RecordVisitor
         {
             readonly List<RecordBase> _records;
             public RecordVisitor1(List<RecordBase> recs)

main/HSSF/Model/LinkTable.cs

@@ -88,7 +88,7 @@ private static ExternSheetRecord ReadExtSheetRecord(RecordStream rs)
             return ExternSheetRecord.Combine(esrs);
         }
 
-        private class CRNBlock
+        private sealed class CRNBlock
         {
 
             private readonly CRNCountRecord _countRecord;
@@ -111,7 +111,7 @@ public CRNRecord[] GetCrns()
             }
         }
 
-        private class ExternalBookBlock
+        private sealed class ExternalBookBlock
         {
             private readonly SupBookRecord _externalBookRecord;
             internal ExternalNameRecord[] _externalNameRecords;

main/HSSF/Model/ParseNode.cs

@@ -175,7 +175,7 @@ public ParseNode[] Children
             get { return _children; }
         }
 
-        private class TokenCollector
+        private sealed class TokenCollector
         {
 
             private readonly Ptg[] _ptgs;

main/HSSF/Record/Aggregates/Chart/ChartFormatsAggregate.cs

@@ -185,7 +185,8 @@ public override void VisitContainedRecords(RecordVisitor rv)
             WriteEndBlock(rv);
             rv.VisitRecord(EndRecord.instance);
         }
-        private class ChartFormatsAttachedLabelAggregate : ChartRecordAggregate
+
+        private sealed class ChartFormatsAttachedLabelAggregate : ChartRecordAggregate
         {
             private DataLabExtRecord dataLabExt;
             private ChartStartObjectRecord startObject;

main/HSSF/Record/Aggregates/Chart/ChartRecordAggregate.cs

@@ -519,7 +519,7 @@ protected void WriteEndBlock(RecordVisitor rv)
             }
         }
 
-        private class StartBlockStack
+        private sealed class StartBlockStack
         {
             private List<StartBlockRecord> blockList = new List<StartBlockRecord>(16);
             public void Push(StartBlockRecord item)

main/HSSF/Record/Aggregates/ColumnInfoRecordsAggregate.cs

@@ -31,7 +31,7 @@ namespace NPOI.HSSF.Record.Aggregates
     /// </summary>
     public class ColumnInfoRecordsAggregate : RecordAggregate, ICloneable
     {
-        private class CIRComparator : IComparer<ColumnInfoRecord>
+        private sealed class CIRComparator : IComparer<ColumnInfoRecord>
         {
             public static IComparer<ColumnInfoRecord> instance = new CIRComparator();
             private CIRComparator()