X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fmaintenance%2FDeploymentEntryPoint.java;h=e713f53e1aac9fed254b1f97e0e7a201b4feca28;hb=f4da6777015da3fc392138f0c01cea2f2add9ed3;hp=a746b3c46c938ff671a81c7fdb332f5619fd8e80;hpb=5b3108fe285bca50565b58b63fa4feddc96c0765;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java
index a746b3c46..e713f53e1 100644
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/DeploymentEntryPoint.java
@@ -3,10 +3,11 @@ package org.argeo.cms.e4.maintenance;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
-import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeDeployment;
-import org.argeo.api.NodeState;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsContext;
+import org.argeo.api.cms.CmsDeployment;
+import org.argeo.api.cms.CmsState;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
@@ -62,18 +63,18 @@ class DeploymentEntryPoint {
 		composite.setLayoutData(gridData);
 		composite.setLayout(new FillLayout());
 
-		ServiceReference<NodeState> nodeStateRef = bc.getServiceReference(NodeState.class);
+		ServiceReference<CmsState> nodeStateRef = bc.getServiceReference(CmsState.class);
 		if (nodeStateRef == null)
 			throw new IllegalStateException("No CMS state available");
-		NodeState nodeState = bc.getService(nodeStateRef);
-		ServiceReference<NodeDeployment> nodeDeploymentRef = bc.getServiceReference(NodeDeployment.class);
+		CmsState nodeState = bc.getService(nodeStateRef);
+		ServiceReference<CmsContext> nodeDeploymentRef = bc.getServiceReference(CmsContext.class);
 		Label label = new Label(composite, SWT.WRAP);
-		CmsUiUtils.markup(label);
+		CmsSwtUtils.markup(label);
 		if (nodeDeploymentRef == null) {
 			label.setText("Not yet deployed on <br>" + nodeState.getHostname() + "</br>, please configure below.");
 		} else {
-			Object stateUuid = nodeStateRef.getProperty(NodeConstants.CN);
-			NodeDeployment nodeDeployment = bc.getService(nodeDeploymentRef);
+			Object stateUuid = nodeStateRef.getProperty(CmsConstants.CN);
+			CmsContext nodeDeployment = bc.getService(nodeDeploymentRef);
 			GregorianCalendar calendar = new GregorianCalendar();
 			calendar.setTimeInMillis(nodeDeployment.getAvailableSince());
 			calendar.setTimeZone(TimeZone.getDefault());
@@ -85,7 +86,7 @@ class DeploymentEntryPoint {
 	private static Group createHighLevelGroup(Composite parent, String text) {
 		Group group = new Group(parent, SWT.NONE);
 		group.setText(text);
-		CmsUiUtils.markup(group);
+		CmsSwtUtils.markup(group);
 		return group;
 	}