From df60fd8de17590b8f4ab32fd0278e57aaaedbfa2 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 23 Jun 2022 07:00:34 +0200 Subject: [PATCH] Refactor CMS UX API --- .../org/argeo/cms/e4/maintenance/Browse.java | 2 +- .../src/org/argeo/cms/swt/CmsIcon.java | 25 ----------- .../src/org/argeo/cms/swt/CmsSwtTheme.java | 6 ++- .../src/org/argeo/cms/swt/CmsSwtUi.java | 2 +- .../src/org/argeo/cms/swt/CmsSwtUtils.java | 45 ++++++++++++++----- .../org/argeo/cms/swt/SimpleSwtUxContext.java | 2 +- .../src/org/argeo/cms/swt/app/CmsUserApp.java | 4 +- .../src/org/argeo/cms/swt/auth/CmsLogin.java | 2 +- .../org/argeo/cms/swt/auth/CmsLoginShell.java | 2 +- .../cms/swt/dialogs/ChangePasswordDialog.java | 2 +- .../argeo/cms/swt/osgi/BundleCmsSwtTheme.java | 15 ++++++- .../src/org/argeo/cms/ui/CmsUiConstants.java | 2 +- .../argeo/cms/ui/forms/FormEditorHeader.java | 2 +- .../argeo/cms/ui/forms/FormPageViewer.java | 6 +-- .../src/org/argeo/cms/ui/forms/FormStyle.java | 2 +- .../src/org/argeo/cms/ui/forms/FormUtils.java | 2 +- .../ui/internal/JcrFileUploadReceiver.java | 2 +- .../cms/ui/internal/SimpleEditableImage.java | 2 +- .../src/org/argeo/cms/ui/util/CmsLink.java | 2 +- .../src/org/argeo/cms/ui/util/CmsUiUtils.java | 4 +- .../cms/ui/util/DefaultImageManager.java | 4 +- .../org/argeo/cms/ui/util/SimpleStyle.java | 2 +- .../cms/ui/viewers/AbstractPageViewer.java | 2 +- .../cms/ui/viewers/JcrVersionCmsEditable.java | 2 +- .../argeo/cms/ui/widgets/EditableImage.java | 2 +- .../src/org/argeo/cms/ui/widgets/Img.java | 4 +- .../src/org/argeo/api/cms/CmsApp.java | 3 ++ .../src/org/argeo/api/cms/CmsEvent.java | 2 + .../org/argeo/api/cms/{ => ux}/Cms2DSize.java | 2 +- .../argeo/api/cms/{ => ux}/CmsEditable.java | 2 +- .../src/org/argeo/api/cms/ux/CmsIcon.java | 10 +++++ .../api/cms/{ => ux}/CmsImageManager.java | 2 +- .../org/argeo/api/cms/{ => ux}/CmsStyle.java | 2 +- .../org/argeo/api/cms/{ => ux}/CmsTheme.java | 10 ++++- .../src/org/argeo/api/cms/{ => ux}/CmsUi.java | 2 +- .../org/argeo/api/cms/{ => ux}/CmsView.java | 4 +- .../argeo/api/cms/{ => ux}/MvcProvider.java | 2 +- .../org/argeo/api/cms/{ => ux}/UxContext.java | 2 +- .../src/org/argeo/cms/ux/CmsUxUtils.java | 2 +- .../src/org/argeo/cms/ux/widgets/Column.java | 1 + .../src/org/argeo/cms/AbstractCmsApp.java | 2 +- .../org/argeo/cms/osgi/BundleCmsTheme.java | 14 ++++-- .../argeo/cms/e4/rap/CmsLoginLifecycle.java | 6 +-- .../org/argeo/cms/ui/script/CmsScriptApp.java | 2 +- .../argeo/cms/web/AbstractCmsEntryPoint.java | 2 +- .../argeo/cms/web/CmsThemeResourceLoader.java | 2 +- .../src/org/argeo/cms/web/CmsWebApp.java | 4 +- .../org/argeo/cms/web/CmsWebEntryPoint.java | 8 ++-- .../org/argeo/cms/web/SimpleErgonomics.java | 4 +- .../src/org/argeo/cms/web/WebThemeUtils.java | 2 +- .../argeo/cms/e4/rcp/CmsE4Application.java | 6 +-- .../src/org/argeo/cms/ui/rcp/CmsRcpApp.java | 10 ++--- 52 files changed, 149 insertions(+), 106 deletions(-) delete mode 100644 eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsIcon.java rename org.argeo.api.cms/src/org/argeo/api/cms/{ => ux}/Cms2DSize.java (93%) rename org.argeo.api.cms/src/org/argeo/api/cms/{ => ux}/CmsEditable.java (96%) create mode 100644 org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsIcon.java rename org.argeo.api.cms/src/org/argeo/api/cms/{ => ux}/CmsImageManager.java (97%) rename org.argeo.api.cms/src/org/argeo/api/cms/{ => ux}/CmsStyle.java (93%) rename org.argeo.api.cms/src/org/argeo/api/cms/{ => ux}/CmsTheme.java (88%) rename org.argeo.api.cms/src/org/argeo/api/cms/{ => ux}/CmsUi.java (76%) rename org.argeo.api.cms/src/org/argeo/api/cms/{ => ux}/CmsView.java (96%) rename org.argeo.api.cms/src/org/argeo/api/cms/{ => ux}/MvcProvider.java (97%) rename org.argeo.api.cms/src/org/argeo/api/cms/{ => ux}/UxContext.java (92%) diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java index 260a114cd..40a3c4e8b 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/maintenance/Browse.java @@ -15,7 +15,7 @@ import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.argeo.api.cms.Cms2DSize; +import org.argeo.api.cms.ux.Cms2DSize; import org.argeo.cms.CmsException; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.ui.CmsUiProvider; diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsIcon.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsIcon.java deleted file mode 100644 index 4ff89f27a..000000000 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsIcon.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.argeo.cms.swt; - -import org.argeo.api.cms.CmsTheme; -import org.eclipse.swt.graphics.Image; - -/** Can be applied to {@link Enum}s in order to generated {@link Image}s. */ -public interface CmsIcon { - String name(); - - default Image getSmallIcon(CmsTheme theme) { - return ((CmsSwtTheme) theme).getIcon(name(), getSmallIconSize()); - } - - default Image getBigIcon(CmsTheme theme) { - return ((CmsSwtTheme) theme).getIcon(name(), getBigIconSize()); - } - - default Integer getSmallIconSize() { - return 16; - } - - default Integer getBigIconSize() { - return 32; - } -} diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java index b40c2a06c..7669b1554 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java @@ -1,6 +1,7 @@ package org.argeo.cms.swt; -import org.argeo.api.cms.CmsTheme; +import org.argeo.api.cms.ux.CmsIcon; +import org.argeo.api.cms.ux.CmsTheme; import org.eclipse.swt.graphics.Image; /** SWT specific {@link CmsTheme}. */ @@ -18,4 +19,7 @@ public interface CmsSwtTheme extends CmsTheme { */ Image getIcon(String name, Integer preferredSize); + Image getSmallIcon(CmsIcon icon); + + Image getBigIcon(CmsIcon icon); } diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java index 75fa19749..2fb79f443 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java @@ -1,6 +1,6 @@ package org.argeo.cms.swt; -import org.argeo.api.cms.CmsUi; +import org.argeo.api.cms.ux.CmsUi; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java index 784d03173..5d964090b 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java @@ -6,12 +6,14 @@ import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; -import org.argeo.api.cms.CmsStyle; -import org.argeo.api.cms.CmsTheme; -import org.argeo.api.cms.CmsView; +import org.argeo.api.cms.ux.CmsIcon; +import org.argeo.api.cms.ux.CmsStyle; +import org.argeo.api.cms.ux.CmsTheme; +import org.argeo.api.cms.ux.CmsView; import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; @@ -30,19 +32,18 @@ import org.eclipse.swt.widgets.Widget; /** SWT utilities. */ public class CmsSwtUtils { + /* + * THEME AND VIEW + */ - /** Singleton. */ - private CmsSwtUtils() { - } - - public static CmsTheme getCmsTheme(Composite parent) { - CmsTheme theme = (CmsTheme) parent.getData(CmsTheme.class.getName()); + public static CmsSwtTheme getCmsTheme(Composite parent) { + CmsSwtTheme theme = (CmsSwtTheme) parent.getData(CmsTheme.class.getName()); if (theme == null) { // find parent shell Shell topShell = parent.getShell(); while (topShell.getParent() != null) topShell = (Shell) topShell.getParent(); - theme = (CmsTheme) topShell.getData(CmsTheme.class.getName()); + theme = (CmsSwtTheme) topShell.getData(CmsTheme.class.getName()); parent.setData(CmsTheme.class.getName(), theme); } return theme; @@ -83,6 +84,10 @@ public class CmsSwtUtils { shell.setData(CmsView.class.getName(), view); } + /* + * EVENTS + */ + /** Sends an event via {@link CmsView#sendEvent(String, Map)}. */ public static void sendEventOnSelect(Control control, String topic, Map properties) { SelectionListener listener = (Selected) (e) -> { @@ -104,6 +109,19 @@ public class CmsSwtUtils { sendEventOnSelect(control, topic, properties); } + /* + * ICONS + */ + /** Get a small icon from this theme. */ + public static Image getSmallIcon(CmsTheme theme, CmsIcon icon) { + return ((CmsSwtTheme) theme).getSmallIcon(icon); + } + + /** Get a big icon from this theme. */ + public static Image getBigIcon(CmsTheme theme, CmsIcon icon) { + return ((CmsSwtTheme) theme).getBigIcon(icon); + } + /* * LAYOUT INDEPENDENT */ @@ -285,8 +303,13 @@ public class CmsSwtUtils { String encoded = URLEncoder.encode(st.nextToken(), StandardCharsets.UTF_8); encoded = encoded.replace("+", "%20"); sb.append(encoded); - + } return sb.toString(); } + + /** Singleton. */ + private CmsSwtUtils() { + } + } diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/SimpleSwtUxContext.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/SimpleSwtUxContext.java index 9c55e8b10..e468c6d52 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/SimpleSwtUxContext.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/SimpleSwtUxContext.java @@ -1,6 +1,6 @@ package org.argeo.cms.swt; -import org.argeo.api.cms.UxContext; +import org.argeo.api.cms.ux.UxContext; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Display; diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/app/CmsUserApp.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/app/CmsUserApp.java index 2eb2ce5dd..add6e9edb 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/app/CmsUserApp.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/app/CmsUserApp.java @@ -6,8 +6,8 @@ import java.util.Set; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentRepository; import org.argeo.api.cms.CmsContext; -import org.argeo.api.cms.CmsUi; -import org.argeo.api.cms.CmsView; +import org.argeo.api.cms.ux.CmsUi; +import org.argeo.api.cms.ux.CmsView; import org.argeo.cms.AbstractCmsApp; import org.argeo.cms.swt.CmsSwtUi; import org.argeo.cms.swt.CmsSwtUtils; diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java index 43e57396b..afd1b5499 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java @@ -20,7 +20,7 @@ import javax.security.auth.login.LoginException; import org.argeo.api.cms.CmsAuth; import org.argeo.api.cms.CmsContext; import org.argeo.api.cms.CmsLog; -import org.argeo.api.cms.CmsView; +import org.argeo.api.cms.ux.CmsView; import org.argeo.cms.CmsMsg; import org.argeo.cms.LocaleUtils; import org.argeo.cms.auth.RemoteAuthCallback; diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java index a4d7c0770..39cf82afc 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java @@ -1,7 +1,7 @@ package org.argeo.cms.swt.auth; import org.argeo.api.cms.CmsContext; -import org.argeo.api.cms.CmsView; +import org.argeo.api.cms.ux.CmsView; import org.argeo.cms.swt.CmsSwtUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Control; diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java index 8ff086283..06e4d0f9f 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java @@ -3,8 +3,8 @@ package org.argeo.cms.swt.dialogs; import java.security.PrivilegedAction; import java.util.Arrays; -import org.argeo.api.cms.CmsView; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.ux.CmsView; import org.argeo.cms.CmsMsg; import org.argeo.cms.CmsUserManager; import org.argeo.cms.swt.CmsSwtUtils; diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java index c37a5b744..b3fec78ec 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java @@ -5,6 +5,7 @@ import java.io.InputStream; import java.util.HashMap; import java.util.Map; +import org.argeo.api.cms.ux.CmsIcon; import org.argeo.cms.osgi.BundleCmsTheme; import org.argeo.cms.swt.CmsSwtTheme; import org.eclipse.swt.graphics.Image; @@ -39,11 +40,11 @@ public class BundleCmsSwtTheme extends BundleCmsTheme implements CmsSwtTheme { * * @param name An icon file name without path and extension. * @param preferredSize the preferred size, if null, - * {@link #getDefaultIconSize()} will be tried. + * {@link #getSmallIconSize()} will be tried. */ public Image getIcon(String name, Integer preferredSize) { if (preferredSize == null) - preferredSize = getDefaultIconSize(); + preferredSize = getSmallIconSize(); Map subCache; if (!iconPaths.containsKey(name)) subCache = new HashMap<>(); @@ -97,4 +98,14 @@ public class BundleCmsSwtTheme extends BundleCmsTheme implements CmsSwtTheme { return image; } + @Override + public Image getSmallIcon(CmsIcon icon) { + return getIcon(icon.name(), getSmallIconSize()); + } + + @Override + public Image getBigIcon(CmsIcon icon) { + return getIcon(icon.name(), getBigIconSize()); + } + } diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsUiConstants.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsUiConstants.java index 9df61dcca..c6a62e9e0 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsUiConstants.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsUiConstants.java @@ -1,6 +1,6 @@ package org.argeo.cms.ui; -import org.argeo.api.cms.Cms2DSize; +import org.argeo.api.cms.ux.Cms2DSize; /** Commons constants */ @Deprecated diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormEditorHeader.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormEditorHeader.java index f3a56f7b9..a75c19150 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormEditorHeader.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormEditorHeader.java @@ -5,7 +5,7 @@ import java.util.Observer; import javax.jcr.Node; -import org.argeo.api.cms.CmsEditable; +import org.argeo.api.cms.ux.CmsEditable; import org.argeo.cms.swt.CmsSwtUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java index cc732d49d..3b1daf0aa 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java @@ -14,10 +14,10 @@ import javax.jcr.Session; import javax.jcr.Value; import javax.jcr.ValueFormatException; -import org.argeo.api.cms.Cms2DSize; -import org.argeo.api.cms.CmsEditable; -import org.argeo.api.cms.CmsImageManager; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.ux.Cms2DSize; +import org.argeo.api.cms.ux.CmsEditable; +import org.argeo.api.cms.ux.CmsImageManager; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.ui.viewers.AbstractPageViewer; import org.argeo.cms.ui.viewers.EditablePart; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java index 24067eaaa..709ecd024 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java @@ -1,6 +1,6 @@ package org.argeo.cms.ui.forms; -import org.argeo.api.cms.CmsStyle; +import org.argeo.api.cms.ux.CmsStyle; /** Syles used */ public enum FormStyle implements CmsStyle { diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormUtils.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormUtils.java index 1a445bd76..d5914d209 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormUtils.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormUtils.java @@ -9,8 +9,8 @@ import java.util.GregorianCalendar; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.api.cms.CmsView; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.ux.CmsView; import org.argeo.cms.CmsException; import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.EclipseUiUtils; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java index c8582f0c1..60bb42b46 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java @@ -11,7 +11,7 @@ import javax.jcr.RepositoryException; import javax.jcr.nodetype.NodeType; import org.apache.commons.io.FilenameUtils; -import org.argeo.api.cms.CmsImageManager; +import org.argeo.api.cms.ux.CmsImageManager; import org.argeo.cms.ui.widgets.Img; import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java index c5c1a01a2..5e938d818 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java @@ -2,7 +2,7 @@ package org.argeo.cms.ui.internal; import javax.jcr.RepositoryException; -import org.argeo.api.cms.Cms2DSize; +import org.argeo.api.cms.ux.Cms2DSize; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.cms.ui.widgets.EditableImage; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsLink.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsLink.java index 3821e6045..e91f9ba48 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsLink.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsLink.java @@ -8,8 +8,8 @@ import java.net.URL; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.api.cms.CmsStyle; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.ux.CmsStyle; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.cms.swt.CmsSwtUtils; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java index 73c545d0d..178fbcf24 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java @@ -9,9 +9,9 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.servlet.http.HttpServletRequest; -import org.argeo.api.cms.Cms2DSize; -import org.argeo.api.cms.CmsView; import org.argeo.api.cms.CmsConstants; +import org.argeo.api.cms.ux.Cms2DSize; +import org.argeo.api.cms.ux.CmsView; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.ui.CmsUiConstants; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java index 1fc9bd1be..1ec2622b0 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java @@ -18,9 +18,9 @@ import javax.jcr.Property; import javax.jcr.RepositoryException; import org.apache.commons.io.IOUtils; -import org.argeo.api.cms.Cms2DSize; -import org.argeo.api.cms.CmsImageManager; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.ux.Cms2DSize; +import org.argeo.api.cms.ux.CmsImageManager; import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.rwt.RWT; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleStyle.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleStyle.java index 8ed06a292..b5fca2699 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleStyle.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleStyle.java @@ -1,6 +1,6 @@ package org.argeo.cms.ui.util; -import org.argeo.api.cms.CmsStyle; +import org.argeo.api.cms.ux.CmsStyle; /** Simple styles used by the CMS UI utilities. */ public enum SimpleStyle implements CmsStyle { diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java index ef24ee0d5..1d0c9620a 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java @@ -11,8 +11,8 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.security.auth.Subject; -import org.argeo.api.cms.CmsEditable; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.ux.CmsEditable; import org.argeo.cms.ui.widgets.ScrolledPage; import org.argeo.jcr.JcrException; import org.eclipse.jface.viewers.ContentViewer; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/JcrVersionCmsEditable.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/JcrVersionCmsEditable.java index 11162e87f..07724f4b1 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/JcrVersionCmsEditable.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/JcrVersionCmsEditable.java @@ -8,7 +8,7 @@ import javax.jcr.Session; import javax.jcr.nodetype.NodeType; import javax.jcr.version.VersionManager; -import org.argeo.api.cms.CmsEditable; +import org.argeo.api.cms.ux.CmsEditable; import org.argeo.cms.CmsException; import org.argeo.cms.ui.CmsEditionEvent; import org.eclipse.rap.rwt.RWT; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java index c2393f267..95d9e8ee9 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java @@ -3,8 +3,8 @@ package org.argeo.cms.ui.widgets; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.api.cms.Cms2DSize; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.ux.Cms2DSize; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.swt.graphics.Point; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/Img.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/Img.java index 3a4a60c9f..41063fa47 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/Img.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/Img.java @@ -3,8 +3,8 @@ package org.argeo.cms.ui.widgets; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.api.cms.Cms2DSize; -import org.argeo.api.cms.CmsImageManager; +import org.argeo.api.cms.ux.Cms2DSize; +import org.argeo.api.cms.ux.CmsImageManager; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.ui.internal.JcrFileUploadReceiver; import org.argeo.cms.ui.viewers.NodePart; diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsApp.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsApp.java index 99c619c80..745e5a400 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsApp.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/CmsApp.java @@ -2,6 +2,9 @@ package org.argeo.api.cms; import java.util.Set; +import org.argeo.api.cms.ux.CmsTheme; +import org.argeo.api.cms.ux.CmsUi; + /** An extensible user interface base on the CMS backend. */ public interface CmsApp { /** diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsEvent.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsEvent.java index b5dccbe9c..047717275 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsEvent.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/CmsEvent.java @@ -1,5 +1,7 @@ package org.argeo.api.cms; +import org.argeo.api.cms.ux.CmsView; + /** * Can be applied to {@link Enum}s in order to define events used by * {@link CmsView#sendEvent(String, java.util.Map)}. diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/Cms2DSize.java b/org.argeo.api.cms/src/org/argeo/api/cms/ux/Cms2DSize.java similarity index 93% rename from org.argeo.api.cms/src/org/argeo/api/cms/Cms2DSize.java rename to org.argeo.api.cms/src/org/argeo/api/cms/ux/Cms2DSize.java index 30b3d8100..9667e8352 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/Cms2DSize.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/ux/Cms2DSize.java @@ -1,4 +1,4 @@ -package org.argeo.api.cms; +package org.argeo.api.cms.ux; /** A 2D size. */ public class Cms2DSize { diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsEditable.java b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsEditable.java similarity index 96% rename from org.argeo.api.cms/src/org/argeo/api/cms/CmsEditable.java rename to org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsEditable.java index 2deca018e..9047004ba 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsEditable.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsEditable.java @@ -1,4 +1,4 @@ -package org.argeo.api.cms; +package org.argeo.api.cms.ux; /** Abstraction of a simple edition life cycle. */ public interface CmsEditable { diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsIcon.java b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsIcon.java new file mode 100644 index 000000000..d4f86b207 --- /dev/null +++ b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsIcon.java @@ -0,0 +1,10 @@ +package org.argeo.api.cms.ux; + +/** + * Marker interface to be applied to {@link Enum}s in order to find or generate + * icons. + */ +public interface CmsIcon { + String name(); + +} diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsImageManager.java b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsImageManager.java similarity index 97% rename from org.argeo.api.cms/src/org/argeo/api/cms/CmsImageManager.java rename to org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsImageManager.java index 8c637b8cb..1ec54a9d9 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsImageManager.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsImageManager.java @@ -1,4 +1,4 @@ -package org.argeo.api.cms; +package org.argeo.api.cms.ux; import java.io.InputStream; diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsStyle.java b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsStyle.java similarity index 93% rename from org.argeo.api.cms/src/org/argeo/api/cms/CmsStyle.java rename to org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsStyle.java index 8444e2fc5..e3f2e771d 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsStyle.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsStyle.java @@ -1,4 +1,4 @@ -package org.argeo.api.cms; +package org.argeo.api.cms.ux; /** Can be applied to {@link Enum}s in order to generate (CSS) class names. */ public interface CmsStyle { diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsTheme.java b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsTheme.java similarity index 88% rename from org.argeo.api.cms/src/org/argeo/api/cms/CmsTheme.java rename to org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsTheme.java index 50c3b1f25..3a4a78ed3 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsTheme.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsTheme.java @@ -1,4 +1,4 @@ -package org.argeo.api.cms; +package org.argeo.api.cms.ux; import java.io.IOException; import java.io.InputStream; @@ -37,7 +37,13 @@ public interface CmsTheme { String getBodyHtml(); /** The default icon size (typically the smallest). */ - Integer getDefaultIconSize(); + default int getDefaultIconSize() { + return getSmallIconSize(); + } + + int getSmallIconSize(); + + int getBigIconSize(); /** Loads one of the relative path provided by the other methods. */ InputStream loadPath(String path) throws IOException; diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsUi.java b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsUi.java similarity index 76% rename from org.argeo.api.cms/src/org/argeo/api/cms/CmsUi.java rename to org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsUi.java index fd91c6e34..011cc1deb 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsUi.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsUi.java @@ -1,4 +1,4 @@ -package org.argeo.api.cms; +package org.argeo.api.cms.ux; public interface CmsUi { Object getData(String key); diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsView.java b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsView.java similarity index 96% rename from org.argeo.api.cms/src/org/argeo/api/cms/CmsView.java rename to org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsView.java index c7ca1e90c..45629fba5 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsView.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsView.java @@ -1,4 +1,4 @@ -package org.argeo.api.cms; +package org.argeo.api.cms.ux; import java.security.PrivilegedAction; import java.util.HashMap; @@ -6,6 +6,8 @@ import java.util.Map; import javax.security.auth.login.LoginContext; +import org.argeo.api.cms.CmsSession; + /** Provides interaction with the CMS system. */ public interface CmsView { final static String CMS_VIEW_UID_PROPERTY = "argeo.cms.view.uid"; diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/MvcProvider.java b/org.argeo.api.cms/src/org/argeo/api/cms/ux/MvcProvider.java similarity index 97% rename from org.argeo.api.cms/src/org/argeo/api/cms/MvcProvider.java rename to org.argeo.api.cms/src/org/argeo/api/cms/ux/MvcProvider.java index 92864ea5c..3556edecf 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/MvcProvider.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/ux/MvcProvider.java @@ -1,4 +1,4 @@ -package org.argeo.api.cms; +package org.argeo.api.cms.ux; import java.util.function.BiFunction; diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/UxContext.java b/org.argeo.api.cms/src/org/argeo/api/cms/ux/UxContext.java similarity index 92% rename from org.argeo.api.cms/src/org/argeo/api/cms/UxContext.java rename to org.argeo.api.cms/src/org/argeo/api/cms/ux/UxContext.java index fb99178ee..adb41d366 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/UxContext.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/ux/UxContext.java @@ -1,4 +1,4 @@ -package org.argeo.api.cms; +package org.argeo.api.cms.ux; public interface UxContext { boolean isPortrait(); diff --git a/org.argeo.cms.ux/src/org/argeo/cms/ux/CmsUxUtils.java b/org.argeo.cms.ux/src/org/argeo/cms/ux/CmsUxUtils.java index 1b2b0e940..015f35db1 100644 --- a/org.argeo.cms.ux/src/org/argeo/cms/ux/CmsUxUtils.java +++ b/org.argeo.cms.ux/src/org/argeo/cms/ux/CmsUxUtils.java @@ -3,7 +3,7 @@ package org.argeo.cms.ux; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentRepository; import org.argeo.api.acr.ContentSession; -import org.argeo.api.cms.CmsView; +import org.argeo.api.cms.ux.CmsView; import org.argeo.cms.auth.CurrentUser; public class CmsUxUtils { diff --git a/org.argeo.cms.ux/src/org/argeo/cms/ux/widgets/Column.java b/org.argeo.cms.ux/src/org/argeo/cms/ux/widgets/Column.java index 5890fc4f8..9bfa9620a 100644 --- a/org.argeo.cms.ux/src/org/argeo/cms/ux/widgets/Column.java +++ b/org.argeo.cms.ux/src/org/argeo/cms/ux/widgets/Column.java @@ -6,4 +6,5 @@ public interface Column { default int getWidth() { return 200; } + } diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsApp.java b/org.argeo.cms/src/org/argeo/cms/AbstractCmsApp.java index c2d52f3d0..cefdb86b3 100644 --- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsApp.java +++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsApp.java @@ -9,7 +9,7 @@ import java.util.Map; import org.argeo.api.cms.CmsApp; import org.argeo.api.cms.CmsAppListener; import org.argeo.api.cms.CmsContext; -import org.argeo.api.cms.CmsTheme; +import org.argeo.api.cms.ux.CmsTheme; /** Base class for {@link CmsApp}s. */ public abstract class AbstractCmsApp implements CmsApp { diff --git a/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java b/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java index 3312d72f9..3ab799f71 100644 --- a/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java +++ b/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java @@ -18,7 +18,7 @@ import java.util.TreeSet; import java.util.stream.Collectors; import org.apache.commons.io.IOUtils; -import org.argeo.api.cms.CmsTheme; +import org.argeo.api.cms.ux.CmsTheme; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -64,7 +64,8 @@ public class BundleCmsTheme implements CmsTheme { // private String swtCssPath; private Bundle themeBundle; - private Integer defaultIconSize = 16; + private Integer smallIconSize = 16; + private Integer bigIconSize = 32; public BundleCmsTheme() { @@ -320,8 +321,13 @@ public class BundleCmsTheme implements CmsTheme { } @Override - public Integer getDefaultIconSize() { - return defaultIconSize; + public int getSmallIconSize() { + return smallIconSize; + } + + @Override + public int getBigIconSize() { + return bigIconSize; } @Override diff --git a/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java b/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java index 95be53d5f..471cdeca5 100644 --- a/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java +++ b/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java @@ -8,10 +8,10 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import org.argeo.api.cms.CmsAuth; -import org.argeo.api.cms.CmsImageManager; -import org.argeo.api.cms.CmsView; import org.argeo.api.cms.CmsLog; -import org.argeo.api.cms.UxContext; +import org.argeo.api.cms.ux.CmsImageManager; +import org.argeo.api.cms.ux.CmsView; +import org.argeo.api.cms.ux.UxContext; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.SimpleSwtUxContext; diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java index edf558e9c..a2b944064 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java +++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java @@ -20,8 +20,8 @@ import javax.script.ScriptEngine; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.argeo.api.cms.CmsTheme; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.ux.CmsTheme; import org.argeo.cms.CmsException; import org.argeo.cms.ui.CmsUiConstants; import org.argeo.cms.ui.CmsUiProvider; diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java index a4d04568e..be1f30eb1 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java +++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java @@ -21,8 +21,8 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import javax.servlet.http.HttpServletRequest; -import org.argeo.api.cms.CmsView; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.ux.CmsView; import org.argeo.api.cms.CmsAuth; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java index 5de0f9103..102a4e103 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java +++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java @@ -3,7 +3,7 @@ package org.argeo.cms.web; import java.io.IOException; import java.io.InputStream; -import org.argeo.api.cms.CmsTheme; +import org.argeo.api.cms.ux.CmsTheme; import org.eclipse.rap.rwt.service.ResourceLoader; /** A RAP {@link ResourceLoader} based on a {@link CmsTheme}. */ diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java index 68fd803b9..a1d54cfef 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java +++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java @@ -8,8 +8,8 @@ import java.util.Set; import org.argeo.api.cms.CmsApp; import org.argeo.api.cms.CmsAppListener; import org.argeo.api.cms.CmsLog; -import org.argeo.api.cms.CmsTheme; -import org.argeo.api.cms.CmsView; +import org.argeo.api.cms.ux.CmsTheme; +import org.argeo.api.cms.ux.CmsView; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.util.LangUtils; import org.eclipse.rap.rwt.RWT; diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java index 2236870f6..9e407366d 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java +++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java @@ -14,12 +14,12 @@ import javax.security.auth.login.LoginException; import org.argeo.api.cms.CmsApp; import org.argeo.api.cms.CmsAuth; -import org.argeo.api.cms.CmsImageManager; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.CmsSession; -import org.argeo.api.cms.CmsUi; -import org.argeo.api.cms.CmsView; -import org.argeo.api.cms.UxContext; +import org.argeo.api.cms.ux.CmsImageManager; +import org.argeo.api.cms.ux.CmsUi; +import org.argeo.api.cms.ux.CmsView; +import org.argeo.api.cms.ux.UxContext; import org.argeo.cms.LocaleUtils; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.RemoteAuthCallbackHandler; diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java index 26ca3705f..1b50c19b7 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java +++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java @@ -7,9 +7,9 @@ import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.RepositoryException; -import org.argeo.api.cms.CmsImageManager; import org.argeo.api.cms.CmsLog; -import org.argeo.api.cms.UxContext; +import org.argeo.api.cms.ux.CmsImageManager; +import org.argeo.api.cms.ux.UxContext; import org.argeo.cms.CmsException; import org.argeo.cms.swt.CmsStyles; import org.argeo.cms.swt.CmsSwtUtils; diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java index ea2ebdfb4..e51644b9f 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java +++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java @@ -1,7 +1,7 @@ package org.argeo.cms.web; -import org.argeo.api.cms.CmsTheme; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.ux.CmsTheme; import org.eclipse.rap.rwt.application.Application; import org.eclipse.rap.rwt.service.ResourceLoader; diff --git a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java b/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java index a708af13f..a13c0170f 100644 --- a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java +++ b/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java @@ -8,9 +8,9 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import org.argeo.api.cms.CmsAuth; -import org.argeo.api.cms.CmsImageManager; -import org.argeo.api.cms.CmsView; -import org.argeo.api.cms.UxContext; +import org.argeo.api.cms.ux.CmsImageManager; +import org.argeo.api.cms.ux.CmsView; +import org.argeo.api.cms.ux.UxContext; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.swt.CmsSwtUtils; 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 ed019d706..e6a24b92b 100644 --- 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 @@ -13,13 +13,13 @@ import javax.security.auth.login.LoginException; import org.argeo.api.cms.CmsApp; import org.argeo.api.cms.CmsAuth; -import org.argeo.api.cms.CmsImageManager; import org.argeo.api.cms.CmsLog; 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.UxContext; +import org.argeo.api.cms.ux.CmsImageManager; +import org.argeo.api.cms.ux.CmsTheme; +import org.argeo.api.cms.ux.CmsUi; +import org.argeo.api.cms.ux.CmsView; +import org.argeo.api.cms.ux.UxContext; import org.argeo.cms.swt.CmsSwtUtils; import org.eclipse.e4.ui.css.core.engine.CSSEngine; import org.eclipse.e4.ui.css.core.engine.CSSErrorHandler; -- 2.30.2