Moved EventBus namespace

technologists-team · Jul 12, 2024 · ca9e6fa · ca9e6fa
1 parent 372ebbb
commit ca9e6fa
Show file tree

Hide file tree

Showing 36 changed files with 44 additions and 49 deletions.
diff --git a/Hypercube.Client/Graphics/Event/MainWindowClosedEvent.cs b/Hypercube.Client/Graphics/Event/MainWindowClosedEvent.cs
@@ -1,5 +1,5 @@
 using Hypercube.Client.Graphics.Windows;
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Client.Graphics.Event;
 

diff --git a/Hypercube.Client/Graphics/Event/WindowClosed.cs b/Hypercube.Client/Graphics/Event/WindowClosed.cs
@@ -1,5 +1,5 @@
 using Hypercube.Client.Graphics.Windows;
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Client.Graphics.Event;
 

diff --git a/Hypercube.Client/Graphics/Event/WindowFocusChangedEvent.cs b/Hypercube.Client/Graphics/Event/WindowFocusChangedEvent.cs
@@ -1,5 +1,5 @@
 using Hypercube.Client.Graphics.Windows;
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Client.Graphics.Event;
 

diff --git a/Hypercube.Shared/Entities/Realisation/EventBus/EntitiesEventBus.cs b/Hypercube.Shared/Entities/Realisation/EventBus/EntitiesEventBus.cs
@@ -1,6 +1,6 @@
-using Hypercube.Shared.EventBus.Events;
-using Hypercube.Shared.EventBus.Events.Events;
-using Hypercube.Shared.EventBus.Events.Handlers;
+using Hypercube.Shared.EventBus;
+using Hypercube.Shared.EventBus.Events;
+using Hypercube.Shared.EventBus.Handlers;
 
 namespace Hypercube.Shared.Entities.Realisation.EventBus;
 

diff --git a/Hypercube.Shared/Entities/Realisation/Events/ComponentAdded.cs b/Hypercube.Shared/Entities/Realisation/Events/ComponentAdded.cs
@@ -1,5 +1,5 @@
 using Hypercube.Shared.Entities.Realisation.Components;
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Entities.Realisation.Events;
 

diff --git a/Hypercube.Shared/Entities/Realisation/Events/EntityAdded.cs b/Hypercube.Shared/Entities/Realisation/Events/EntityAdded.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Entities.Realisation.Events;
 

diff --git a/Hypercube.Shared/Entities/Realisation/Events/EntityRemoved.cs b/Hypercube.Shared/Entities/Realisation/Events/EntityRemoved.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Entities.Realisation.Events;
 

diff --git a/...Events/Broadcast/BroadcastRegistration.cs → ...entBus/Broadcast/BroadcastRegistration.cs b/...Events/Broadcast/BroadcastRegistration.cs → ...entBus/Broadcast/BroadcastRegistration.cs
@@ -1,6 +1,6 @@
-using Hypercube.Shared.EventBus.Events.Handlers;
+using Hypercube.Shared.EventBus.Handlers;
 
-namespace Hypercube.Shared.EventBus.Events.Broadcast;
+namespace Hypercube.Shared.EventBus.Broadcast;
 
 public sealed class BroadcastRegistration : IEquatable<BroadcastRegistration>
 {

diff --git a/Hypercube.Shared/EventBus/EventBus.cs b/Hypercube.Shared/EventBus/EventBus.cs
@@ -1,9 +1,8 @@
 using System.Runtime.CompilerServices;
+using Hypercube.Shared.EventBus.Broadcast;
 using Hypercube.Shared.EventBus.Events;
-using Hypercube.Shared.EventBus.Events.Broadcast;
-using Hypercube.Shared.EventBus.Events.Events;
-using Hypercube.Shared.EventBus.Events.Exceptions;
-using Hypercube.Shared.EventBus.Events.Handlers;
+using Hypercube.Shared.EventBus.Exceptions;
+using Hypercube.Shared.EventBus.Handlers;
 
 namespace Hypercube.Shared.EventBus;
 

diff --git a/...ared/EventBus/Events/EventRegistration.cs → ...cube.Shared/EventBus/EventRegistration.cs b/...ared/EventBus/Events/EventRegistration.cs → ...cube.Shared/EventBus/EventRegistration.cs
@@ -1,6 +1,6 @@
-using Hypercube.Shared.EventBus.Events.Broadcast;
+using Hypercube.Shared.EventBus.Broadcast;
 
-namespace Hypercube.Shared.EventBus.Events;
+namespace Hypercube.Shared.EventBus;
 
 /// <summary>
 /// Saves information about a specific event.

diff --git a/...Bus/Events/Events/CancellableEventArgs.cs → ...d/EventBus/Events/CancellableEventArgs.cs b/...Bus/Events/Events/CancellableEventArgs.cs → ...d/EventBus/Events/CancellableEventArgs.cs
@@ -1,4 +1,4 @@
-namespace Hypercube.Shared.EventBus.Events.Events;
+namespace Hypercube.Shared.EventBus.Events;
 
 public abstract class CancellableEventArgs : EventArgs
 {

diff --git a/Hypercube.Shared/EventBus/Events/EventArgs.cs b/Hypercube.Shared/EventBus/Events/EventArgs.cs
@@ -0,0 +1,3 @@
+namespace Hypercube.Shared.EventBus.Events;
+
+public abstract class EventArgs : IEventArgs;
diff --git a/Hypercube.Shared/EventBus/Events/Events/EventArgs.cs b/Hypercube.Shared/EventBus/Events/Events/EventArgs.cs
diff --git a/Hypercube.Shared/EventBus/Events/Events/IEventArgs.cs b/Hypercube.Shared/EventBus/Events/Events/IEventArgs.cs
diff --git a/Hypercube.Shared/EventBus/Events/Handlers/EventRefHandler.cs b/Hypercube.Shared/EventBus/Events/Handlers/EventRefHandler.cs
diff --git a/Hypercube.Shared/EventBus/Events/Handlers/RefHandler.cs b/Hypercube.Shared/EventBus/Events/Handlers/RefHandler.cs
diff --git a/...hared/EventBus/Events/IEventSubscriber.cs → ...cube.Shared/EventBus/Events/IEventArgs.cs b/...hared/EventBus/Events/IEventSubscriber.cs → ...cube.Shared/EventBus/Events/IEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Hypercube.Shared.EventBus.Events;
 
-public interface IEventSubscriber;
+public interface IEventArgs;
diff --git a/.../Exceptions/UnregisteredEventException.cs → .../Exceptions/UnregisteredEventException.cs b/.../Exceptions/UnregisteredEventException.cs → .../Exceptions/UnregisteredEventException.cs
@@ -1,4 +1,4 @@
-namespace Hypercube.Shared.EventBus.Events.Exceptions;
+namespace Hypercube.Shared.EventBus.Exceptions;
 
 public sealed class UnregisteredEventException(Type registrationType) :
     Exception($"Attempted to resolve unregistered event {registrationType.FullName}.");
diff --git a/Hypercube.Shared/EventBus/Handlers/EventRefHandler.cs b/Hypercube.Shared/EventBus/Handlers/EventRefHandler.cs
@@ -0,0 +1,3 @@
+namespace Hypercube.Shared.EventBus.Handlers;
+
+public delegate void EventRefHandler<T>(ref T ev);
diff --git a/Hypercube.Shared/EventBus/Handlers/RefHandler.cs b/Hypercube.Shared/EventBus/Handlers/RefHandler.cs
@@ -0,0 +1,3 @@
+namespace Hypercube.Shared.EventBus.Handlers;
+
+public delegate void RefHandler(ref Unit ev);
diff --git a/Hypercube.Shared/EventBus/IEventBus.cs b/Hypercube.Shared/EventBus/IEventBus.cs
@@ -1,6 +1,5 @@
 using Hypercube.Shared.EventBus.Events;
-using Hypercube.Shared.EventBus.Events.Events;
-using Hypercube.Shared.EventBus.Events.Handlers;
+using Hypercube.Shared.EventBus.Handlers;
 
 namespace Hypercube.Shared.EventBus;
 

diff --git a/Hypercube.Shared/EventBus/IEventSubscriber.cs b/Hypercube.Shared/EventBus/IEventSubscriber.cs
@@ -0,0 +1,3 @@
+namespace Hypercube.Shared.EventBus;
+
+public interface IEventSubscriber;
diff --git a/Hypercube.Shared/EventBus/Events/Unit.cs → Hypercube.Shared/EventBus/Unit.cs b/Hypercube.Shared/EventBus/Events/Unit.cs → Hypercube.Shared/EventBus/Unit.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Hypercube.Shared.EventBus.Events;
+namespace Hypercube.Shared.EventBus;
 
 public readonly struct Unit;
 

diff --git a/Hypercube.Shared/Runtimes/Event/RuntimeInitializationEvent.cs b/Hypercube.Shared/Runtimes/Event/RuntimeInitializationEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Runtimes.Event;
 

diff --git a/Hypercube.Shared/Runtimes/Event/RuntimeShutdownEvent.cs b/Hypercube.Shared/Runtimes/Event/RuntimeShutdownEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Runtimes.Event;
 

diff --git a/Hypercube.Shared/Runtimes/Event/RuntimeStartupEvent.cs b/Hypercube.Shared/Runtimes/Event/RuntimeStartupEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Runtimes.Event;
 

diff --git a/Hypercube.Shared/Runtimes/Loop/Event/InputFrameEvent.cs b/Hypercube.Shared/Runtimes/Loop/Event/InputFrameEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Runtimes.Loop.Event;
 

diff --git a/Hypercube.Shared/Runtimes/Loop/Event/RenderFrameEvent.cs b/Hypercube.Shared/Runtimes/Loop/Event/RenderFrameEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Runtimes.Loop.Event;
 

diff --git a/Hypercube.Shared/Runtimes/Loop/Event/TickFrameEvent.cs b/Hypercube.Shared/Runtimes/Loop/Event/TickFrameEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Runtimes.Loop.Event;
 

diff --git a/Hypercube.Shared/Runtimes/Loop/Event/UpdateFrameEvent.cs b/Hypercube.Shared/Runtimes/Loop/Event/UpdateFrameEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Runtimes.Loop.Event;
 

diff --git a/Hypercube.Shared/Scenes/Events/SceneAdded.cs b/Hypercube.Shared/Scenes/Events/SceneAdded.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Scenes.Events;
 

diff --git a/Hypercube.Shared/Scenes/Events/SceneDeleted.cs b/Hypercube.Shared/Scenes/Events/SceneDeleted.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events.Events;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Scenes.Events;
 

diff --git a/Hypercube.UnitTests/EventBus/EventBusRaiseTests.cs b/Hypercube.UnitTests/EventBus/EventBusRaiseTests.cs
@@ -1,6 +1,5 @@
 using Hypercube.Shared.EventBus;
 using Hypercube.Shared.EventBus.Events;
-using Hypercube.Shared.EventBus.Events.Events;
 
 namespace Hypercube.UnitTests.EventBus;
 

diff --git a/Hypercube.UnitTests/EventBus/EventBusRefClassTests.cs b/Hypercube.UnitTests/EventBus/EventBusRefClassTests.cs
@@ -1,6 +1,6 @@
 using Hypercube.Shared.EventBus;
 using Hypercube.Shared.EventBus.Events;
-using EventArgs = Hypercube.Shared.EventBus.Events.Events.EventArgs;
+using EventArgs = Hypercube.Shared.EventBus.Events.EventArgs;
 
 namespace Hypercube.UnitTests.EventBus;
 
@@ -24,7 +24,7 @@ public static void RefClass()
         Assert.Pass("All subscribers handled correctly");
     }
 
-    private sealed class TestEventClass : EventArgs
+    private sealed class TestEventClass : Shared.EventBus.Events.EventArgs
     {
         public int Counter { get; set; }
     }

diff --git a/Hypercube.UnitTests/EventBus/EventBusRefStructTests.cs b/Hypercube.UnitTests/EventBus/EventBusRefStructTests.cs
@@ -1,6 +1,5 @@
 using Hypercube.Shared.EventBus;
 using Hypercube.Shared.EventBus.Events;
-using Hypercube.Shared.EventBus.Events.Events;
 
 namespace Hypercube.UnitTests.EventBus;
 

diff --git a/Hypercube.UnitTests/EventBus/EventBusUnsubscribeTests.cs b/Hypercube.UnitTests/EventBus/EventBusUnsubscribeTests.cs
@@ -1,6 +1,5 @@
 using Hypercube.Shared.EventBus;
 using Hypercube.Shared.EventBus.Events;
-using Hypercube.Shared.EventBus.Events.Events;
 
 namespace Hypercube.UnitTests.EventBus;