Move call of init method from DndManager to avoid crash message when

user hits escape to quit Nomad.

ChangeLog

+4.3.21 26/03/2024
+------
+* Move call of init method from DndManager to avoid crash message when user hits escape to quit Nomad. 
+
+
 4.3.20 22/03/2024
 ------
 * Bug fixed: initParticularWidgets for dynamic PWidget was not correctly called when increasing number of dynamic in a DynamicComposite 

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fr.ill.ics</groupId>
 	<artifactId>nomadgui</artifactId>
-	<version>4.3.20</version>
+	<version>4.3.21</version>
 	<name>NomadGUI</name>
 	<description>Graphical user interface for Nomad</description>
 	<scm>

src/main/java/fr/ill/ics/client/control/startup/Startup.java

@@ -38,6 +38,7 @@ import fr.ill.ics.client.control.spy.SpyManager;
 import fr.ill.ics.client.control.token.TokenManager;
 import fr.ill.ics.client.control.version.VersionChecker;
 import fr.ill.ics.client.view.MainWindowPeer;
+import fr.ill.ics.client.view.dnd.DndManager;
 import fr.ill.ics.client.view.factory.WidgetFactory;
 import fr.ill.ics.client.view.startup.StartupSplashDialog;
 import fr.ill.ics.client.view.util.dialog.DialogManager;
@@ -321,6 +322,12 @@ public class Startup {
 
 			// Initialise spy manager
 			SpyManager.getInstance().init();
+			
+			
+			// initialise Drag and Drop manager
+			DndManager.getInstance().init();
+
+			
 			informationKey = "clientReadyMessage";
 			WidgetFactory.CURRENT_MODE = previousMode;
 

src/main/java/fr/ill/ics/client/view/dnd/DndManager.java

@@ -167,5 +167,6 @@ public abstract class DndManager {
 	protected abstract void setForbiddenCursor();
 	protected abstract int getCursorX();
 	protected abstract int getCursorY();
+	public abstract void init();
 
 }
\ No newline at end of file

src/main/java/fr/ill/ics/client/view/dnd/swt/SWTDndManager.java

@@ -39,6 +39,7 @@ import fr.ill.ics.client.view.dnd.DropTarget;
 import fr.ill.ics.client.view.factory.ImageFactory;
 import fr.ill.ics.client.view.factory.swt.SWTImageFactory;
 import fr.ill.ics.client.view.factory.swt.SWTWidgetFactory;
+import fr.ill.ics.client.view.swt.SWTMainWindowPeer;
 import fr.ill.ics.client.view.util.swt.SWTImageUtils;
 import fr.ill.ics.client.view.widget.swt.SWTPContainer;
 
@@ -75,9 +76,8 @@ public class SWTDndManager extends DndManager {
 	 * 
 	 * @param display
 	 */
-	public void init(final Display display) {
-		this.display = display;
-
+	public void init() {
+		this.display = ((SWTMainWindowPeer)SWTMainWindowPeer.getInstance()).getDisplay();
 		display.addFilter(SWT.KeyDown, new Listener() {
 
 			public void handleEvent(Event event) {

src/main/java/fr/ill/ics/client/view/swt/SWTMainWindowPeer.java

@@ -44,7 +44,6 @@ import fr.ill.ics.client.control.remote.RemoteControlManager;
 import fr.ill.ics.client.control.startup.Startup;
 import fr.ill.ics.client.view.MainWindowPeer;
 import fr.ill.ics.client.view.bar.command.swt.SWTCommandBar;
-import fr.ill.ics.client.view.dnd.swt.SWTDndManager;
 import fr.ill.ics.client.view.error.swt.SWTConfigurationErrorsWindow;
 import fr.ill.ics.client.view.error.swt.SWTServerErrorConsole;
 import fr.ill.ics.client.view.error.swt.SWTSimulationResultsWindow;
@@ -353,9 +352,6 @@ public class SWTMainWindowPeer extends MainWindowPeer {
 			addTokenWidget();
 		}
 
-		// initialise Drag and Drop manager
-		SWTDndManager.getSWTInstance().init(display);
-
 		// initialise waiting shell
 		//waitingDialog = new SWTWaitingDialog(shell);