[prmr#508] Moved window transformation listener to NotificationServic…

…e class
ArthusWQZ · Dec 6, 2023 · 4fc4f46 · 4fc4f46
1 parent 8c701bf
commit 4fc4f46
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/org/jetuml/JetUML.java b/src/org/jetuml/JetUML.java
@@ -28,7 +28,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import javafx.beans.value.ChangeListener;
 import org.jetuml.application.UserPreferences;
 import org.jetuml.application.Version;
 import org.jetuml.diagram.Diagram;
@@ -105,18 +104,6 @@ public void start(Stage pStage) throws Exception
 		diagramToOpen.ifPresent(diagram -> editor.setOpenFileAsDiagram(fileToOpen.get(), diagram));
 		pStage.setScene(new Scene(editor));
 
-		// Window position and size listener for notifications
-		ChangeListener<Number> stageTransformationListener = (pObservableValue, pOldValue, pNewValue) ->
-				NotificationService.instance().updateNotificationPosition();
-
-		// When the stage is moved, update the notification positions
-		pStage.xProperty().addListener(stageTransformationListener);
-		pStage.yProperty().addListener(stageTransformationListener);
-
-		// When the stage is resized, update the notification positions
-		pStage.heightProperty().addListener(stageTransformationListener);
-		pStage.widthProperty().addListener(stageTransformationListener);
-
 		NotificationService.instance().setMainStage(pStage);
 
 		pStage.getScene().getStylesheets().add(getClass().getResource("JetUML.css").toExternalForm());

diff --git a/src/org/jetuml/gui/NotificationService.java b/src/org/jetuml/gui/NotificationService.java
@@ -20,6 +20,7 @@
  *******************************************************************************/
 package org.jetuml.gui;
 
+import javafx.beans.value.ChangeListener;
 import javafx.stage.Stage;
 import org.jetuml.annotations.Singleton;
 
@@ -68,6 +69,21 @@ public static NotificationService instance()
     public void setMainStage(Stage pStage)
     {
         this.aMainStage = pStage;
+
+        if (pStage != null)
+        {
+            // Window position and size listener for notifications
+            ChangeListener<Number> stageTransformationListener = (pObservableValue, pOldValue, pNewValue) ->
+                    NotificationService.instance().updateNotificationPosition();
+
+            // When the stage is moved, update the notification positions
+            pStage.xProperty().addListener(stageTransformationListener);
+            pStage.yProperty().addListener(stageTransformationListener);
+
+            // When the stage is resized, update the notification positions
+            pStage.heightProperty().addListener(stageTransformationListener);
+            pStage.widthProperty().addListener(stageTransformationListener);
+        }
     }
 
     /**