Context Navigation

Changeset 6702

Timestamp:

09/02/11 16:03:25 (13 years ago)

Author:

epitzer

Message:

#1530 flatten serialization token hierarchy and seal frequently used classes

Location:

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3

Files:

-                      r5445
+                      r6702
   /// between composite serializers and the core.
   /// </summary>
   public class Tag {
+  public sealed class Tag {
     /// <summary>
 …
     /// </summary>
     /// <value>The name.</value>
     public string Name { get; private set; }
+    public readonly string Name;
     /// <summary>
 …
     /// </summary>
     /// <value>The value.</value>
     public object Value { get; set; }
+    public readonly object Value;
     /// <summary>

-                      r5445
+                      r6702
+using HeuristicLab.Persistence.Interfaces;
 namespace HeuristicLab.Persistence.Core.Tokens {
 …
   /// Marks the beginning of a composite element.
   /// </summary>
+  public class BeginToken : CompositeTokenBase {
+  public sealed class BeginToken : ISerializationToken {
+    /// <summary>
+    /// The type's id.
+    /// </summary>
+    public readonly int TypeId;
+    /// <summary>
+    /// The object's id for references in case it is a reference type.
+    /// </summary>
+    public readonly int? Id;
+    /// <summary>
+    /// The token's name.
+    /// </summary>
+    public readonly string Name;
     /// <summary>
 …
     /// <param name="typeId">The type id.</param>
     /// <param name="id">The object id.</param>
+    public BeginToken(string name, int typeId, int? id) : base(name, typeId, id) { }
+    public BeginToken(string name, int typeId, int? id) {
+      Name = name;
+      TypeId = typeId;
+      Id = id;
+    }
+  }

-                      r5445
+                      r6702
+using HeuristicLab.Persistence.Interfaces;
 namespace HeuristicLab.Persistence.Core.Tokens {
 …
   /// Marks the end of a composite element.
   /// </summary>
+  public class EndToken : CompositeTokenBase {
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EndToken"/> class.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="typeId">The type id.</param>
+    /// <param name="id">The object id.</param>
+    public EndToken(string name, int typeId, int? id) : base(name, typeId, id) { }
+  }
+  public sealed class EndToken : ISerializationToken { }
+}

r5445	r6702
27	27	/// Start of meta information.
28	28	/// </summary>
29		public class MetaInfoBeginToken : ISerializationToken { }
	29	public sealed class MetaInfoBeginToken : ISerializationToken { }
30	30
31	31	}

r5445	r6702
27	27	/// End of meta info.
28	28	/// </summary>
29		public class MetaInfoEndToken : ISerializationToken { }
	29	public sealed class MetaInfoEndToken : ISerializationToken { }
30	30
31	31	}

-                      r5445
+                      r6702
+using HeuristicLab.Persistence.Interfaces;
 namespace HeuristicLab.Persistence.Core.Tokens {
 …
   /// Describes a reference to <c>null</c>.
   /// </summary>
+  public class NullReferenceToken : SerializationTokenBase {
+  public sealed class NullReferenceToken : ISerializationToken {
+    /// <summary>
+    /// The token's name.
+    /// </summary>
+    public readonly string Name;
     /// <summary>
 …
     /// </summary>
     /// <param name="name">The token name.</param>
+    public NullReferenceToken(string name) : base(name) { }
+    public NullReferenceToken(string name) {
+      Name = name;
+    }
+  }

-                      r5445
+                      r6702
   /// Encapsulated the serialization of a single primitive value.
   /// </summary>
+  public class PrimitiveToken : SerializationTokenBase {
+  public sealed class PrimitiveToken : ISerializationToken {
+    /// <summary>
+    /// The token's name.
+    /// </summary>
+    public readonly string Name;
     /// <summary>
 …
     /// <param name="id">The onbject's id.</param>
     /// <param name="serialData">The serialized data.</param>
     public PrimitiveToken(string name, int typeId, int? id, ISerialData serialData)
       : base(name) {
+    public PrimitiveToken(string name, int typeId, int? id, ISerialData serialData) {
+      Name = name;
       TypeId = typeId;
       Id = id;

-                      r5445
+                      r6702
+using HeuristicLab.Persistence.Interfaces;
 namespace HeuristicLab.Persistence.Core.Tokens {
   /// <summary>
   /// References a previously used token (composite or primitive).
   /// </summary>
+  public class ReferenceToken : SerializationTokenBase {
+  public sealed class ReferenceToken : ISerializationToken {
+    /// <summary>
+    /// The token's name.
+    /// </summary>
+    public readonly string Name;
     /// <summary>
     /// The refereced object's id.
 …
     /// <param name="name">The name.</param>
     /// <param name="id">The referenced object's id.</param>
     public ReferenceToken(string name, int id)
       : base(name) {
+    public ReferenceToken(string name, int id) {
+      Name = name;
       Id = id;
+    }

r6224	r6702
227	227	<Compile Include="Core\Tokens\MetaInfoEndToken.cs" />
228	228	<Compile Include="Interfaces\ISerializationToken.cs" />
229		~~<Compile Include="Core\Tokens\SerializationTokenBase.cs" />~~
230		~~<Compile Include="Core\Tokens\CompositeTokenBase.cs" />~~
231	229	<Compile Include="Core\Tokens\BeginToken.cs" />
232	230	<Compile Include="Core\Tokens\EndToken.cs" />

Note: See TracChangeset for help on using the changeset viewer.