Changed events in VisualScripting relating things to weak references

src/Artemis.VisualScripting/Editor/Controls/Wrapper/VisualScript.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Threading;
 using Artemis.Core;
+using Artemis.Core.Events;
 using Artemis.VisualScripting.Events;
 using Artemis.VisualScripting.ViewModel;
 
@@ -78,10 +79,9 @@ namespace Artemis.VisualScripting.Editor.Controls.Wrapper
 
             LocationOffset = SurfaceSize / 2.0;
 
-            Nodes.CollectionChanged += OnNodeCollectionChanged;
-
-            script.NodeAdded += OnScriptNodeAdded;
-            script.NodeRemoved += OnScriptRemovedAdded;
+            CollectionChangedEventManager.AddHandler(Nodes, OnNodeCollectionChanged);
+            NodeAddedEventManager.AddHandler(script, OnScriptNodeAdded);
+            NodeRemovedEventManager.AddHandler(script, OnScriptNodeRemoved);
 
             foreach (INode node in Script.Nodes)
                 InitializeNode(node);
@@ -107,16 +107,16 @@ namespace Artemis.VisualScripting.Editor.Controls.Wrapper
                 RegisterNodes(args.NewItems.Cast<VisualScriptNode>());
         }
 
-        private void OnScriptNodeAdded(object sender, INode node)
+        private void OnScriptNodeAdded(object sender, SingleValueEventArgs<INode> args)
         {
-            if (_nodeMapping.ContainsKey(node)) return;
+            if (_nodeMapping.ContainsKey(args.Value)) return;
 
-            InitializeNode(node);
+            InitializeNode(args.Value);
         }
 
-        private void OnScriptRemovedAdded(object sender, INode node)
+        private void OnScriptNodeRemoved(object sender, SingleValueEventArgs<INode> args)
         {
-            if (!_nodeMapping.TryGetValue(node, out VisualScriptNode visualScriptNode)) return;
+            if (!_nodeMapping.TryGetValue(args.Value, out VisualScriptNode visualScriptNode)) return;
 
             Nodes.Remove(visualScriptNode);
         }

src/Artemis.VisualScripting/Editor/Controls/Wrapper/VisualScriptNode.cs

@@ -98,7 +98,10 @@ namespace Artemis.VisualScripting.Editor.Controls.Wrapper
             this.Script = script;
             this.Node = node;
 
-            Node.PropertyChanged += OnNodePropertyChanged;
+            PropertyChangedEventManager.AddHandler(Node, OnNodePropertyChanged, nameof(Node.Pins));
+            PropertyChangedEventManager.AddHandler(Node, OnNodePropertyChanged, nameof(Node.PinCollections));
+            PropertyChangedEventManager.AddHandler(Node, OnNodePropertyChanged, nameof(Node.X));
+            PropertyChangedEventManager.AddHandler(Node, OnNodePropertyChanged, nameof(Node.Y));
 
             ValidatePins();
         }

src/Artemis.VisualScripting/Editor/Controls/Wrapper/VisualScriptPin.cs

@@ -3,6 +3,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using Artemis.Core;
+using Artemis.Core.Events;
 using Artemis.VisualScripting.Events;
 using Artemis.VisualScripting.Internal;
 using Artemis.VisualScripting.ViewModel;
@@ -52,15 +53,15 @@ namespace Artemis.VisualScripting.Editor.Controls.Wrapper
             this.Node = node;
             this.Pin = pin;
 
-            pin.PinConnected += PinConnectionChanged;
-            pin.PinDisconnected += PinConnectionChanged;
+            PinConnectedEventManager.AddHandler(pin, PinConnectionChanged);
+            PinDisconnectedEventManager.AddHandler(pin, PinConnectionChanged);
         }
 
         #endregion
 
         #region Methods
 
-        private void PinConnectionChanged(object sender, IPin pin)
+        private void PinConnectionChanged(object sender, SingleValueEventArgs<IPin> pin)
         {
             if (_isConnectionUpdated) return;
 

src/Artemis.VisualScripting/Editor/Controls/Wrapper/VisualScriptPinCollection.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Artemis.Core;
+using Artemis.Core.Events;
+using Artemis.VisualScripting.Events;
 using Artemis.VisualScripting.ViewModel;
 
 namespace Artemis.VisualScripting.Editor.Controls.Wrapper
@@ -34,8 +36,8 @@ namespace Artemis.VisualScripting.Editor.Controls.Wrapper
             this.Node = node;
             this.PinCollection = pinCollection;
 
-            pinCollection.PinAdded += OnPinCollectionPinAdded;
-            pinCollection.PinRemoved += OnPinCollectionPinRemoved;
+            PinAddedEventManager.AddHandler(pinCollection, OnPinCollectionPinAdded);
+            PinRemovedEventManager.AddHandler(pinCollection, OnPinCollectionPinRemoved);
 
             foreach (IPin pin in PinCollection)
             {
@@ -49,32 +51,27 @@ namespace Artemis.VisualScripting.Editor.Controls.Wrapper
 
         #region Methods
 
-        private void OnPinCollectionPinRemoved(object sender, IPin pin)
+        private void OnPinCollectionPinRemoved(object sender, SingleValueEventArgs<IPin> args)
         {
-            if (!_pinMapping.TryGetValue(pin, out VisualScriptPin visualScriptPin)) return;
+            if (!_pinMapping.TryGetValue(args.Value, out VisualScriptPin visualScriptPin)) return;
 
             visualScriptPin.DisconnectAll();
             Pins.Remove(visualScriptPin);
         }
 
-        private void OnPinCollectionPinAdded(object sender, IPin pin)
+        private void OnPinCollectionPinAdded(object sender, SingleValueEventArgs<IPin> args)
         {
-            if (_pinMapping.ContainsKey(pin)) return;
+            if (_pinMapping.ContainsKey(args.Value)) return;
 
-            VisualScriptPin visualScriptPin = new(Node, pin);
-            _pinMapping.Add(pin, visualScriptPin);
+            VisualScriptPin visualScriptPin = new(Node, args.Value);
+            _pinMapping.Add(args.Value, visualScriptPin);
             Pins.Add(visualScriptPin);
         }
 
-        public void AddPin()
-        {
-            PinCollection.AddPin();
-        }
+        public void AddPin() => PinCollection.AddPin();
+
+        public void RemovePin(VisualScriptPin pin) => PinCollection.Remove(pin.Pin);
 
-        public void RemovePin(VisualScriptPin pin)
-        {
-            PinCollection.Remove(pin.Pin);
-        }
         public void RemoveAll()
         {
             List<VisualScriptPin> pins = new(Pins);

src/Artemis.VisualScripting/Events/NodeAddedEventManager.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Windows;
+using Artemis.Core;
+using Artemis.Core.Events;
+
+namespace Artemis.VisualScripting.Events
+{
+    public class NodeAddedEventManager : WeakEventManager
+    {
+        #region Properties & Fields
+
+        private static NodeAddedEventManager CurrentManager
+        {
+            get
+            {
+                Type type = typeof(NodeAddedEventManager);
+                NodeAddedEventManager changedEventManager = (NodeAddedEventManager)GetCurrentManager(type);
+                if (changedEventManager == null)
+                {
+                    changedEventManager = new NodeAddedEventManager();
+                    SetCurrentManager(type, changedEventManager);
+                }
+                return changedEventManager;
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        private NodeAddedEventManager()
+        { }
+
+        #endregion
+
+        #region Methods
+
+        public static void AddListener(INodeScript source, IWeakEventListener listener)
+        {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedAddListener(source, listener);
+        }
+
+        public static void RemoveListener(INodeScript source, IWeakEventListener listener)
+        {
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedRemoveListener(source, listener);
+        }
+
+        public static void AddHandler(INodeScript source, EventHandler<SingleValueEventArgs<INode>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedAddHandler(source, handler);
+        }
+
+        public static void RemoveHandler(INodeScript source, EventHandler<SingleValueEventArgs<INode>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedRemoveHandler(source, handler);
+        }
+
+        protected override ListenerList NewListenerList() => new ListenerList<SingleValueEventArgs<INode>>();
+
+        protected override void StartListening(object source) => ((INodeScript)source).NodeAdded += OnNodeAdded;
+
+        protected override void StopListening(object source) => ((INodeScript)source).NodeAdded -= OnNodeAdded;
+
+        private void OnNodeAdded(object sender, SingleValueEventArgs<INode> args) => DeliverEvent(sender, args);
+
+        #endregion
+    }
+}

src/Artemis.VisualScripting/Events/NodeRemovedEventManager.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Windows;
+using Artemis.Core;
+using Artemis.Core.Events;
+
+namespace Artemis.VisualScripting.Events
+{
+    public class NodeRemovedEventManager : WeakEventManager
+    {
+        #region Properties & Fields
+
+        private static NodeRemovedEventManager CurrentManager
+        {
+            get
+            {
+                Type type = typeof(NodeRemovedEventManager);
+                NodeRemovedEventManager changedEventManager = (NodeRemovedEventManager)GetCurrentManager(type);
+                if (changedEventManager == null)
+                {
+                    changedEventManager = new NodeRemovedEventManager();
+                    SetCurrentManager(type, changedEventManager);
+                }
+                return changedEventManager;
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        private NodeRemovedEventManager()
+        { }
+
+        #endregion
+
+        #region Methods
+
+        public static void AddListener(INodeScript source, IWeakEventListener listener)
+        {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedAddListener(source, listener);
+        }
+
+        public static void RemoveListener(INodeScript source, IWeakEventListener listener)
+        {
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedRemoveListener(source, listener);
+        }
+
+        public static void AddHandler(INodeScript source, EventHandler<SingleValueEventArgs<INode>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedAddHandler(source, handler);
+        }
+
+        public static void RemoveHandler(INodeScript source, EventHandler<SingleValueEventArgs<INode>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedRemoveHandler(source, handler);
+        }
+
+        protected override ListenerList NewListenerList() => new ListenerList<SingleValueEventArgs<INode>>();
+
+        protected override void StartListening(object source) => ((INodeScript)source).NodeRemoved += OnNodeRemoved;
+
+        protected override void StopListening(object source) => ((INodeScript)source).NodeRemoved -= OnNodeRemoved;
+
+        private void OnNodeRemoved(object sender, SingleValueEventArgs<INode> args) => DeliverEvent(sender, args);
+
+        #endregion
+    }
+}

src/Artemis.VisualScripting/Events/PinAddedEventManager.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Windows;
+using Artemis.Core;
+using Artemis.Core.Events;
+
+namespace Artemis.VisualScripting.Events
+{
+    public class PinAddedEventManager : WeakEventManager
+    {
+        #region Properties & Fields
+
+        private static PinAddedEventManager CurrentManager
+        {
+            get
+            {
+                Type type = typeof(PinAddedEventManager);
+                PinAddedEventManager changedEventManager = (PinAddedEventManager)GetCurrentManager(type);
+                if (changedEventManager == null)
+                {
+                    changedEventManager = new PinAddedEventManager();
+                    SetCurrentManager(type, changedEventManager);
+                }
+                return changedEventManager;
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        private PinAddedEventManager()
+        { }
+
+        #endregion
+
+        #region Methods
+
+        public static void AddListener(IPinCollection source, IWeakEventListener listener)
+        {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedAddListener(source, listener);
+        }
+
+        public static void RemoveListener(IPinCollection source, IWeakEventListener listener)
+        {
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedRemoveListener(source, listener);
+        }
+
+        public static void AddHandler(IPinCollection source, EventHandler<SingleValueEventArgs<IPin>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedAddHandler(source, handler);
+        }
+
+        public static void RemoveHandler(IPinCollection source, EventHandler<SingleValueEventArgs<IPin>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedRemoveHandler(source, handler);
+        }
+
+        protected override ListenerList NewListenerList() => new ListenerList<SingleValueEventArgs<IPin>>();
+
+        protected override void StartListening(object source) => ((IPinCollection)source).PinAdded += OnPinAdded;
+
+        protected override void StopListening(object source) => ((IPinCollection)source).PinAdded -= OnPinAdded;
+
+        private void OnPinAdded(object sender, SingleValueEventArgs<IPin> args) => DeliverEvent(sender, args);
+
+        #endregion
+    }
+}

src/Artemis.VisualScripting/Events/PinConnectedEventManager.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Windows;
+using Artemis.Core;
+using Artemis.Core.Events;
+
+namespace Artemis.VisualScripting.Events
+{
+    public class PinConnectedEventManager : WeakEventManager
+    {
+        #region Properties & Fields
+
+        private static PinConnectedEventManager CurrentManager
+        {
+            get
+            {
+                Type type = typeof(PinConnectedEventManager);
+                PinConnectedEventManager changedEventManager = (PinConnectedEventManager)GetCurrentManager(type);
+                if (changedEventManager == null)
+                {
+                    changedEventManager = new PinConnectedEventManager();
+                    SetCurrentManager(type, changedEventManager);
+                }
+                return changedEventManager;
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        private PinConnectedEventManager()
+        { }
+
+        #endregion
+
+        #region Methods
+
+        public static void AddListener(IPin source, IWeakEventListener listener)
+        {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedAddListener(source, listener);
+        }
+
+        public static void RemoveListener(IPin source, IWeakEventListener listener)
+        {
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedRemoveListener(source, listener);
+        }
+
+        public static void AddHandler(IPin source, EventHandler<SingleValueEventArgs<IPin>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedAddHandler(source, handler);
+        }
+
+        public static void RemoveHandler(IPin source, EventHandler<SingleValueEventArgs<IPin>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedRemoveHandler(source, handler);
+        }
+
+        protected override ListenerList NewListenerList() => new ListenerList<SingleValueEventArgs<IPin>>();
+
+        protected override void StartListening(object source) => ((IPin)source).PinConnected += OnPinConnected;
+
+        protected override void StopListening(object source) => ((IPin)source).PinConnected -= OnPinConnected;
+
+        private void OnPinConnected(object sender, SingleValueEventArgs<IPin> args) => DeliverEvent(sender, args);
+
+        #endregion
+    }
+}

src/Artemis.VisualScripting/Events/PinDisconnectedEventManager.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Windows;
+using Artemis.Core;
+using Artemis.Core.Events;
+
+namespace Artemis.VisualScripting.Events
+{
+    public class PinDisconnectedEventManager : WeakEventManager
+    {
+        #region Properties & Fields
+
+        private static PinDisconnectedEventManager CurrentManager
+        {
+            get
+            {
+                Type type = typeof(PinDisconnectedEventManager);
+                PinDisconnectedEventManager changedEventManager = (PinDisconnectedEventManager)GetCurrentManager(type);
+                if (changedEventManager == null)
+                {
+                    changedEventManager = new PinDisconnectedEventManager();
+                    SetCurrentManager(type, changedEventManager);
+                }
+                return changedEventManager;
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        private PinDisconnectedEventManager()
+        { }
+
+        #endregion
+
+        #region Methods
+
+        public static void AddListener(IPin source, IWeakEventListener listener)
+        {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedAddListener(source, listener);
+        }
+
+        public static void RemoveListener(IPin source, IWeakEventListener listener)
+        {
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedRemoveListener(source, listener);
+        }
+
+        public static void AddHandler(IPin source, EventHandler<SingleValueEventArgs<IPin>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedAddHandler(source, handler);
+        }
+
+        public static void RemoveHandler(IPin source, EventHandler<SingleValueEventArgs<IPin>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedRemoveHandler(source, handler);
+        }
+
+        protected override ListenerList NewListenerList() => new ListenerList<SingleValueEventArgs<IPin>>();
+
+        protected override void StartListening(object source) => ((IPin)source).PinDisconnected += OnPinDisconnected;
+
+        protected override void StopListening(object source) => ((IPin)source).PinDisconnected -= OnPinDisconnected;
+
+        private void OnPinDisconnected(object sender, SingleValueEventArgs<IPin> args) => DeliverEvent(sender, args);
+
+        #endregion
+    }
+}

src/Artemis.VisualScripting/Events/PinRemovedEventManager.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Windows;
+using Artemis.Core;
+using Artemis.Core.Events;
+
+namespace Artemis.VisualScripting.Events
+{
+    public class PinRemovedEventManager : WeakEventManager
+    {
+        #region Properties & Fields
+
+        private static PinRemovedEventManager CurrentManager
+        {
+            get
+            {
+                Type type = typeof(PinRemovedEventManager);
+                PinRemovedEventManager changedEventManager = (PinRemovedEventManager)GetCurrentManager(type);
+                if (changedEventManager == null)
+                {
+                    changedEventManager = new PinRemovedEventManager();
+                    SetCurrentManager(type, changedEventManager);
+                }
+                return changedEventManager;
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        private PinRemovedEventManager()
+        { }
+
+        #endregion
+
+        #region Methods
+
+        public static void AddListener(IPinCollection source, IWeakEventListener listener)
+        {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedAddListener(source, listener);
+        }
+
+        public static void RemoveListener(IPinCollection source, IWeakEventListener listener)
+        {
+            if (listener == null) throw new ArgumentNullException(nameof(listener));
+
+            CurrentManager.ProtectedRemoveListener(source, listener);
+        }
+
+        public static void AddHandler(IPinCollection source, EventHandler<SingleValueEventArgs<IPin>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedAddHandler(source, handler);
+        }
+
+        public static void RemoveHandler(IPinCollection source, EventHandler<SingleValueEventArgs<IPin>> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            CurrentManager.ProtectedRemoveHandler(source, handler);
+        }
+
+        protected override ListenerList NewListenerList() => new ListenerList<SingleValueEventArgs<IPin>>();
+
+        protected override void StartListening(object source) => ((IPinCollection)source).PinRemoved += OnPinRemoved;
+
+        protected override void StopListening(object source) => ((IPinCollection)source).PinRemoved -= OnPinRemoved;
+
+        private void OnPinRemoved(object sender, SingleValueEventArgs<IPin> args) => DeliverEvent(sender, args);
+
+        #endregion
+    }
+}