Massive Argeo APIs refactoring

[gpl/argeo-suite.git] / org.argeo.suite.ui / src / org / argeo / suite / ui / DefaultLeadPane.java

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
index 46de1770abf67a9eeebab2b61a830f743941f071..2eaba61ccc9b557f953310b134e980cc900c39b9 100644 (file)
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
@@ -12,13 +12,12 @@ import java.util.TreeMap;
 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.CmsView;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.Localized;
 import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.suite.RankedObject;
 import org.argeo.suite.SuiteUtils;
 import org.eclipse.swt.SWT;
@@ -33,7 +32,7 @@ import org.osgi.framework.wiring.BundleWiring;
 
 /** Side pane listing various perspectives. */
 public class DefaultLeadPane implements CmsUiProvider {
-       private final static Log log = LogFactory.getLog(DefaultLeadPane.class);
+       private final static CmsLog log = CmsLog.getLog(DefaultLeadPane.class);
 
        public static enum Property {
                defaultLayers, adminLayers;
@@ -47,10 +46,10 @@ public class DefaultLeadPane implements CmsUiProvider {
 
        @Override
        public Control createUi(Composite parent, Node node) throws RepositoryException {
-               CmsView cmsView = CmsView.getCmsView(parent);
-               parent.setLayout(CmsUiUtils.noSpaceGridLayout());
+               CmsView cmsView = CmsSwtUtils.getCmsView(parent);
+               parent.setLayout(CmsSwtUtils.noSpaceGridLayout());
                Composite appLayersC = new Composite(parent, SWT.NONE);
-               CmsUiUtils.style(appLayersC, SuiteStyle.leadPane);
+               CmsSwtUtils.style(appLayersC, SuiteStyle.leadPane);
                GridLayout layout = new GridLayout();
                layout.verticalSpacing = 10;
                layout.marginTop = 10;
@@ -62,7 +61,7 @@ public class DefaultLeadPane implements CmsUiProvider {
                Composite adminLayersC;
                if (!adminLayers.isEmpty()) {
                        adminLayersC = new Composite(parent, SWT.NONE);
-                       CmsUiUtils.style(adminLayersC, SuiteStyle.leadPane);
+                       CmsSwtUtils.style(adminLayersC, SuiteStyle.leadPane);
                        GridLayout adminLayout = new GridLayout();
                        adminLayout.verticalSpacing = 10;
                        adminLayout.marginBottom = 10;