Adapt RCP to recent RAP versions.

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 d66e817ad59f471826e56eb10e22fbfcffce9e44..489c39492b22d19238db5461c868e608015656a9 100644 (file)
--- 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
@@ -14,6 +14,7 @@ import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.UxContext;
 import org.argeo.cms.ui.util.SimpleUxContext;
 import org.argeo.cms.ui.widgets.auth.CmsLoginShell;
+import org.argeo.eclipse.ui.specific.UiContext;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.Platform;
@@ -76,7 +77,7 @@ public class CmsE4Application implements IApplication, CmsView {
                // }
 
                uxContext = new SimpleUxContext();
-
+               UiContext.setData(CmsView.KEY, this);
                e4Application = getApplication(null);
                Object res = Subject.doAs(subject, new PrivilegedExceptionAction<Object>() {
 

diff --git a/rcp/org.argeo.eclipse.ui.rcp/bnd.bnd b/rcp/org.argeo.eclipse.ui.rcp/bnd.bnd
index f516fbb2f369d6912f0f9b3fa569ec19a85311fb..590b97eaf9e5b966496bf4979b0de0d6051c9d83 100644 (file)
--- a/rcp/org.argeo.eclipse.ui.rcp/bnd.bnd
+++ b/rcp/org.argeo.eclipse.ui.rcp/bnd.bnd
@@ -7,8 +7,8 @@ Import-Package: org.apache.commons.io,\
                                *
 
 Export-Package: org.argeo.*,\
-org.eclipse.rap.fileupload.*;version="3.4",\
-org.eclipse.rap.rwt.*;version="3.4"
+org.eclipse.rap.fileupload.*;version="3.10",\
+org.eclipse.rap.rwt.*;version="3.10"
 
 # Was !org.eclipse.core.commands,\ why ?
 

diff --git a/rcp/org.argeo.eclipse.ui.rcp/src/org/eclipse/rap/rwt/RWT.java b/rcp/org.argeo.eclipse.ui.rcp/src/org/eclipse/rap/rwt/RWT.java
index b53c76c5416ea042201a428fa623b998ef2ffe42..1688594bb8c5ae26c5f831bfd38fd6ab18b3d974 100644 (file)
--- a/rcp/org.argeo.eclipse.ui.rcp/src/org/eclipse/rap/rwt/RWT.java
+++ b/rcp/org.argeo.eclipse.ui.rcp/src/org/eclipse/rap/rwt/RWT.java
@@ -12,6 +12,7 @@ import org.eclipse.rap.rwt.service.ResourceManager;
 public class RWT {
        public final static String CUSTOM_VARIANT = "argeo-rcp:CUSTOM_VARIANT";
        public final static String MARKUP_ENABLED = "argeo-rcp:MARKUP_ENABLED";
+       public static final String TOOLTIP_MARKUP_ENABLED = "argeo-rcp:TOOLTIP_MARKUP_ENABLED";
        public final static String CUSTOM_ITEM_HEIGHT = "argeo-rcp:CUSTOM_ITEM_HEIGHT";
        public final static String ACTIVE_KEYS = "argeo-rcp:ACTIVE_KEYS";
        public final static String CANCEL_KEYS = "argeo-rcp:CANCEL_KEYS";