Major refactoring of Argeo CMS UI

[lgpl/argeo-commons.git] / org.argeo.cms.e4 / src / org / argeo / cms / e4 / parts / EgoDashboard.java

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 8499356dca3b0c77d804273056029fff773e0f09..5a805d1e953646da314646793cb16bd87b3b58d2 100644 (file)
--- 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());
                }
        }
 }