nuclex-shared-dotnet/Nuclex.Support
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Changed all remaining COMPACTFRAMEWORK constants around serialization code to NO_SERIALIZATION

Browse source 
git-svn-id: file:///srv/devel/repo-conversion/nusu@157 d2e56fa2-650e-0410-a79f-9358c0239efd
This commit is contained in:
Markus Ewald 2009-06-26 20:17:59 +00:00
parent 8f16d09c8a
commit 74bf351727
6 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Source/Collections/ObservableDictionary.cs
View file

@ -31,15 +31,15 @@ namespace Nuclex.Support.Collections {
/// <typeparam name="ValueType">Type of the values used in the dictionary</typeparam>
[Serializable]
public class ObservableDictionary<KeyType, ValueType> :
#if !COMPACTFRAMEWORK
#if !NO_SERIALIZATION
ISerializable,
IDeserializationCallback,
#endif
IDictionary<KeyType, ValueType>,
IDictionary<KeyType, ValueType>,
IDictionary,
IObservableCollection<KeyValuePair<KeyType, ValueType>> {
#if !COMPACTFRAMEWORK
#if !NO_SERIALIZATION
#region class SerializedDictionary
/// <summary>
@ -87,7 +87,8 @@ namespace Nuclex.Support.Collections {
this.objectDictionary = (this.typedDictionary as IDictionary);
}
#if !COMPACTFRAMEWORK
#if !NO_SERIALIZATION
/// <summary>
/// Initializes a new instance of the System.WeakReference class, using deserialized
/// data from the specified serialization and stream objects.
@ -105,7 +106,8 @@ namespace Nuclex.Support.Collections {
/// </exception>
protected ObservableDictionary(SerializationInfo info, StreamingContext context) :
this(new SerializedDictionary(info, context)) { }
#endif // !COMPACTFRAMEWORK
#endif // !NO_SERIALIZATION
/// <summary>Whether the directory is write-protected</summary>
public bool IsReadOnly {
@ -374,7 +376,7 @@ namespace Nuclex.Support.Collections {
#endregion
#if !COMPACTFRAMEWORK
#if !NO_SERIALIZATION
#region ISerializable implementation
/// <summary>Serializes the Dictionary</summary>
@ -395,7 +397,7 @@ namespace Nuclex.Support.Collections {
}
#endregion
#endif //!COMPACTFRAMEWORK
#endif //!NO_SERIALIZATION
/// <summary>The wrapped Dictionary under its type-safe interface</summary>
private IDictionary<KeyType, ValueType> typedDictionary;

10
Source/Collections/ReadOnlyDictionary.cs
View file

@ -31,14 +31,14 @@ namespace Nuclex.Support.Collections {
/// <typeparam name="ValueType">Type of the values used in the dictionary</typeparam>
[Serializable]
public class ReadOnlyDictionary<KeyType, ValueType> :
#if !COMPACTFRAMEWORK
#if !NO_SERIALIZATION
ISerializable,
IDeserializationCallback,
#endif
IDictionary<KeyType, ValueType>,
IDictionary {
#if !COMPACTFRAMEWORK
#if !NO_SERIALIZATION
#region class SerializedDictionary
@ -87,7 +87,7 @@ namespace Nuclex.Support.Collections {
protected ReadOnlyDictionary(SerializationInfo info, StreamingContext context) :
this(new SerializedDictionary(info, context)) { }
#endif // !COMPACTFRAMEWORK
#endif // !NO_SERIALIZATION
/// <summary>Initializes a new read-only dictionary wrapper</summary>
/// <param name="dictionary">Dictionary that will be wrapped</param>
@ -367,7 +367,7 @@ namespace Nuclex.Support.Collections {
#endregion
#if !COMPACTFRAMEWORK
#if !NO_SERIALIZATION
#region ISerializable implementation
/// <summary>Serializes the Dictionary</summary>
@ -388,7 +388,7 @@ namespace Nuclex.Support.Collections {
}
#endregion
#endif //!COMPACTFRAMEWORK
#endif //!NO_SERIALIZATION
/// <summary>The wrapped Dictionary under its type-safe interface</summary>
private IDictionary<KeyType, ValueType> typedDictionary;