Introduce Makefile for Java build

[lgpl/argeo-commons.git] / org.argeo.cms.e4 / src / org / argeo / cms / e4 / maintenance / AbstractOsgiComposite.java

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java
index c83183130f5bb22adb8bd6ce90ddaa76dc6c39f2..4fd1d68dc5498dc6bf893f5a603935210898bb72 100644 (file)
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/AbstractOsgiComposite.java
@@ -2,9 +2,8 @@ package org.argeo.cms.e4.maintenance;
 
 import java.util.Collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -16,12 +15,12 @@ import org.osgi.framework.ServiceReference;
 abstract class AbstractOsgiComposite extends Composite {
        private static final long serialVersionUID = -4097415973477517137L;
        protected final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
-       protected final Log log = LogFactory.getLog(getClass());
+       protected final CmsLog log = CmsLog.getLog(getClass());
 
        public AbstractOsgiComposite(Composite parent, int style) {
                super(parent, style);
-               parent.setLayout(CmsUiUtils.noSpaceGridLayout());
-               setLayout(CmsUiUtils.noSpaceGridLayout());
+               parent.setLayout(CmsSwtUtils.noSpaceGridLayout());
+               setLayout(CmsSwtUtils.noSpaceGridLayout());
                setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
                initUi(style);
        }