From d546fc1b9e19a86eb0e33ac4be824b52239316fc Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 11 Feb 2015 17:34:41 +0000 Subject: [PATCH] Clean up and re-organise CMS git-svn-id: https://svn.argeo.org/commons/trunk@7791 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org/argeo/cms/AbstractCmsEntryPoint.java | 1 + .../org/argeo/cms/BundleResourceLoader.java | 2 +- .../src/org/argeo/cms/CmsApplication.java | 1 + .../org/argeo/cms/CmsEntryPointFactory.java | 280 ------------------ .../src/org/argeo/cms/CmsInstallPage.java | 21 -- org.argeo.cms/src/org/argeo/cms/CmsLogin.java | 4 +- org.argeo.cms/src/org/argeo/cms/CmsMsg.java | 3 + .../src/org/argeo/cms/CmsSession.java | 2 + .../src/org/argeo/cms/UrlResourceLoader.java | 25 -- .../{ => i18n}/DefaultsResourceBundle.java | 4 +- .../src/org/argeo/cms/{ => i18n}/Msg.java | 4 +- .../argeo/cms/internal/ImageManagerImpl.java | 2 +- .../cms/internal/SimpleEditableImage.java | 2 +- .../cms/internal/text/AbstractTextViewer.java | 8 +- .../src/org/argeo/cms/maintenance/Browse.java | 4 +- .../argeo/cms/maintenance/NonAdminPage.java | 2 +- .../org/argeo/cms/text/CustomTextEditor.java | 2 +- .../{ => text}/IdentityTextInterpreter.java | 6 +- org.argeo.cms/src/org/argeo/cms/text/Img.java | 2 +- .../src/org/argeo/cms/text/Paragraph.java | 2 +- .../argeo/cms/text/StandardTextEditor.java | 2 +- .../org/argeo/cms/text/TextEditorHeader.java | 2 +- .../argeo/cms/{ => text}/TextInterpreter.java | 2 +- .../src/org/argeo/cms/text/TextSection.java | 2 +- .../src/org/argeo/cms/text/WikiPage.java | 4 +- .../src/org/argeo/cms/users/UserPage.java | 2 +- .../src/org/argeo/cms/users/UserPart.java | 2 +- .../org/argeo/cms/users/UserRolesPart.java | 2 +- .../src/org/argeo/cms/users/UserViewer.java | 2 +- .../org/argeo/cms/users/UserViewerOld.java | 2 +- .../src/org/argeo/cms/users/Users.java | 2 +- .../src/org/argeo/cms/{ => util}/CmsLink.java | 5 +- .../org/argeo/cms/{ => util}/CmsUtils.java | 4 +- .../org/argeo/cms/{ => util}/MenuLink.java | 4 +- .../argeo/cms/{ => util}/OpenUserMenu.java | 3 +- .../argeo/cms/{ => util}/SimpleCmsHeader.java | 5 +- .../cms/{ => util}/SimpleDynamicPages.java | 4 +- .../cms/{ => util}/SimpleStaticPage.java | 4 +- .../org/argeo/cms/{ => util}/UserMenu.java | 6 +- .../src/org/argeo/cms/viewers/Section.java | 2 +- .../org/argeo/cms/widgets/EditableImage.java | 2 +- .../org/argeo/cms/widgets/EditableText.java | 2 +- .../org/argeo/cms/widgets/JcrComposite.java | 2 +- .../org/argeo/cms/widgets/StyledControl.java | 2 +- 44 files changed, 77 insertions(+), 369 deletions(-) delete mode 100644 org.argeo.cms/src/org/argeo/cms/CmsEntryPointFactory.java delete mode 100644 org.argeo.cms/src/org/argeo/cms/CmsInstallPage.java delete mode 100644 org.argeo.cms/src/org/argeo/cms/UrlResourceLoader.java rename org.argeo.cms/src/org/argeo/cms/{ => i18n}/DefaultsResourceBundle.java (93%) rename org.argeo.cms/src/org/argeo/cms/{ => i18n}/Msg.java (95%) rename org.argeo.cms/src/org/argeo/cms/{ => text}/IdentityTextInterpreter.java (94%) rename org.argeo.cms/src/org/argeo/cms/{ => text}/TextInterpreter.java (89%) rename org.argeo.cms/src/org/argeo/cms/{ => util}/CmsLink.java (98%) rename org.argeo.cms/src/org/argeo/cms/{ => util}/CmsUtils.java (97%) rename org.argeo.cms/src/org/argeo/cms/{ => util}/MenuLink.java (79%) rename org.argeo.cms/src/org/argeo/cms/{ => util}/OpenUserMenu.java (89%) rename org.argeo.cms/src/org/argeo/cms/{ => util}/SimpleCmsHeader.java (95%) rename org.argeo.cms/src/org/argeo/cms/{ => util}/SimpleDynamicPages.java (97%) rename org.argeo.cms/src/org/argeo/cms/{ => util}/SimpleStaticPage.java (87%) rename org.argeo.cms/src/org/argeo/cms/{ => util}/UserMenu.java (96%) diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java index 1c9fc483d..49a7b98df 100644 --- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java +++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java @@ -14,6 +14,7 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.cms.i18n.Msg; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.AbstractEntryPoint; diff --git a/org.argeo.cms/src/org/argeo/cms/BundleResourceLoader.java b/org.argeo.cms/src/org/argeo/cms/BundleResourceLoader.java index e42a00184..8740c0d26 100644 --- a/org.argeo.cms/src/org/argeo/cms/BundleResourceLoader.java +++ b/org.argeo.cms/src/org/argeo/cms/BundleResourceLoader.java @@ -9,7 +9,7 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; /** {@link ResourceLoader} implementation wrapping an {@link Bundle}. */ -public class BundleResourceLoader implements ResourceLoader { +class BundleResourceLoader implements ResourceLoader { private final BundleContext bundleContext; public BundleResourceLoader(BundleContext bundleContext) { diff --git a/org.argeo.cms/src/org/argeo/cms/CmsApplication.java b/org.argeo.cms/src/org/argeo/cms/CmsApplication.java index 90df56a61..e113d7b2e 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsApplication.java +++ b/org.argeo.cms/src/org/argeo/cms/CmsApplication.java @@ -22,6 +22,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.internal.ImageManagerImpl; +import org.argeo.cms.util.CmsUtils; import org.argeo.jcr.JcrUtils; import org.eclipse.gemini.blueprint.context.BundleContextAware; import org.eclipse.rap.rwt.RWT; diff --git a/org.argeo.cms/src/org/argeo/cms/CmsEntryPointFactory.java b/org.argeo.cms/src/org/argeo/cms/CmsEntryPointFactory.java deleted file mode 100644 index 873ae8131..000000000 --- a/org.argeo.cms/src/org/argeo/cms/CmsEntryPointFactory.java +++ /dev/null @@ -1,280 +0,0 @@ -package org.argeo.cms; - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import javax.jcr.Node; -import javax.jcr.Repository; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import javax.jcr.security.Privilege; -import javax.jcr.version.VersionManager; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.cms.internal.ImageManagerImpl; -import org.argeo.jcr.JcrUtils; -import org.eclipse.rap.rwt.RWT; -import org.eclipse.rap.rwt.application.EntryPoint; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; - -/** Creates and registers an {@link EntryPoint} */ -@Deprecated -class CmsEntryPointFactory { - private final static Log log = LogFactory - .getLog(CmsEntryPointFactory.class); - - private Repository repository; - private String workspace = null; - private String basePath = "/"; - private List roPrincipals = Arrays.asList("anonymous", "everyone"); - private List rwPrincipals = Arrays.asList("everyone"); - - private CmsLogin cmsLogin; - - private CmsUiProvider header; - private Map pages = new LinkedHashMap(); - - private Integer headerHeight = 40; - - // Managers - private CmsImageManager imageManager = new ImageManagerImpl(); - - public EntryPoint create() { - CmsEntryPoint cmsEntryPoint = new CmsEntryPoint(repository, workspace); - CmsSession.current.set(cmsEntryPoint); - return cmsEntryPoint; - } - - public void init() throws RepositoryException { - if (workspace == null) - throw new CmsException( - "Workspace must be set when calling initialization." - + " Please make sure that read-only and read-write roles" - + " have been properly configured:" - + " the defaults are open."); - - Session session = null; - try { - session = JcrUtils.loginOrCreateWorkspace(repository, workspace); - VersionManager vm = session.getWorkspace().getVersionManager(); - if (!vm.isCheckedOut("/")) - vm.checkout("/"); - JcrUtils.mkdirs(session, basePath); - for (String principal : rwPrincipals) - JcrUtils.addPrivilege(session, basePath, principal, - Privilege.JCR_WRITE); - for (String principal : roPrincipals) - JcrUtils.addPrivilege(session, basePath, principal, - Privilege.JCR_READ); - - for (String pageName : pages.keySet()) { - try { - initPage(session, pages.get(pageName)); - session.save(); - } catch (Exception e) { - throw new CmsException( - "Cannot initialize page " + pageName, e); - } - } - - } finally { - JcrUtils.logoutQuietly(session); - } - } - - protected void initPage(Session adminSession, CmsUiProvider page) - throws RepositoryException { - if (page instanceof LifeCycleUiProvider) - ((LifeCycleUiProvider) page).init(adminSession); - } - - public void destroy() { - for (String pageName : pages.keySet()) { - try { - CmsUiProvider page = pages.get(pageName); - if (page instanceof LifeCycleUiProvider) - ((LifeCycleUiProvider) page).destroy(); - } catch (Exception e) { - log.error("Cannot destroy page " + pageName, e); - } - } - } - - public void setRepository(Repository repository) { - this.repository = repository; - } - - public void setWorkspace(String workspace) { - this.workspace = workspace; - } - - public void setCmsLogin(CmsLogin cmsLogin) { - this.cmsLogin = cmsLogin; - } - - public void setHeader(CmsUiProvider header) { - this.header = header; - } - - public void setPages(Map pages) { - this.pages = pages; - } - - public void setBasePath(String basePath) { - this.basePath = basePath; - } - - public void setRoPrincipals(List roPrincipals) { - this.roPrincipals = roPrincipals; - } - - public void setRwPrincipals(List rwPrincipals) { - this.rwPrincipals = rwPrincipals; - } - - public void setHeaderHeight(Integer headerHeight) { - this.headerHeight = headerHeight; - } - - private class CmsEntryPoint extends AbstractCmsEntryPoint { - private Composite headerArea; - private Composite bodyArea; - - public CmsEntryPoint(Repository repository, String workspace) { - super(repository, workspace); - } - - @Override - protected void createContents(Composite parent) { - try { - getShell().getDisplay().setData(CmsSession.KEY, this); - - parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, - true)); - parent.setLayout(CmsUtils.noSpaceGridLayout()); - - headerArea = new Composite(parent, SWT.NONE); - headerArea.setLayout(new FillLayout()); - GridData headerData = new GridData(SWT.FILL, SWT.FILL, false, - false); - headerData.heightHint = headerHeight; - headerArea.setLayoutData(headerData); - refreshHeader(); - - bodyArea = new Composite(parent, SWT.NONE); - bodyArea.setData(RWT.CUSTOM_VARIANT, CmsStyles.CMS_BODY); - bodyArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, - true)); - bodyArea.setBackgroundMode(SWT.INHERIT_DEFAULT); - bodyArea.setLayout(CmsUtils.noSpaceGridLayout()); - } catch (Exception e) { - throw new CmsException("Cannot create entrypoint contents", e); - } - } - - @Override - protected void refreshHeader() { - if (headerArea == null) - return; - for (Control child : headerArea.getChildren()) - child.dispose(); - try { - header.createUi(headerArea, getNode()); - } catch (RepositoryException e) { - throw new CmsException("Cannot refresh header", e); - } - headerArea.layout(true, true); - } - - @SuppressWarnings("unused") - @Override - protected void refreshBody() { - if (bodyArea == null) - return; - // clear - for (Control child : bodyArea.getChildren()) - child.dispose(); - bodyArea.setLayout(CmsUtils.noSpaceGridLayout()); - - // Exception - Throwable exception = getException(); - if (exception != null) { - new Label(bodyArea, SWT.NONE).setText("Unreachable state : " - + getState()); - if (getNode() != null) - new Label(bodyArea, SWT.NONE).setText("Context : " - + getNode()); - - Text errorText = new Text(bodyArea, SWT.MULTI | SWT.H_SCROLL - | SWT.V_SCROLL); - errorText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, - true)); - StringWriter sw = new StringWriter(); - exception.printStackTrace(new PrintWriter(sw)); - errorText.setText(sw.toString()); - IOUtils.closeQuietly(sw); - resetException(); - // TODO report - } else { - String state = getState(); - String page = null; - try { - if (state == null) - throw new CmsException("State cannot be null"); - if (page == null) - throw new CmsException("Page cannot be null"); - // else if (state.length() == 0) - // log.debug("empty state"); - else if (pages.containsKey(page)) - pages.get(page).createUi(bodyArea, getNode()); - else { - // try { - // RWT.getResponse().sendError(404); - // } catch (IOException e) { - // log.error("Cannot send 404 code", e); - // } - throw new CmsException("Unsupported state " + state); - } - } catch (RepositoryException e) { - throw new CmsException("Cannot refresh body", e); - } - } - bodyArea.layout(true, true); - } - - @Override - protected void logAsAnonymous() { - cmsLogin.logInAsAnonymous(); - } - - @Override - protected Node getDefaultNode(Session session) - throws RepositoryException { - if (!session.hasPermission(basePath, "read")) { - if (session.getUserID().equals("anonymous")) - throw new CmsLoginRequiredException(); - else - throw new CmsException("Unauthorized"); - } - return session.getNode(basePath); - } - - @Override - public CmsImageManager getImageManager() { - return imageManager; - } - - } -} diff --git a/org.argeo.cms/src/org/argeo/cms/CmsInstallPage.java b/org.argeo.cms/src/org/argeo/cms/CmsInstallPage.java deleted file mode 100644 index d7c69d645..000000000 --- a/org.argeo.cms/src/org/argeo/cms/CmsInstallPage.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.argeo.cms; - -import javax.jcr.Node; - -import org.eclipse.rap.rwt.RWT; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Text; - -public class CmsInstallPage implements CmsUiProvider { - private Text text; - - @Override - public Control createUi(Composite parent, Node context) { - text = new Text(parent, SWT.MULTI); - text.setData(RWT.CUSTOM_VARIANT, "cms_install"); - return text; - } - -} diff --git a/org.argeo.cms/src/org/argeo/cms/CmsLogin.java b/org.argeo.cms/src/org/argeo/cms/CmsLogin.java index 54ed1efcb..e8a2e48fd 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsLogin.java +++ b/org.argeo.cms/src/org/argeo/cms/CmsLogin.java @@ -26,7 +26,7 @@ public class CmsLogin { private AuthenticationManager authenticationManager; private String systemKey = KernelConstants.DEFAULT_SECURITY_KEY; - protected void logInAsAnonymous() { + public void logInAsAnonymous() { // TODO Better deal with anonymous authentication try { List anonAuthorities = Collections @@ -45,7 +45,7 @@ public class CmsLogin { } } - protected void logInWithPassword(String username, char[] password) { + public void logInWithPassword(String username, char[] password) { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( username, password); Authentication authentication = authenticationManager diff --git a/org.argeo.cms/src/org/argeo/cms/CmsMsg.java b/org.argeo.cms/src/org/argeo/cms/CmsMsg.java index a69d20970..bffd494ce 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsMsg.java +++ b/org.argeo.cms/src/org/argeo/cms/CmsMsg.java @@ -1,5 +1,8 @@ package org.argeo.cms; +import org.argeo.cms.i18n.DefaultsResourceBundle; +import org.argeo.cms.i18n.Msg; + /** Standard CMS messages. */ public class CmsMsg extends DefaultsResourceBundle { public final static Msg username = new Msg("username"); diff --git a/org.argeo.cms/src/org/argeo/cms/CmsSession.java b/org.argeo.cms/src/org/argeo/cms/CmsSession.java index 0f4e54109..38c2b6c99 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsSession.java +++ b/org.argeo.cms/src/org/argeo/cms/CmsSession.java @@ -1,5 +1,7 @@ package org.argeo.cms; +import org.argeo.cms.i18n.Msg; + /** Provides interaction with the CMS system. UNSTABLE API at this stage. */ public interface CmsSession { public final static String KEY = "org.argeo.connect.web.cmsSession"; diff --git a/org.argeo.cms/src/org/argeo/cms/UrlResourceLoader.java b/org.argeo.cms/src/org/argeo/cms/UrlResourceLoader.java deleted file mode 100644 index fb4e2cd51..000000000 --- a/org.argeo.cms/src/org/argeo/cms/UrlResourceLoader.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.argeo.cms; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; - -import org.eclipse.rap.rwt.service.ResourceLoader; - -/** {@link ResourceLoader} implementation wrapping an {@link URL}. */ -@Deprecated -public class UrlResourceLoader implements ResourceLoader { - private final URL url; - - public UrlResourceLoader(URL url) { - super(); - this.url = url; - } - - @Override - public InputStream getResourceAsStream(String resourceName) - throws IOException { - return url.openStream(); - } - -} diff --git a/org.argeo.cms/src/org/argeo/cms/DefaultsResourceBundle.java b/org.argeo.cms/src/org/argeo/cms/i18n/DefaultsResourceBundle.java similarity index 93% rename from org.argeo.cms/src/org/argeo/cms/DefaultsResourceBundle.java rename to org.argeo.cms/src/org/argeo/cms/i18n/DefaultsResourceBundle.java index 2d7875859..2fc9cbc5f 100644 --- a/org.argeo.cms/src/org/argeo/cms/DefaultsResourceBundle.java +++ b/org.argeo.cms/src/org/argeo/cms/i18n/DefaultsResourceBundle.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.i18n; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -6,6 +6,8 @@ import java.util.Enumeration; import java.util.ResourceBundle; import java.util.Vector; +import org.argeo.cms.CmsException; + /** Expose the default values as a {@link ResourceBundle} */ public class DefaultsResourceBundle extends ResourceBundle { diff --git a/org.argeo.cms/src/org/argeo/cms/Msg.java b/org.argeo.cms/src/org/argeo/cms/i18n/Msg.java similarity index 95% rename from org.argeo.cms/src/org/argeo/cms/Msg.java rename to org.argeo.cms/src/org/argeo/cms/i18n/Msg.java index 057b74ab0..dd38c7483 100644 --- a/org.argeo.cms/src/org/argeo/cms/Msg.java +++ b/org.argeo.cms/src/org/argeo/cms/i18n/Msg.java @@ -1,8 +1,10 @@ -package org.argeo.cms; +package org.argeo.cms.i18n; import java.lang.reflect.Field; import java.lang.reflect.Modifier; +import org.argeo.cms.CmsException; +import org.argeo.cms.CmsSession; import org.eclipse.rap.rwt.RWT; /** A single message to be internationalised. */ diff --git a/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java index db36f719f..b1d27e516 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java @@ -24,7 +24,7 @@ import org.argeo.cms.CmsException; import org.argeo.cms.CmsImageManager; import org.argeo.cms.CmsNames; import org.argeo.cms.CmsTypes; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.service.ResourceManager; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/SimpleEditableImage.java b/org.argeo.cms/src/org/argeo/cms/internal/SimpleEditableImage.java index e3211ef13..67e500ffc 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/SimpleEditableImage.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/SimpleEditableImage.java @@ -2,7 +2,7 @@ package org.argeo.cms.internal; import javax.jcr.RepositoryException; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.widgets.EditableImage; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java b/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java index cbed63e8c..57939b517 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java @@ -1,7 +1,7 @@ package org.argeo.cms.internal.text; import static javax.jcr.Property.JCR_TITLE; -import static org.argeo.cms.CmsUtils.fillWidth; +import static org.argeo.cms.util.CmsUtils.fillWidth; import java.util.ArrayList; import java.util.Iterator; @@ -24,12 +24,12 @@ import org.argeo.cms.CmsImageManager; import org.argeo.cms.CmsNames; import org.argeo.cms.CmsSession; import org.argeo.cms.CmsTypes; -import org.argeo.cms.CmsUtils; -import org.argeo.cms.IdentityTextInterpreter; -import org.argeo.cms.TextInterpreter; +import org.argeo.cms.text.IdentityTextInterpreter; import org.argeo.cms.text.Img; import org.argeo.cms.text.Paragraph; +import org.argeo.cms.text.TextInterpreter; import org.argeo.cms.text.TextSection; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.AbstractPageViewer; import org.argeo.cms.viewers.EditablePart; import org.argeo.cms.viewers.NodePart; diff --git a/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java b/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java index 3fff4e421..e3561e104 100644 --- a/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java +++ b/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java @@ -18,11 +18,11 @@ import javax.jcr.Value; import org.argeo.ArgeoException; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsLink; import org.argeo.cms.CmsTypes; import org.argeo.cms.CmsUiProvider; -import org.argeo.cms.CmsUtils; import org.argeo.cms.text.Img; +import org.argeo.cms.util.CmsLink; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.widgets.EditableImage; import org.argeo.jcr.JcrUtils; import org.eclipse.jface.viewers.ColumnLabelProvider; diff --git a/org.argeo.cms/src/org/argeo/cms/maintenance/NonAdminPage.java b/org.argeo.cms/src/org/argeo/cms/maintenance/NonAdminPage.java index 7c1a18a14..b27d50659 100644 --- a/org.argeo.cms/src/org/argeo/cms/maintenance/NonAdminPage.java +++ b/org.argeo.cms/src/org/argeo/cms/maintenance/NonAdminPage.java @@ -4,7 +4,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.CmsUiProvider; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; diff --git a/org.argeo.cms/src/org/argeo/cms/text/CustomTextEditor.java b/org.argeo.cms/src/org/argeo/cms/text/CustomTextEditor.java index 6ff78108f..900dce2ae 100644 --- a/org.argeo.cms/src/org/argeo/cms/text/CustomTextEditor.java +++ b/org.argeo.cms/src/org/argeo/cms/text/CustomTextEditor.java @@ -1,6 +1,6 @@ package org.argeo.cms.text; -import static org.argeo.cms.CmsUtils.fillWidth; +import static org.argeo.cms.util.CmsUtils.fillWidth; import javax.jcr.Node; import javax.jcr.RepositoryException; diff --git a/org.argeo.cms/src/org/argeo/cms/IdentityTextInterpreter.java b/org.argeo.cms/src/org/argeo/cms/text/IdentityTextInterpreter.java similarity index 94% rename from org.argeo.cms/src/org/argeo/cms/IdentityTextInterpreter.java rename to org.argeo.cms/src/org/argeo/cms/text/IdentityTextInterpreter.java index c66cd866d..db90ea0f8 100644 --- a/org.argeo.cms/src/org/argeo/cms/IdentityTextInterpreter.java +++ b/org.argeo.cms/src/org/argeo/cms/text/IdentityTextInterpreter.java @@ -1,10 +1,14 @@ -package org.argeo.cms; +package org.argeo.cms.text; import javax.jcr.Item; import javax.jcr.Node; import javax.jcr.Property; import javax.jcr.RepositoryException; +import org.argeo.cms.CmsException; +import org.argeo.cms.CmsNames; +import org.argeo.cms.CmsTypes; + /** Based on HTML with a few Wiki-like shortcuts. */ public class IdentityTextInterpreter implements TextInterpreter, CmsNames { diff --git a/org.argeo.cms/src/org/argeo/cms/text/Img.java b/org.argeo.cms/src/org/argeo/cms/text/Img.java index 83c32087f..54f702bba 100644 --- a/org.argeo.cms/src/org/argeo/cms/text/Img.java +++ b/org.argeo.cms/src/org/argeo/cms/text/Img.java @@ -6,8 +6,8 @@ import javax.jcr.RepositoryException; import org.argeo.cms.CmsException; import org.argeo.cms.CmsImageManager; import org.argeo.cms.CmsSession; -import org.argeo.cms.CmsUtils; import org.argeo.cms.internal.JcrFileUploadReceiver; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.NodePart; import org.argeo.cms.viewers.Section; import org.argeo.cms.viewers.SectionPart; diff --git a/org.argeo.cms/src/org/argeo/cms/text/Paragraph.java b/org.argeo.cms/src/org/argeo/cms/text/Paragraph.java index d917c45d4..a7a7964f4 100644 --- a/org.argeo.cms/src/org/argeo/cms/text/Paragraph.java +++ b/org.argeo.cms/src/org/argeo/cms/text/Paragraph.java @@ -3,7 +3,7 @@ package org.argeo.cms.text; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.Section; import org.argeo.cms.viewers.SectionPart; import org.argeo.cms.widgets.EditableText; diff --git a/org.argeo.cms/src/org/argeo/cms/text/StandardTextEditor.java b/org.argeo.cms/src/org/argeo/cms/text/StandardTextEditor.java index 7a3de3be9..4ce8d1fd9 100644 --- a/org.argeo.cms/src/org/argeo/cms/text/StandardTextEditor.java +++ b/org.argeo.cms/src/org/argeo/cms/text/StandardTextEditor.java @@ -8,8 +8,8 @@ import javax.jcr.RepositoryException; import org.argeo.cms.CmsEditable; import org.argeo.cms.CmsTypes; -import org.argeo.cms.CmsUtils; import org.argeo.cms.internal.text.AbstractTextViewer; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.Section; import org.eclipse.swt.widgets.Composite; diff --git a/org.argeo.cms/src/org/argeo/cms/text/TextEditorHeader.java b/org.argeo.cms/src/org/argeo/cms/text/TextEditorHeader.java index 6821fcb53..e70a4d06e 100644 --- a/org.argeo.cms/src/org/argeo/cms/text/TextEditorHeader.java +++ b/org.argeo.cms/src/org/argeo/cms/text/TextEditorHeader.java @@ -4,7 +4,7 @@ import java.util.Observable; import java.util.Observer; import org.argeo.cms.CmsEditable; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; diff --git a/org.argeo.cms/src/org/argeo/cms/TextInterpreter.java b/org.argeo.cms/src/org/argeo/cms/text/TextInterpreter.java similarity index 89% rename from org.argeo.cms/src/org/argeo/cms/TextInterpreter.java rename to org.argeo.cms/src/org/argeo/cms/text/TextInterpreter.java index f7cbca759..f39a2b329 100644 --- a/org.argeo.cms/src/org/argeo/cms/TextInterpreter.java +++ b/org.argeo.cms/src/org/argeo/cms/text/TextInterpreter.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.text; import javax.jcr.Item; diff --git a/org.argeo.cms/src/org/argeo/cms/text/TextSection.java b/org.argeo.cms/src/org/argeo/cms/text/TextSection.java index 09456f2c7..ac93e4b65 100644 --- a/org.argeo.cms/src/org/argeo/cms/text/TextSection.java +++ b/org.argeo.cms/src/org/argeo/cms/text/TextSection.java @@ -4,7 +4,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.CmsNames; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.Section; import org.eclipse.swt.widgets.Composite; diff --git a/org.argeo.cms/src/org/argeo/cms/text/WikiPage.java b/org.argeo.cms/src/org/argeo/cms/text/WikiPage.java index 17c3d9c3a..65afeca4b 100644 --- a/org.argeo.cms/src/org/argeo/cms/text/WikiPage.java +++ b/org.argeo.cms/src/org/argeo/cms/text/WikiPage.java @@ -6,11 +6,11 @@ import javax.jcr.RepositoryException; import javax.jcr.nodetype.NodeType; import org.argeo.cms.CmsEditable; -import org.argeo.cms.CmsLink; import org.argeo.cms.CmsNames; import org.argeo.cms.CmsTypes; import org.argeo.cms.CmsUiProvider; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsLink; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.JcrVersionCmsEditable; import org.argeo.cms.widgets.ScrolledPage; import org.argeo.jcr.JcrUtils; diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserPage.java b/org.argeo.cms/src/org/argeo/cms/users/UserPage.java index ef0e9313e..83998baad 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/UserPage.java +++ b/org.argeo.cms/src/org/argeo/cms/users/UserPage.java @@ -5,7 +5,7 @@ import javax.jcr.RepositoryException; import org.argeo.cms.CmsEditable; import org.argeo.cms.CmsUiProvider; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.JcrVersionCmsEditable; import org.argeo.cms.widgets.ScrolledPage; import org.argeo.security.UserAdminService; diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserPart.java b/org.argeo.cms/src/org/argeo/cms/users/UserPart.java index 66f50b885..1c42134f1 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/UserPart.java +++ b/org.argeo.cms/src/org/argeo/cms/users/UserPart.java @@ -9,7 +9,7 @@ import javax.jcr.Property; import javax.jcr.RepositoryException; import org.argeo.ArgeoException; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.EditablePart; import org.argeo.cms.viewers.NodePart; import org.argeo.cms.widgets.StyledControl; diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java b/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java index 8efcba261..f4acb8a9d 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java +++ b/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java @@ -7,7 +7,7 @@ import javax.jcr.Item; import javax.jcr.RepositoryException; import org.argeo.ArgeoException; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.EditablePart; import org.argeo.cms.viewers.NodePart; import org.argeo.cms.widgets.StyledControl; diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserViewer.java b/org.argeo.cms/src/org/argeo/cms/users/UserViewer.java index a520da1bd..48ca70a69 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/UserViewer.java +++ b/org.argeo.cms/src/org/argeo/cms/users/UserViewer.java @@ -5,7 +5,7 @@ import javax.jcr.RepositoryException; import org.argeo.cms.CmsEditable; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.AbstractPageViewer; import org.argeo.cms.viewers.EditablePart; import org.eclipse.swt.SWT; diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserViewerOld.java b/org.argeo.cms/src/org/argeo/cms/users/UserViewerOld.java index ad0b62f45..6b522f5d9 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/UserViewerOld.java +++ b/org.argeo.cms/src/org/argeo/cms/users/UserViewerOld.java @@ -11,7 +11,7 @@ import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; import org.argeo.cms.CmsEditable; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.EditablePart; import org.argeo.cms.viewers.JcrVersionCmsEditable; import org.eclipse.jface.viewers.ContentViewer; diff --git a/org.argeo.cms/src/org/argeo/cms/users/Users.java b/org.argeo.cms/src/org/argeo/cms/users/Users.java index cc164b769..c5f0c7ee5 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/Users.java +++ b/org.argeo.cms/src/org/argeo/cms/users/Users.java @@ -14,8 +14,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; import org.argeo.cms.CmsUiProvider; -import org.argeo.cms.CmsUtils; import org.argeo.cms.maintenance.NonAdminPage; +import org.argeo.cms.util.CmsUtils; import org.argeo.eclipse.ui.dialogs.UserCreationWizard; import org.argeo.eclipse.ui.parts.UsersTable; import org.argeo.jcr.ArgeoNames; diff --git a/org.argeo.cms/src/org/argeo/cms/CmsLink.java b/org.argeo.cms/src/org/argeo/cms/util/CmsLink.java similarity index 98% rename from org.argeo.cms/src/org/argeo/cms/CmsLink.java rename to org.argeo.cms/src/org/argeo/cms/util/CmsLink.java index 5ccfd63e3..674dc3084 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsLink.java +++ b/org.argeo.cms/src/org/argeo/cms/util/CmsLink.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.util; import java.io.InputStream; import java.net.MalformedURLException; @@ -9,6 +9,9 @@ import javax.jcr.Node; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.cms.CmsException; +import org.argeo.cms.CmsStyles; +import org.argeo.cms.CmsUiProvider; import org.eclipse.gemini.blueprint.context.BundleContextAware; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.service.ResourceManager; diff --git a/org.argeo.cms/src/org/argeo/cms/CmsUtils.java b/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java similarity index 97% rename from org.argeo.cms/src/org/argeo/cms/CmsUtils.java rename to org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java index 10e523873..c1b319fbe 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.util; import java.io.InputStream; @@ -8,6 +8,8 @@ import javax.jcr.Property; import javax.jcr.RepositoryException; import org.apache.commons.io.IOUtils; +import org.argeo.cms.CmsConstants; +import org.argeo.cms.CmsException; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.service.ResourceManager; diff --git a/org.argeo.cms/src/org/argeo/cms/MenuLink.java b/org.argeo.cms/src/org/argeo/cms/util/MenuLink.java similarity index 79% rename from org.argeo.cms/src/org/argeo/cms/MenuLink.java rename to org.argeo.cms/src/org/argeo/cms/util/MenuLink.java index 75be3f1ef..d491d3ca2 100644 --- a/org.argeo.cms/src/org/argeo/cms/MenuLink.java +++ b/org.argeo.cms/src/org/argeo/cms/util/MenuLink.java @@ -1,4 +1,6 @@ -package org.argeo.cms; +package org.argeo.cms.util; + +import org.argeo.cms.CmsStyles; /** * Convenience class setting the custom style {@link CmsStyles#CMS_MENU_LINK} on diff --git a/org.argeo.cms/src/org/argeo/cms/OpenUserMenu.java b/org.argeo.cms/src/org/argeo/cms/util/OpenUserMenu.java similarity index 89% rename from org.argeo.cms/src/org/argeo/cms/OpenUserMenu.java rename to org.argeo.cms/src/org/argeo/cms/util/OpenUserMenu.java index 55c149ee1..4d4fe7508 100644 --- a/org.argeo.cms/src/org/argeo/cms/OpenUserMenu.java +++ b/org.argeo.cms/src/org/argeo/cms/util/OpenUserMenu.java @@ -1,5 +1,6 @@ -package org.argeo.cms; +package org.argeo.cms.util; +import org.argeo.cms.CmsLogin; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.widgets.Control; diff --git a/org.argeo.cms/src/org/argeo/cms/SimpleCmsHeader.java b/org.argeo.cms/src/org/argeo/cms/util/SimpleCmsHeader.java similarity index 95% rename from org.argeo.cms/src/org/argeo/cms/SimpleCmsHeader.java rename to org.argeo.cms/src/org/argeo/cms/util/SimpleCmsHeader.java index 24c924217..aa1bb7340 100644 --- a/org.argeo.cms/src/org/argeo/cms/SimpleCmsHeader.java +++ b/org.argeo.cms/src/org/argeo/cms/util/SimpleCmsHeader.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.util; import java.util.ArrayList; import java.util.List; @@ -6,6 +6,9 @@ import java.util.List; import javax.jcr.Node; import javax.jcr.RepositoryException; +import org.argeo.cms.CmsException; +import org.argeo.cms.CmsStyles; +import org.argeo.cms.CmsUiProvider; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; diff --git a/org.argeo.cms/src/org/argeo/cms/SimpleDynamicPages.java b/org.argeo.cms/src/org/argeo/cms/util/SimpleDynamicPages.java similarity index 97% rename from org.argeo.cms/src/org/argeo/cms/SimpleDynamicPages.java rename to org.argeo.cms/src/org/argeo/cms/util/SimpleDynamicPages.java index 5de40bb50..b6155cf31 100644 --- a/org.argeo.cms/src/org/argeo/cms/SimpleDynamicPages.java +++ b/org.argeo.cms/src/org/argeo/cms/util/SimpleDynamicPages.java @@ -1,4 +1,4 @@ -package org.argeo.cms; +package org.argeo.cms.util; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -11,6 +11,8 @@ import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; +import org.argeo.cms.CmsException; +import org.argeo.cms.CmsUiProvider; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; diff --git a/org.argeo.cms/src/org/argeo/cms/SimpleStaticPage.java b/org.argeo.cms/src/org/argeo/cms/util/SimpleStaticPage.java similarity index 87% rename from org.argeo.cms/src/org/argeo/cms/SimpleStaticPage.java rename to org.argeo.cms/src/org/argeo/cms/util/SimpleStaticPage.java index 1cb030028..6e09000e9 100644 --- a/org.argeo.cms/src/org/argeo/cms/SimpleStaticPage.java +++ b/org.argeo.cms/src/org/argeo/cms/util/SimpleStaticPage.java @@ -1,8 +1,10 @@ -package org.argeo.cms; +package org.argeo.cms.util; import javax.jcr.Node; import javax.jcr.RepositoryException; +import org.argeo.cms.CmsStyles; +import org.argeo.cms.CmsUiProvider; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/org.argeo.cms/src/org/argeo/cms/UserMenu.java b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java similarity index 96% rename from org.argeo.cms/src/org/argeo/cms/UserMenu.java rename to org.argeo.cms/src/org/argeo/cms/util/UserMenu.java index 41ff9ab7f..98311560a 100644 --- a/org.argeo.cms/src/org/argeo/cms/UserMenu.java +++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java @@ -1,9 +1,13 @@ -package org.argeo.cms; +package org.argeo.cms.util; import static org.argeo.cms.internal.kernel.KernelConstants.SPRING_SECURITY_CONTEXT_KEY; import javax.servlet.http.HttpSession; +import org.argeo.cms.CmsLogin; +import org.argeo.cms.CmsMsg; +import org.argeo.cms.CmsSession; +import org.argeo.cms.CmsStyles; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; diff --git a/org.argeo.cms/src/org/argeo/cms/viewers/Section.java b/org.argeo.cms/src/org/argeo/cms/viewers/Section.java index c09b17987..af7fd877f 100644 --- a/org.argeo.cms/src/org/argeo/cms/viewers/Section.java +++ b/org.argeo.cms/src/org/argeo/cms/viewers/Section.java @@ -9,7 +9,7 @@ import javax.jcr.RepositoryException; import org.argeo.cms.CmsException; import org.argeo.cms.CmsNames; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.widgets.JcrComposite; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/org.argeo.cms/src/org/argeo/cms/widgets/EditableImage.java b/org.argeo.cms/src/org/argeo/cms/widgets/EditableImage.java index 00a7c2669..2e70eb89f 100644 --- a/org.argeo.cms/src/org/argeo/cms/widgets/EditableImage.java +++ b/org.argeo.cms/src/org/argeo/cms/widgets/EditableImage.java @@ -5,7 +5,7 @@ import javax.jcr.RepositoryException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/org.argeo.cms/src/org/argeo/cms/widgets/EditableText.java b/org.argeo.cms/src/org/argeo/cms/widgets/EditableText.java index a117711fc..e7c56ea72 100644 --- a/org.argeo.cms/src/org/argeo/cms/widgets/EditableText.java +++ b/org.argeo.cms/src/org/argeo/cms/widgets/EditableText.java @@ -3,7 +3,7 @@ package org.argeo.cms.widgets; import javax.jcr.Item; import javax.jcr.RepositoryException; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; diff --git a/org.argeo.cms/src/org/argeo/cms/widgets/JcrComposite.java b/org.argeo.cms/src/org/argeo/cms/widgets/JcrComposite.java index 7704d4092..358b45315 100644 --- a/org.argeo.cms/src/org/argeo/cms/widgets/JcrComposite.java +++ b/org.argeo.cms/src/org/argeo/cms/widgets/JcrComposite.java @@ -7,7 +7,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/org.argeo.cms/src/org/argeo/cms/widgets/StyledControl.java b/org.argeo.cms/src/org/argeo/cms/widgets/StyledControl.java index 0e0fd24ae..a2c6935d2 100644 --- a/org.argeo.cms/src/org/argeo/cms/widgets/StyledControl.java +++ b/org.argeo.cms/src/org/argeo/cms/widgets/StyledControl.java @@ -5,7 +5,7 @@ import javax.jcr.RepositoryException; import org.argeo.cms.CmsConstants; import org.argeo.cms.CmsNames; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.widgets.Composite; -- 2.30.2