Adapt to changes in Argeo Commons.

diff --git a/org.argeo.suite.e4.rap/bnd.bnd b/org.argeo.suite.e4.rap/bnd.bnd
index e65157a97d1f7ab2059fe4572a9bd6638f8c51bf..2c856d80c7d7e99673af12dde85ba86c9b4504a7 100644 (file)
--- a/org.argeo.suite.e4.rap/bnd.bnd
+++ b/org.argeo.suite.e4.rap/bnd.bnd
@@ -4,7 +4,7 @@ Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/argeo-office-rap.xml,\
 OSGI-INF/appDeployer.xml
 
-Import-Package: org.argeo.node,\
+Import-Package: org.argeo.api,\
 org.eclipse.swt,\
 org.eclipse.rap.rwt,\
 org.eclipse.rap.rwt.client,\

diff --git a/org.argeo.suite.e4.rap/cms/app.js b/org.argeo.suite.e4.rap/cms/app.js
index 149649642a3f6011965a2afa1b0e35daac103551..cef9cc8853818ceb8e5ce8fce488aa9e317874d4 100644 (file)
--- a/org.argeo.suite.e4.rap/cms/app.js
+++ b/org.argeo.suite.e4.rap/cms/app.js
@@ -4,16 +4,16 @@ APP.webPath = 'suite'
 // Common
 APP.pageTitle = 'Argeo Suite';
 APP.favicon = 'icons/argeo-e.png';
-APP.theme = new org.argeo.cms.script.Theme(BC, 'org.argeo.theme.argeo2')
+APP.theme = new org.argeo.cms.ui.script.Theme(BC, 'org.argeo.theme.argeo2')
 
 // Office
-APP.ui['office'] = new org.argeo.cms.script.AppUi(APP,
+APP.ui['office'] = new org.argeo.cms.ui.script.AppUi(APP,
                new org.argeo.suite.e4.rap.ArgeoSuiteEntryPoint(
                                'org.argeo.suite.e4/e4xmi/argeo-office.e4xmi'));
 APP.ui['office'].pageTitle = 'Office';
 
 // Docs
-APP.ui['docs'] = new org.argeo.cms.script.AppUi(APP,
+APP.ui['docs'] = new org.argeo.cms.ui.script.AppUi(APP,
                new org.argeo.suite.e4.rap.ArgeoSuiteEntryPoint(
                                'org.argeo.suite.e4/e4xmi/argeo-docs.e4xmi'));
 APP.ui['docs'].pageTitle = 'Docs';

diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java
index 3e732ef664f642b4d1bbf6e180b8369462d45649..ab43845a97a85d0f3c3ef2c5b06afb4309f0ec32 100644 (file)
--- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java
+++ b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java
@@ -1,7 +1,7 @@
 package org.argeo.suite.e4.rap;
 
 import org.argeo.cms.e4.rap.AbstractRapE4App;
-import org.argeo.cms.util.CmsTheme;
+import org.argeo.cms.ui.util.CmsTheme;
 import org.eclipse.rap.rwt.application.Application;
 import org.eclipse.rap.rwt.client.WebClient;
 import org.osgi.framework.BundleContext;

diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteLoginLifecycle.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteLoginLifecycle.java
index da41b4248ba6578d80c5c813c7de925720d8496e..1be3106107abb9821291217023ad7984fc1ed976 100644 (file)
--- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteLoginLifecycle.java
+++ b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteLoginLifecycle.java
@@ -12,10 +12,10 @@ import javax.security.auth.Subject;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.e4.rap.CmsLoginLifecycle;
 import org.argeo.connect.ui.SystemWorkbenchService;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeConstants;
 
 public class ArgeoSuiteLoginLifecycle extends CmsLoginLifecycle {
        private final static Log log = LogFactory.getLog(ArgeoSuiteLoginLifecycle.class);

diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/AppDeployer.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/AppDeployer.java
index 874f180d090edb8290c0b5fe315bb1c529242526..f19220b8e600d7a2606f93327ee1dc6951b51d26 100644 (file)
--- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/AppDeployer.java
+++ b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/AppDeployer.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.e4.rap.AbstractRapE4App;
-import org.argeo.cms.util.CmsTheme;
+import org.argeo.cms.ui.util.CmsTheme;
 import org.eclipse.rap.rwt.application.ApplicationConfiguration;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;

diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java
index 83a5bd0cf6726c81f8afe0f93eb427a487ad6613..169ea6232837ae6ff79c1ab00fbd41c6741e614b 100644 (file)
--- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java
+++ b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java
@@ -6,7 +6,7 @@ import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.e4.rap.AbstractRapE4App;
-import org.argeo.cms.util.CmsTheme;
+import org.argeo.cms.ui.util.CmsTheme;
 import org.eclipse.rap.rwt.application.Application;
 import org.eclipse.rap.rwt.client.WebClient;
 import org.osgi.framework.Bundle;

diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java
index f473297431cd8c9d50e4e19220bf6019247995ec..7616d999954701e86be3cc0857867bc42e1d35ff 100644 (file)
--- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java
+++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java
@@ -7,8 +7,9 @@ import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.Session;
 
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.ui.eclipse.forms.FormToolkit;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.connect.SystemAppService;
 import org.argeo.connect.resources.ResourcesService;
 import org.argeo.connect.ui.AppWorkbenchService;
@@ -17,7 +18,6 @@ import org.argeo.connect.ui.SystemWorkbenchService;
 import org.argeo.connect.util.ConnectJcrUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeConstants;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.client.service.BrowserNavigation;
@@ -86,20 +86,20 @@ public abstract class AbstractSuiteDashboard {
                gd.widthHint = widthHint;
                gd.heightHint = heightHint;
                gadgetCmp.setLayoutData(gd);
-               CmsUtils.style(gadgetCmp, ConnectUiStyles.GADGET_BOX);
+               CmsUiUtils.style(gadgetCmp, ConnectUiStyles.GADGET_BOX);
                return gadgetCmp;
        }
 
        protected Composite createGadgetTitleCmp(Composite parent, String title) {
                Composite titleCmp = toolkit.createComposite(parent, SWT.BACKGROUND | SWT.INHERIT_NONE);
-               CmsUtils.style(titleCmp, ConnectUiStyles.GADGET_HEADER);
+               CmsUiUtils.style(titleCmp, ConnectUiStyles.GADGET_HEADER);
                titleCmp.setBackground(null);
                GridData gd = new GridData(SWT.FILL, SWT.TOP, true, false);
                titleCmp.setLayoutData(gd);
                titleCmp.setLayout(new GridLayout());
 
                Label titleLbl = toolkit.createLabel(titleCmp, title + " ", SWT.BOLD);
-               CmsUtils.style(titleLbl, ConnectUiStyles.GADGET_HEADER);
+               CmsUiUtils.style(titleLbl, ConnectUiStyles.GADGET_HEADER);
                titleLbl.setBackground(null);
                return titleCmp;
        }

diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
index 259ea430983f4e8d1d82e3baafe1326e2c322edd..dd1c2b084732003422bc110d68220a7f92c9d0af 100644 (file)
--- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
@@ -18,8 +18,9 @@ import org.argeo.activities.ActivitiesNames;
 import org.argeo.activities.ActivitiesService;
 import org.argeo.activities.ActivitiesTypes;
 import org.argeo.activities.ui.TaskViewerContextMenu;
+import org.argeo.api.NodeUtils;
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.connect.ConnectException;
 import org.argeo.connect.ConnectNames;
 import org.argeo.connect.ui.ConnectWorkbenchUtils;
@@ -27,7 +28,6 @@ import org.argeo.connect.ui.Refreshable;
 import org.argeo.connect.util.ConnectJcrUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeUtils;
 import org.argeo.suite.e4.SuiteMsg;
 import org.argeo.tracker.TrackerNames;
 import org.argeo.tracker.TrackerService;
@@ -94,10 +94,10 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 
        @Override
        public void forceRefresh(Object object) {
-               CmsUtils.clear(headerCmp);
+               CmsUiUtils.clear(headerCmp);
                populateHeaderPart(headerCmp, NodeUtils.getUserHome(getHomeSession()));
 
-               CmsUtils.clear(taskListCmp);
+               CmsUiUtils.clear(taskListCmp);
                populateTaskListCmp(taskListCmp);
 
                headerCmp.getParent().layout(true, true);
@@ -113,7 +113,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 
                        // Label noTaskLbl = new Label(noTaskCmp, SWT.CENTER);
                        // noTaskLbl.setText("<i> <big> You have no pending Task. </big> </i>");
-                       // CmsUtils.markup(noTaskLbl);
+                       // CmsUiUtils.markup(noTaskLbl);
                        // noTaskLbl.setLayoutData(new GridData(SWT.CENTER, SWT.BOTTOM, true, true));
 
                } else {
@@ -182,7 +182,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 
                // Title
                Label titleLbl = new Label(leftCmp, SWT.WRAP | SWT.LEAD);
-               CmsUtils.markup(titleLbl);
+               CmsUiUtils.markup(titleLbl);
                String titleStr = "<big><b>" + CurrentUser.getDisplayName() + "</b></big>";
                titleLbl.setText(titleStr);
                GridData gd = new GridData(SWT.BEGINNING, SWT.TOP, false, false);
@@ -381,7 +381,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
        // LOCAL HELPERS
        private void populateMuliValueClickableList(Composite parent, Node[] nodes, ColumnLabelProvider lp,
                        String listLabel) {
-               CmsUtils.clear(parent);
+               CmsUiUtils.clear(parent);
                RowLayout rl = new RowLayout(SWT.HORIZONTAL | SWT.WRAP);
                rl.wrap = true;
                rl.marginLeft = rl.marginTop = rl.marginBottom = 0;
@@ -397,7 +397,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                int i = 1;
                for (Node node : nodes) {
                        Link link = new Link(parent, SWT.NONE);
-                       CmsUtils.markup(link);
+                       CmsUiUtils.markup(link);
                        link.setText(lp.getText(node) + (i != nodes.length ? ", " : ""));
                        i++;
                        // Color fc = lp.getForeground(node);

diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java
index 99fd5cd8cbf9b4bb2102633e08700c8c2c12f013..5cfbc39517ea159ea9fcb674128e834ce029ebc4 100644 (file)
--- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java
+++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java
@@ -20,7 +20,7 @@ import javax.jcr.query.QueryResult;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.activities.ActivitiesService;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.connect.ConnectException;
 import org.argeo.connect.ConnectTypes;
 import org.argeo.connect.resources.ResourcesService;
@@ -181,8 +181,8 @@ public class QuickSearchView implements Refreshable {
                Table table = v.getTable();
                table.setLinesVisible(true);
                table.setHeaderVisible(false);
-               CmsUtils.markup(table);
-               CmsUtils.setItemHeight(table, 26);
+               CmsUiUtils.markup(table);
+               CmsUiUtils.setItemHeight(table, 26);
 
                v.setContentProvider(new BasicNodeListContentProvider());
                v.addDoubleClickListener(new JcrViewerDClickListener(systemWorkbenchService));