Default edition layer supports SWT UI provider

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

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java
index 4bfc3de664286b7623f3ab5c93d27685d377cfe0..97bede26da8083c06af9f50c550527c1836504fb 100644 (file)
--- a/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java
@@ -5,12 +5,11 @@ import java.util.List;
 import java.util.Map;
 
 import org.argeo.api.acr.Content;
-import org.argeo.api.cms.CmsTheme;
 import org.argeo.cms.Localized;
+import org.argeo.cms.swt.CmsSwtTheme;
 import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.acr.SwtTabbedArea;
 import org.argeo.cms.swt.acr.SwtUiProvider;
-import org.argeo.cms.swt.widgets.SwtTabbedArea;
-import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.util.LangUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
@@ -22,9 +21,9 @@ import org.osgi.framework.wiring.BundleWiring;
 
 /** An app layer based on an entry area and an editor area. */
 public class DefaultEditionLayer implements SuiteLayer {
-       private CmsUiProvider entryArea;
-       private CmsUiProvider defaultView;
-       private CmsUiProvider workArea;
+       private SwtUiProvider entryArea;
+       private SwtUiProvider defaultView;
+       private SwtUiProvider workArea;
        private List<String> weights = new ArrayList<>();
        private boolean startMaximized = false;
        private boolean fixedEntryArea = false;
@@ -57,7 +56,7 @@ public class DefaultEditionLayer implements SuiteLayer {
                                this.workArea.createUiPart(area, context);
                                return area;
                        }
-                       CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
+                       CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent);
                        SwtTabbedArea tabbedArea = createTabbedArea(parent, theme);
                        return tabbedArea;
                }
@@ -158,25 +157,25 @@ public class DefaultEditionLayer implements SuiteLayer {
 
        }
 
-       public void setEntryArea(CmsUiProvider entryArea) {
+       public void setEntryArea(SwtUiProvider entryArea) {
                this.entryArea = entryArea;
        }
 
-       public void setWorkArea(CmsUiProvider workArea) {
+       public void setWorkArea(SwtUiProvider workArea) {
                this.workArea = workArea;
        }
 
-       public void setDefaultView(CmsUiProvider defaultView) {
+       public void setDefaultView(SwtUiProvider defaultView) {
                this.defaultView = defaultView;
        }
 
-       SwtTabbedArea createTabbedArea(Composite parent, CmsTheme theme) {
+       SwtTabbedArea createTabbedArea(Composite parent, CmsSwtTheme theme) {
                SwtTabbedArea tabbedArea = new SwtTabbedArea(parent, SWT.NONE);
                tabbedArea.setSingleTab(singleTab);
                tabbedArea.setBodyStyle(SuiteStyle.mainTabBody.style());
                tabbedArea.setTabStyle(SuiteStyle.mainTab.style());
                tabbedArea.setTabSelectedStyle(SuiteStyle.mainTabSelected.style());
-               tabbedArea.setCloseIcon(SuiteIcon.close.getSmallIcon(theme));
+               tabbedArea.setCloseIcon(theme.getSmallIcon(SuiteIcon.close));
                tabbedArea.setLayoutData(CmsSwtUtils.fillAll());
                return tabbedArea;
        }
@@ -189,7 +188,7 @@ public class DefaultEditionLayer implements SuiteLayer {
 
                SashFormEditionArea(Composite parent, int style) {
                        super(parent, SWT.HORIZONTAL);
-                       CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
+                       CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent);
 
                        Composite editorC;
                        if (SWT.RIGHT_TO_LEFT == (style & SWT.RIGHT_TO_LEFT)) {// arabic, hebrew, etc.
@@ -242,7 +241,7 @@ public class DefaultEditionLayer implements SuiteLayer {
 
                public FixedEditionArea(Composite parent, int style) {
                        super(parent, style);
-                       CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
+                       CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent);
 
                        setLayout(CmsSwtUtils.noSpaceGridLayout(2));