Massive Argeo APIs refactoring

[lgpl/argeo-commons.git] / rcp / org.argeo.cms.ui.rcp / src / org / argeo / cms / ui / rcp / CmsRcpApp.java

diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
index c2f3d65a6d8fb5c6d858eb5902d63100a89a3276..8614d70b58a97bfd1a3da75b49dc88347602b03d 100644 (file)
--- a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
+++ b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
@@ -11,15 +11,14 @@ import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
 import org.argeo.api.cms.CmsApp;
+import org.argeo.api.cms.CmsAuth;
 import org.argeo.api.cms.CmsImageManager;
 import org.argeo.api.cms.CmsSession;
 import org.argeo.api.cms.CmsTheme;
 import org.argeo.api.cms.CmsUi;
 import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.UxContext;
 import org.argeo.cms.osgi.CmsOsgiUtils;
 import org.argeo.cms.swt.CmsSwtUtils;
@@ -38,7 +37,7 @@ import org.osgi.service.event.EventAdmin;
 /** Runs a {@link CmsApp} as an SWT desktop application. */
 @SuppressWarnings("restriction")
 public class CmsRcpApp implements CmsView {
-       private final static Log log = LogFactory.getLog(CmsRcpApp.class);
+       private final static CmsLog log = CmsLog.getLog(CmsRcpApp.class);
 
        private BundleContext bundleContext = FrameworkUtil.getBundle(CmsRcpApp.class).getBundleContext();
 
@@ -107,7 +106,7 @@ public class CmsRcpApp implements CmsView {
                        try {
                                // try pre-auth
 //                             loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, subject, loginShell);
-                               loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_SINGLE_USER);
+                               loginContext = new LoginContext(CmsAuth.LOGIN_CONTEXT_SINGLE_USER);
                                loginContext.login();
                        } catch (LoginException e) {
                                throw new IllegalStateException("Could not log in.", e);
@@ -129,7 +128,7 @@ public class CmsRcpApp implements CmsView {
                                ui = cmsApp.initUi(parent);
                                if (ui instanceof Composite)
                                        ((Composite) ui).setLayoutData(CmsSwtUtils.fillAll());
-                               //ui.setLayoutData(CmsUiUtils.fillAll());
+                               // ui.setLayoutData(CmsUiUtils.fillAll());
                                // we need ui to be set before refresh so that CmsView can store UI context data
                                // in it.
                                cmsApp.refreshUi(ui, null);