X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=swt%2Frcp%2Forg.argeo.cms.swt.rcp%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Frcp%2FCmsRcpDisplayFactory.java;h=e94825db818c6014f30ea28ebf7be8ff42833884;hb=ed37119631fa2b14b38d374914f94e8073946042;hp=950acceceb1f0edff1c764143e62b1b63babe3e9;hpb=23582fca66e9f670fecee8685ddf4a5181e03c72;p=lgpl%2Fargeo-commons.git

diff --git a/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java b/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java
index 950accece..e94825db8 100644
--- a/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java
+++ b/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java
@@ -1,5 +1,7 @@
 package org.argeo.cms.ui.rcp;
 
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
 import java.nio.file.Path;
 
 import org.argeo.api.cms.CmsApp;
@@ -9,6 +11,8 @@ import org.eclipse.swt.widgets.Display;
 
 /** Creates the SWT {@link Display} in a dedicated thread. */
 public class CmsRcpDisplayFactory {
+	private final static Logger logger = System.getLogger(CmsRcpDisplayFactory.class.getName());
+
 	/** File name in a run directory */
 	private final static String ARGEO_RCP_URL = "argeo.rcp.url";
 
@@ -50,20 +54,22 @@ public class CmsRcpDisplayFactory {
 
 		@Override
 		public void run() {
-			display = Display.getDefault();
-			display.setRuntimeExceptionHandler((e) -> e.printStackTrace());
-			display.setErrorHandler((e) -> e.printStackTrace());
-
-//			for (String contextName : cmsApps.keySet()) {
-//				openCmsApp(contextName);
-//			}
-
-			while (!shutdown) {
-				if (!display.readAndDispatch())
-					display.sleep();
+			try {
+				display = Display.getDefault();
+				display.setRuntimeExceptionHandler((e) -> e.printStackTrace());
+				display.setErrorHandler((e) -> e.printStackTrace());
+
+				while (!shutdown) {
+					if (!display.readAndDispatch())
+						display.sleep();
+				}
+				display.dispose();
+				display = null;
+			} catch (UnsatisfiedLinkError e) {
+				logger.log(Level.ERROR,
+						"Cannot load SWT, probably because the OSGi framework has been refresh. Restart the application.",
+						e);
 			}
-			display.dispose();
-			display = null;
 		}
 	}