X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Futil%2FCmsLink.java;h=3821e604573782ed926a50397f6baf8475fe0352;hb=633a8acd189cc22f06944d278879601189be1bc8;hp=4cad1de60fa74eb2f2fb487a6bd6dd008d5b7b63;hpb=043d226a5504a212eb5673c3ed4441c1167724d7;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsLink.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsLink.java
index 4cad1de60..3821e6045 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsLink.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsLink.java
@@ -8,10 +8,11 @@ import java.net.URL;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeUtils;
+import org.argeo.api.cms.CmsStyle;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.jcr.JcrException;
 import org.eclipse.rap.rwt.RWT;
@@ -27,7 +28,7 @@ import org.osgi.framework.BundleContext;
 
 /** A link to an internal or external location. */
 public class CmsLink implements CmsUiProvider {
-	private final static Log log = LogFactory.getLog(CmsLink.class);
+	private final static CmsLog log = CmsLog.getLog(CmsLink.class);
 	private BundleContext bundleContext;
 
 	private String label;
@@ -90,10 +91,10 @@ public class CmsLink implements CmsUiProvider {
 //		}
 
 		Composite comp = new Composite(parent, SWT.NONE);
-		comp.setLayout(CmsUiUtils.noSpaceGridLayout());
+		comp.setLayout(CmsSwtUtils.noSpaceGridLayout());
 
 		Label link = new Label(comp, SWT.NONE);
-		CmsUiUtils.markup(link);
+		CmsSwtUtils.markup(link);
 		GridData layoutData = new GridData(horizontalAlignment, verticalAlignment, false, false);
 		if (image != null) {
 			if (imageHeight != null)
@@ -104,8 +105,8 @@ public class CmsLink implements CmsUiProvider {
 		}
 
 		link.setLayoutData(layoutData);
-		CmsUiUtils.style(comp, style != null ? style : getDefaultStyle());
-		CmsUiUtils.style(link, style != null ? style : getDefaultStyle());
+		CmsSwtUtils.style(comp, style != null ? style : getDefaultStyle());
+		CmsSwtUtils.style(link, style != null ? style : getDefaultStyle());
 
 		// label
 		StringBuilder labelText = new StringBuilder();
@@ -113,7 +114,7 @@ public class CmsLink implements CmsUiProvider {
 			labelText.append("<a style='color:inherit;text-decoration:inherit;' href=\"");
 			if (loggedInTarget.equals("")) {
 				try {
-					Node homeNode = NodeUtils.getUserHome(context.getSession());
+					Node homeNode = CmsJcrUtils.getUserHome(context.getSession());
 					String homePath = homeNode.getPath();
 					labelText.append("/#" + homePath);
 				} catch (RepositoryException e) {