Finished open file

src/Avans.FlatGalaxy.Presentation/Commands/ShortcutList.cs

@@ -79,12 +79,12 @@ public ShortcutList()
                 Description = "Remove asteroid from simulation",
                 Key = Key.I,
             });
-            
-            Add(new Shortcut
+
+            Add(new()
             {
-                Command = new RemoveAsteroidCommand(),
-                Description = "Remove asteroid from simulation",
-                Key = Key.I,
+                Command = new OpenFileCommand(),
+                Description = "Stop simulation and start with new file",
+                Key = Key.Q,
             });
         }
 

src/Avans.FlatGalaxy.Presentation/MainWindow.xaml.cs

@@ -35,8 +35,8 @@ private void SubmitFile(object sender, RoutedEventArgs e)
                     var fileContents = _fileLoader.GetContent(fileUri);
                     var galaxy = _configurationParser.Parse(fileContents);
 
-                    _simulationWindow.Show(galaxy);
-                    Close();
+                    _simulationWindow.Show(galaxy, this);
+                    Hide();
                 }
                 else
                 {

src/Avans.FlatGalaxy.Presentation/SimulationWindow.xaml.cs

@@ -17,13 +17,12 @@ namespace Avans.FlatGalaxy.Presentation
 {
     public partial class SimulationWindow : Window, IObserver<ISimulator>
     {
-        private readonly MainWindow _mainWindow;
+        private MainWindow _mainWindow;
         private ISimulator? _simulator;
         private readonly ShortcutList _shortcutList;
 
-        public SimulationWindow(MainWindow mainWindow, ShortcutList shortcutList)
+        public SimulationWindow(ShortcutList shortcutList)
         {
-            _mainWindow = mainWindow;
             _shortcutList = shortcutList;
 
             InitializeComponent();
@@ -61,8 +60,10 @@ private void OnRender(object? sender, EventArgs e)
             if (_simulator.CollisionVisible && _simulator.QuadTree != null) { Draw(_simulator.QuadTree); }
         }
 
-        public void Show(Galaxy galaxy)
+        public void Show(Galaxy galaxy, MainWindow mainWindow)
         {
+            _mainWindow = mainWindow;
+
             Show();
 
             _simulator = new Simulator(galaxy);

src/Avans.FlatGalaxy.Simulation/Simulator.cs

@@ -43,6 +43,8 @@ public Simulator(Galaxy galaxy)
             _collisionHandler = new();
             _pathHandler = new();
             _caretaker = new SimulatorCaretaker(this);
+
+            _observers = new List<IObserver<ISimulator>>();
         }
 
         public Galaxy Galaxy { get; set; }