X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fparts%2FEgoDashboard.java;fp=org.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fparts%2FEgoDashboard.java;h=5a805d1e953646da314646793cb16bd87b3b58d2;hb=b7683883512d924a039a43c2e1102290aa49f64d;hp=8499356dca3b0c77d804273056029fff773e0f09;hpb=03f646fd0d7e7ce393694c836c779bc67a4eef55;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java
index 8499356dc..5a805d1e9 100644
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java
@@ -1,16 +1,15 @@
 package org.argeo.cms.e4.parts;
 
-import static org.argeo.cms.ui.util.CmsUiUtils.lbl;
-import static org.argeo.cms.ui.util.CmsUiUtils.txt;
-
 import java.security.AccessController;
 import java.time.ZonedDateTime;
 
 import javax.annotation.PostConstruct;
 import javax.security.auth.Subject;
 
-import org.argeo.cms.auth.CmsSession;
+import org.argeo.api.cms.CmsSession;
 import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.osgi.CmsOsgiUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.osgi.framework.BundleContext;
@@ -25,23 +24,23 @@ public class EgoDashboard {
 		p.setLayout(new GridLayout());
 		String username = CurrentUser.getUsername();
 
-		lbl(p, "<strong>" + CurrentUser.getDisplayName() + "</strong>");
-		txt(p, username);
-		lbl(p, "Roles:");
+		CmsSwtUtils.lbl(p, "<strong>" + CurrentUser.getDisplayName() + "</strong>");
+		CmsSwtUtils.txt(p, username);
+		CmsSwtUtils.lbl(p, "Roles:");
 		roles: for (String role : CurrentUser.roles()) {
 			if (username.equals(role))
 				continue roles;
-			txt(p, role);
+			CmsSwtUtils.txt(p, role);
 		}
 
 		Subject subject = Subject.getSubject(AccessController.getContext());
 		if (subject != null) {
-			CmsSession cmsSession = CmsSession.getCmsSession(bc, subject);
+			CmsSession cmsSession = CmsOsgiUtils.getCmsSession(bc, subject);
 			ZonedDateTime loggedIndSince = cmsSession.getCreationTime();
-			lbl(p, "Session:");
-			txt(p, cmsSession.getUuid().toString());
-			lbl(p, "Logged in since:");
-			txt(p, loggedIndSince.toString());
+			CmsSwtUtils.lbl(p, "Session:");
+			CmsSwtUtils.txt(p, cmsSession.getUuid().toString());
+			CmsSwtUtils.lbl(p, "Logged in since:");
+			CmsSwtUtils.txt(p, loggedIndSince.toString());
 		}
 	}
 }