more

Angel-foxxo · Angel-foxxo · commit cfc83401c3a9 · 2025-05-22T02:46:47.000+02:00
diff --git a/AttributeList.cs b/AttributeList.cs
@@ -215,12 +215,12 @@ public ICollection<object> Values
         /// <exception cref="ElementOwnershipException">Thrown when an attempt is made to set the value of the attribute to an Element from a different <see cref="Datamodel"/>.</exception>
         /// <exception cref="AttributeTypeException">Thrown when an attempt is made to set a value that is not of a valid Datamodel attribute type.</exception>
         /// <exception cref="IndexOutOfRangeException">Thrown when the maximum number of Attributes allowed in an AttributeList has been reached.</exception>        
-        public virtual object this[string name]
+        public virtual object? this[string name]
         {
             get
             {
                 ArgumentNullException.ThrowIfNull(name);
-                var attr = (Attribute)Inner[name];
+                var attr = (Attribute?)Inner[name];
                 if (attr == null)
                 {
                     var prop_attr = (PropertyInfo)PropertyInfos[name];
diff --git a/Datamodel.ElementList.cs b/Datamodel.ElementList.cs
@@ -45,7 +45,7 @@ internal void Add(Element item)
                 ChangeLock.EnterUpgradeableReadLock();
                 try
                 {
-                    Element existing = (Element)store[item.ID];
+                    Element? existing = (Element?)store[item.ID];
                     if (existing != null && !existing.Stub)
                     {
                         throw new ElementIdException($"Element ID {item.ID} already in use in this Datamodel.");
@@ -82,14 +82,14 @@ internal void Add(Element item)
             /// <remarks>The order of this list has no meaning to a Datamodel. This accessor is intended for <see cref="ICodec"/> implementers.</remarks>
             /// <param name="index">The index to look up.</param>
             /// <returns>The Element found at the index.</returns>
-            public Element this[int index]
+            public Element? this[int index]
             {
                 get
                 {
                     ChangeLock.EnterReadLock();
                     try
                     {
-                        return (Element)store[index];
+                        return (Element?)store[index];
                     }
                     finally { ChangeLock.ExitReadLock(); }
                 }
@@ -100,14 +100,14 @@ public Element this[int index]
             /// </summary>
             /// <param name="id">The ID to search for.</param>
             /// <returns>The Element with the given ID, or null if none is found.</returns>
-            public Element this[Guid id]
+            public Element? this[Guid id]
             {
                 get
                 {
                     ChangeLock.EnterReadLock();
                     try
                     {
-                        return (Element)store[id];
+                        return (Element?)store[id];
                     }
                     finally { ChangeLock.ExitReadLock(); }
                 }
@@ -168,7 +168,7 @@ public bool Remove(Element item, RemoveMode mode)
                         try
                         {
                             store.Remove(item.ID);
-                            Element replacement = (mode == RemoveMode.MakeStubs) ? new Element(Owner, item.ID) : (Element)null;
+                            Element? replacement = (mode == RemoveMode.MakeStubs) ? new Element(Owner, item.ID) : null;
 
                             foreach (Element elem in store.Values)
                             {
@@ -179,7 +179,7 @@ public bool Remove(Element item, RemoveMode mode)
                                         elem[attr.Key] = replacement;
                                     }
 
-                                    foreach (var array in elem.Select(a => a.Value).OfType<IList<Element>>())
+                                    foreach (var array in elem.Select(a => a.Value).OfType<IList<Element?>>())
                                         for (int i = 0; i < array.Count; i++)
                                             if (array[i] == item)
                                                 array[i] = replacement;
@@ -210,7 +210,7 @@ public void Trim()
                 ChangeLock.EnterUpgradeableReadLock();
                 try
                 {
-                    var used = new HashSet<Element>();
+                    var used = new HashSet<Element?>();
                     WalkElemTree(Owner.Root, used);
                     if (used.Count == Count) return;
 
@@ -219,8 +219,11 @@ public void Trim()
                     {
                         foreach (var elem in this.Except(used).ToArray())
                         {
-                            store.Remove(elem.ID);
-                            elem.Owner = null;
+                            if(elem != null)
+                            {
+                                store.Remove(elem.ID);
+                                elem.Owner = null;
+                            }
                         }
 
                         CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, (System.Collections.IList)used));
@@ -236,8 +239,13 @@ public void Trim()
                 }
             }
 
-            protected void WalkElemTree(Element elem, HashSet<Element> found)
+            protected void WalkElemTree(Element? elem, HashSet<Element?> found)
             {
+                if(elem is null)
+                {
+                    return;
+                }
+
                 found.Add(elem);
                 foreach (var value in elem.Inner.Values.Cast<Attribute>().Select(a => a.RawValue))
                 {
@@ -279,7 +287,7 @@ public IEnumerator<Element> GetEnumerator()
             /// <summary>
             /// Raised when an <see cref="Element"/> is added, removed, or replaced.
             /// </summary>
-            public event NotifyCollectionChangedEventHandler CollectionChanged;
+            public event NotifyCollectionChangedEventHandler? CollectionChanged;
             #endregion
 
             public void Dispose()
diff --git a/Datamodel.cs b/Datamodel.cs
@@ -466,7 +466,7 @@ public int EncodingVersion
         /// Gets or sets the first Element of the Datamodel. Only Elements referenced by the Root element or one of its children are considered a part of the Datamodel.
         /// </summary>
         /// <exception cref="ElementOwnershipException">Thown when an attempt is made to assign an Element from another Datamodel to this property.</exception>
-        public Element Root
+        public Element? Root
         {
             get => _Root;
             set
@@ -482,7 +482,7 @@ public Element Root
                 OnPropertyChanged();
             }
         }
-        Element _Root;
+        Element? _Root;
 
         public AttributeList PrefixAttributes
         {
diff --git a/Element.cs b/Element.cs
@@ -207,10 +207,10 @@ internal set
         /// <exception cref="KeyNotFoundException">Thrown when an attempt is made to get a name that is not present on this Element.</exception>
         public T? Get<T>(string name)
         {
-            object value = this[name];
+            object? value = this[name];
 
             if (value is not T && !(typeof(T) == typeof(Element) && value == null))
-                throw new AttributeTypeException(string.Format("Attribute \"{0}\" ({1}) does not implement {2}.", name, value.GetType().Name, typeof(T).Name));
+                throw new AttributeTypeException(string.Format("Attribute \"{0}\" ({1}) does not implement {2}.", name, value?.GetType().Name, typeof(T).Name));
 
             return (T?)value;
         }
@@ -233,7 +233,7 @@ internal set
             }
             catch (AttributeTypeException)
             {
-                throw new AttributeTypeException(string.Format("Attribute \"{0}\" ({1}) is not an array.", name, this[name].GetType().Name));
+                throw new AttributeTypeException(string.Format("Attribute \"{0}\" ({1}) is not an array.", name, this[name]?.GetType().Name));
             }
 
         }
@@ -249,7 +249,7 @@ internal set
         /// <exception cref="ElementOwnershipException">Thrown when an attempt is made to set the value of the attribute to an Element from a different <see cref="Datamodel"/>.</exception>
         /// <exception cref="AttributeTypeException">Thrown when an attempt is made to set a value that is not of a valid Datamodel attribute type.</exception>
         /// <exception cref="IndexOutOfRangeException">Thrown when the maximum number of Attributes allowed in an Element has been reached.</exception>
-        public override object this[string name]
+        public override object? this[string name]
         {
             get
             {

Original file line number	Diff line number	Diff line change
`@@ -215,12 +215,12 @@ public ICollection<object> Values`
`215`	`215`	`/// <exception cref="ElementOwnershipException">Thrown when an attempt is made to set the value of the attribute to an Element from a different <see cref="Datamodel"/>.</exception>`
`216`	`216`	`/// <exception cref="AttributeTypeException">Thrown when an attempt is made to set a value that is not of a valid Datamodel attribute type.</exception>`
`217`	`217`	`/// <exception cref="IndexOutOfRangeException">Thrown when the maximum number of Attributes allowed in an AttributeList has been reached.</exception>`
`218`		`- public virtual object this[string name]`
	`218`	`+ public virtual object? this[string name]`
`219`	`219`	`{`
`220`	`220`	`get`
`221`	`221`	`{`
`222`	`222`	`ArgumentNullException.ThrowIfNull(name);`
`223`		`- var attr = (Attribute)Inner[name];`
	`223`	`+ var attr = (Attribute?)Inner[name];`
`224`	`224`	`if (attr == null)`
`225`	`225`	`{`
`226`	`226`	`var prop_attr = (PropertyInfo)PropertyInfos[name];`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ internal void Add(Element item)`
`45`	`45`	`ChangeLock.EnterUpgradeableReadLock();`
`46`	`46`	`try`
`47`	`47`	`{`
`48`		`- Element existing = (Element)store[item.ID];`
	`48`	`+ Element? existing = (Element?)store[item.ID];`
`49`	`49`	`if (existing != null && !existing.Stub)`
`50`	`50`	`{`
`51`	`51`	`throw new ElementIdException($"Element ID {item.ID} already in use in this Datamodel.");`
`@@ -82,14 +82,14 @@ internal void Add(Element item)`
`82`	`82`	`/// <remarks>The order of this list has no meaning to a Datamodel. This accessor is intended for <see cref="ICodec"/> implementers.</remarks>`
`83`	`83`	`/// <param name="index">The index to look up.</param>`
`84`	`84`	`/// <returns>The Element found at the index.</returns>`
`85`		`- public Element this[int index]`
	`85`	`+ public Element? this[int index]`
`86`	`86`	`{`
`87`	`87`	`get`
`88`	`88`	`{`
`89`	`89`	`ChangeLock.EnterReadLock();`
`90`	`90`	`try`
`91`	`91`	`{`
`92`		`- return (Element)store[index];`
	`92`	`+ return (Element?)store[index];`
`93`	`93`	`}`
`94`	`94`	`finally { ChangeLock.ExitReadLock(); }`
`95`	`95`	`}`
`@@ -100,14 +100,14 @@ public Element this[int index]`
`100`	`100`	`/// </summary>`
`101`	`101`	`/// <param name="id">The ID to search for.</param>`
`102`	`102`	`/// <returns>The Element with the given ID, or null if none is found.</returns>`
`103`		`- public Element this[Guid id]`
	`103`	`+ public Element? this[Guid id]`
`104`	`104`	`{`
`105`	`105`	`get`
`106`	`106`	`{`
`107`	`107`	`ChangeLock.EnterReadLock();`
`108`	`108`	`try`
`109`	`109`	`{`
`110`		`- return (Element)store[id];`
	`110`	`+ return (Element?)store[id];`
`111`	`111`	`}`
`112`	`112`	`finally { ChangeLock.ExitReadLock(); }`
`113`	`113`	`}`
`@@ -168,7 +168,7 @@ public bool Remove(Element item, RemoveMode mode)`
`168`	`168`	`try`
`169`	`169`	`{`
`170`	`170`	`store.Remove(item.ID);`
`171`		`- Element replacement = (mode == RemoveMode.MakeStubs) ? new Element(Owner, item.ID) : (Element)null;`
	`171`	`+ Element? replacement = (mode == RemoveMode.MakeStubs) ? new Element(Owner, item.ID) : null;`
`172`	`172`
`173`	`173`	`foreach (Element elem in store.Values)`
`174`	`174`	`{`
`@@ -179,7 +179,7 @@ public bool Remove(Element item, RemoveMode mode)`
`179`	`179`	`elem[attr.Key] = replacement;`
`180`	`180`	`}`
`181`	`181`
`182`		`- foreach (var array in elem.Select(a => a.Value).OfType<IList<Element>>())`
	`182`	`+ foreach (var array in elem.Select(a => a.Value).OfType<IList<Element?>>())`
`183`	`183`	`for (int i = 0; i < array.Count; i++)`
`184`	`184`	`if (array[i] == item)`
`185`	`185`	`array[i] = replacement;`
`@@ -210,7 +210,7 @@ public void Trim()`
`210`	`210`	`ChangeLock.EnterUpgradeableReadLock();`
`211`	`211`	`try`
`212`	`212`	`{`
`213`		`- var used = new HashSet<Element>();`
	`213`	`+ var used = new HashSet<Element?>();`
`214`	`214`	`WalkElemTree(Owner.Root, used);`
`215`	`215`	`if (used.Count == Count) return;`
`216`	`216`
`@@ -219,8 +219,11 @@ public void Trim()`
`219`	`219`	`{`
`220`	`220`	`foreach (var elem in this.Except(used).ToArray())`
`221`	`221`	`{`
`222`		`- store.Remove(elem.ID);`
`223`		`- elem.Owner = null;`
	`222`	`+ if(elem != null)`
	`223`	`+ {`
	`224`	`+ store.Remove(elem.ID);`
	`225`	`+ elem.Owner = null;`
	`226`	`+ }`
`224`	`227`	`}`
`225`	`228`
`226`	`229`	`CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, (System.Collections.IList)used));`
`@@ -236,8 +239,13 @@ public void Trim()`
`236`	`239`	`}`
`237`	`240`	`}`
`238`	`241`
`239`		`- protected void WalkElemTree(Element elem, HashSet<Element> found)`
	`242`	`+ protected void WalkElemTree(Element? elem, HashSet<Element?> found)`
`240`	`243`	`{`
	`244`	`+ if(elem is null)`
	`245`	`+ {`
	`246`	`+ return;`
	`247`	`+ }`
	`248`	`+`
`241`	`249`	`found.Add(elem);`
`242`	`250`	`foreach (var value in elem.Inner.Values.Cast<Attribute>().Select(a => a.RawValue))`
`243`	`251`	`{`
`@@ -279,7 +287,7 @@ public IEnumerator<Element> GetEnumerator()`
`279`	`287`	`/// <summary>`
`280`	`288`	`/// Raised when an <see cref="Element"/> is added, removed, or replaced.`
`281`	`289`	`/// </summary>`
`282`		`- public event NotifyCollectionChangedEventHandler CollectionChanged;`
	`290`	`+ public event NotifyCollectionChangedEventHandler? CollectionChanged;`
`283`	`291`	`#endregion`
`284`	`292`
`285`	`293`	`public void Dispose()`
Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ public int EncodingVersion`
`466`	`466`	`/// Gets or sets the first Element of the Datamodel. Only Elements referenced by the Root element or one of its children are considered a part of the Datamodel.`
`467`	`467`	`/// </summary>`
`468`	`468`	`/// <exception cref="ElementOwnershipException">Thown when an attempt is made to assign an Element from another Datamodel to this property.</exception>`
`469`		`- public Element Root`
	`469`	`+ public Element? Root`
`470`	`470`	`{`
`471`	`471`	`get => _Root;`
`472`	`472`	`set`
`@@ -482,7 +482,7 @@ public Element Root`
`482`	`482`	`OnPropertyChanged();`
`483`	`483`	`}`
`484`	`484`	`}`
`485`		`- Element _Root;`
	`485`	`+ Element? _Root;`
`486`	`486`
`487`	`487`	`public AttributeList PrefixAttributes`
`488`	`488`	`{`
Original file line number	Diff line number	Diff line change
`@@ -207,10 +207,10 @@ internal set`
`207`	`207`	`/// <exception cref="KeyNotFoundException">Thrown when an attempt is made to get a name that is not present on this Element.</exception>`
`208`	`208`	`public T? Get<T>(string name)`
`209`	`209`	`{`
`210`		`- object value = this[name];`
	`210`	`+ object? value = this[name];`
`211`	`211`
`212`	`212`	`if (value is not T && !(typeof(T) == typeof(Element) && value == null))`
`213`		`- throw new AttributeTypeException(string.Format("Attribute \"{0}\" ({1}) does not implement {2}.", name, value.GetType().Name, typeof(T).Name));`
	`213`	`+ throw new AttributeTypeException(string.Format("Attribute \"{0}\" ({1}) does not implement {2}.", name, value?.GetType().Name, typeof(T).Name));`
`214`	`214`
`215`	`215`	`return (T?)value;`
`216`	`216`	`}`
`@@ -233,7 +233,7 @@ internal set`
`233`	`233`	`}`
`234`	`234`	`catch (AttributeTypeException)`
`235`	`235`	`{`
`236`		`- throw new AttributeTypeException(string.Format("Attribute \"{0}\" ({1}) is not an array.", name, this[name].GetType().Name));`
	`236`	`+ throw new AttributeTypeException(string.Format("Attribute \"{0}\" ({1}) is not an array.", name, this[name]?.GetType().Name));`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`}`
`@@ -249,7 +249,7 @@ internal set`
`249`	`249`	`/// <exception cref="ElementOwnershipException">Thrown when an attempt is made to set the value of the attribute to an Element from a different <see cref="Datamodel"/>.</exception>`
`250`	`250`	`/// <exception cref="AttributeTypeException">Thrown when an attempt is made to set a value that is not of a valid Datamodel attribute type.</exception>`
`251`	`251`	`/// <exception cref="IndexOutOfRangeException">Thrown when the maximum number of Attributes allowed in an Element has been reached.</exception>`
`252`		`- public override object this[string name]`
	`252`	`+ public override object? this[string name]`
`253`	`253`	`{`
`254`	`254`	`get`
`255`	`255`	`{`