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=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hp=33772bc8ed1ae88fb9e07d559939e100fcc523b2;hpb=c53fec78daddb69c489686844188036b04e1615a;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 33772bc8e..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.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();