Context Navigation

← Previous Change
Next Change →

Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml

Timestamp:

12/28/18 16:10:48 (6 years ago)

Author:

jkarder

Message:

#2520: worked on reintegration of new persistence

added nuget references to HEAL.Fossil
added StorableType attributes to many classes
changed signature of StorableConstructors
removed some classes in old persistence
removed some unnecessary usings

Location:

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml

Files:

: 14 edited

Compact/DoubleList2XmlSerializer.cs (modified) (1 diff)
Compact/NumberArray2XmlSerializerBase.cs (modified) (1 diff)
Compact/NumberEnumeration2XmlSerializerBase.cs (modified) (1 diff)
EasyXmlGenerator.cs (modified) (2 diffs)
Primitive/Char2XmlFormatter.cs (modified) (1 diff)
Primitive/DateTime2XmlSerializer.cs (modified) (1 diff)
Primitive/Guid2XmlSerializer.cs (modified) (1 diff)
Primitive/SimpleNumber2XmlSerializerBase.cs (modified) (1 diff)
Primitive/String2XmlSerializer.cs (modified) (1 diff)
Primitive/TimeSpan2XmlSerializer.cs (modified) (1 diff)
XmlFormat.cs (modified) (2 diffs)
XmlGenerator.cs (modified) (5 diffs)
XmlParser.cs (modified) (1 diff)
XmlString.cs (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Compact/DoubleList2XmlSerializer.cs

-                      r16453
+                      r16462
 using System.Collections.Generic;
 using System.Text;
+using HEAL.Fossil;
 using HeuristicLab.Persistence.Auxiliary;
-using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Default.Xml.Primitive;

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberArray2XmlSerializerBase.cs

-                      r16453
+                      r16462
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using HEAL.Fossil;
 using HeuristicLab.Persistence.Auxiliary;
-using HeuristicLab.Persistence.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 namespace HeuristicLab.Persistence.Default.Xml.Compact {

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberEnumeration2XmlSerializerBase.cs

-                      r16453
+                      r16462
 using System.Collections;
 using System.Text;
+using HEAL.Fossil;
 using HeuristicLab.Persistence.Auxiliary;
-using HeuristicLab.Persistence.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 namespace HeuristicLab.Persistence.Default.Xml.Compact {

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/EasyXmlGenerator.cs

-                      r16453
+                      r16462
 using System.Collections.Generic;
 using System.IO;
+using HEAL.Fossil;
 using HeuristicLab.Persistence.Auxiliary;
 using HeuristicLab.Persistence.Core;
 …
       try {
         using (StreamWriter writer = new StreamWriter(stream)) {
           Serializer serializer = new Serializer(obj, config);
+          Core.Serializer serializer = new Core.Serializer(obj, config);
           serializer.InterleaveTypeInformation = true;
           ReadableXmlGenerator generator = new ReadableXmlGenerator();

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Char2XmlFormatter.cs

r16453	r16462
23	23	using System.Text;
24	24	using System.Text.RegularExpressions;
25		using H~~euristicLab.Persistence.Core~~;
	25	using HEAL.Fossil;
26	26	using HeuristicLab.Persistence.Interfaces;
27	27

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/DateTime2XmlSerializer.cs

r16453	r16462
21	21
22	22	using System;
23		using H~~euristicLab.Persistence.Core~~;
	23	using HEAL.Fossil;
24	24
25	25	namespace HeuristicLab.Persistence.Default.Xml.Primitive {

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Guid2XmlSerializer.cs

r16453	r16462
22	22	using System;
23	23	using System.Globalization;
24		using H~~euristicLab.Persistence.Core~~;
	24	using HEAL.Fossil;
25	25
26	26

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/SimpleNumber2XmlSerializerBase.cs

r16453	r16462
22	22	using System;
23	23	using System.Reflection;
24		using H~~euristicLab.Persistence.Core~~;
	24	using HEAL.Fossil;
25	25
26	26	namespace HeuristicLab.Persistence.Default.Xml.Primitive {

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/String2XmlSerializer.cs

r16453	r16462
23	23	using System.Text;
24	24	using System.Text.RegularExpressions;
25		using H~~euristicLab.Persistence.Core~~;
	25	using HEAL.Fossil;
26	26
27	27	namespace HeuristicLab.Persistence.Default.Xml.Primitive {

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/TimeSpan2XmlSerializer.cs

r16453	r16462
21	21
22	22	using System;
23		using H~~euristicLab.Persistence.Core~~;
	23	using HEAL.Fossil;
24	24
25	25

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/XmlFormat.cs

-                      r16453
+                      r16462
 #endregion
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Persistence.Interfaces;
 …
     [StorableConstructor]
     protected XmlFormat(bool deserializing) : base(deserializing) { }
+    protected XmlFormat(StorableConstructorFlag _) : base(_) { }
     public XmlFormat() { }
+  }

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs

-                      r16453
+                      r16462
 using System.Text;
 using System.Threading;
+using HEAL.Fossil;
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
 …
     private static void Serialize(object obj, Stream stream, Configuration config, bool includeAssemblies, CompressionLevel compression, CancellationToken cancellationToken = default(CancellationToken)) {
       Serializer serializer = new Serializer(obj, config);
+      Core.Serializer serializer = new Core.Serializer(obj, config);
       Serialize(stream, includeAssemblies, compression, serializer, cancellationToken);
+    }
     private static void Serialize(Stream stream, bool includeAssemblies, CompressionLevel compression, Serializer serializer, CancellationToken cancellationToken = default(CancellationToken)) {
+    private static void Serialize(Stream stream, bool includeAssemblies, CompressionLevel compression, Core.Serializer serializer, CancellationToken cancellationToken = default(CancellationToken)) {
       try {
         cancellationToken.ThrowIfCancellationRequested();
 …
     public static void Serialize(object obj, Stream stream, Configuration config, bool includeAssemblies, CompressionType compressionType = CompressionType.GZip, CancellationToken cancellationToken = default(CancellationToken)) {
       try {
         Serializer serializer = new Serializer(obj, config);
+        Core.Serializer serializer = new Core.Serializer(obj, config);
         if (compressionType == CompressionType.Zip) {
           Serialize(obj, stream, config, includeAssemblies, CompressionLevel.Optimal, cancellationToken);
 …
                                  CompressionType compressionType = CompressionType.GZip, CancellationToken cancellationToken = default(CancellationToken)) {
       try {
         Serializer serializer = new Serializer(obj, config);
+        Core.Serializer serializer = new Core.Serializer(obj, config);
         if (compressionType == CompressionType.Zip) {
           Serialize(stream, includeAssemblies, CompressionLevel.Optimal, serializer, cancellationToken);
 …
+    }
     private static void Serialize(Stream stream, Serializer serializer, CancellationToken cancellationToken = default(CancellationToken)) {
+    private static void Serialize(Stream stream, Core.Serializer serializer, CancellationToken cancellationToken = default(CancellationToken)) {
       cancellationToken.ThrowIfCancellationRequested();
       using (StreamWriter writer = new StreamWriter(new GZipStream(stream, CompressionMode.Compress))) {

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs

r16453	r16462
26	26	using System.IO.Compression;
27	27	using System.Xml;
	28	using HEAL.Fossil;
28	29	using HeuristicLab.Persistence.Core;
29	30	using HeuristicLab.Persistence.Core.Tokens;

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/XmlString.cs

-                      r16453
+                      r16462
 using System.Text;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Persistence.Interfaces;
 …
     [StorableConstructor]
     protected XmlString(bool deserializing) { }
+    protected XmlString(StorableConstructorFlag _) { }
     private XmlString() { }

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

Context Navigation

Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml

Legend:

Download in other formats: