Improve extensibility and logging.

[lgpl/argeo-commons.git] / org.argeo.cms.e4.rap / src / org / argeo / cms / e4 / rap / AbstractRapE4App.java

diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
index 1d70044b3e5d4edb800721dc311ad811aa1cec7f..17c85ffb46630ec79d0073938446e06045af6250 100644 (file)
--- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
+++ b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
@@ -10,6 +10,7 @@ import org.eclipse.rap.rwt.application.Application.OperationMode;
 import org.eclipse.rap.rwt.application.ApplicationConfiguration;
 import org.eclipse.rap.rwt.application.ExceptionHandler;
 import org.eclipse.rap.rwt.client.WebClient;
+import org.osgi.framework.BundleContext;
 
 /** Base class for CMS RAP applications. */
 public abstract class AbstractRapE4App implements ApplicationConfiguration {
@@ -17,7 +18,18 @@ public abstract class AbstractRapE4App implements ApplicationConfiguration {
        private String path;
        private String lifeCycleUri = "bundleclass://org.argeo.cms.e4.rap/org.argeo.cms.e4.rap.CmsLoginLifecycle";
 
-       Map<String, String> baseProperties = new HashMap<String, String>();
+       private Map<String, String> baseProperties = new HashMap<String, String>();
+
+       private BundleContext bundleContext;
+       public final static String CONTEXT_NAME_PROPERTY = "contextName";
+       private String contextName;
+
+       /**
+        * To be overridden in order to add multiple entry points, directly or using
+        * {@link #addE4EntryPoint(Application, String, String, Map)}.
+        */
+       protected void addEntryPoints(Application application) {
+       }
 
        public void configure(Application application) {
                application.setExceptionHandler(new ExceptionHandler() {
@@ -35,14 +47,6 @@ public abstract class AbstractRapE4App implements ApplicationConfiguration {
                }
        }
 
-       /**
-        * To be overridden in order to add multiple entry points, directly or using
-        * {@link #addE4EntryPoint(Application, String, String, Map)}.
-        */
-       protected void addEntryPoints(Application application) {
-
-       }
-
        protected Map<String, String> getBaseProperties() {
                return baseProperties;
        }
@@ -54,21 +58,41 @@ public abstract class AbstractRapE4App implements ApplicationConfiguration {
 //     }
 
        protected void addE4EntryPoint(Application application, String path, String e4Xmi, Map<String, String> properties) {
-               E4ApplicationConfig config = new E4ApplicationConfig(e4Xmi, lifeCycleUri, null, null, false, true, true);
+               E4ApplicationConfig config = createE4ApplicationConfig(e4Xmi);
                CmsE4EntryPointFactory entryPointFactory = new CmsE4EntryPointFactory(config);
                application.addEntryPoint(path, entryPointFactory, properties);
                application.setOperationMode(OperationMode.SWT_COMPATIBILITY);
        }
 
+       /**
+        * To be overridden for further configuration.
+        * 
+        * @see E4ApplicationConfig
+        */
+       protected E4ApplicationConfig createE4ApplicationConfig(String e4Xmi) {
+               return new E4ApplicationConfig(e4Xmi, lifeCycleUri, null, null, false, true, true);
+       }
+
+       @Deprecated
        public void setPageTitle(String pageTitle) {
                if (pageTitle != null)
                        baseProperties.put(WebClient.PAGE_TITLE, pageTitle);
        }
 
+       /** Returns a new map used to customise and entry point. */
+       public Map<String, String> customise(String pageTitle) {
+               Map<String, String> custom = new HashMap<>(getBaseProperties());
+               if (pageTitle != null)
+                       custom.put(WebClient.PAGE_TITLE, pageTitle);
+               return custom;
+       }
+
+       @Deprecated
        public void setE4Xmi(String e4Xmi) {
                this.e4Xmi = e4Xmi;
        }
 
+       @Deprecated
        public void setPath(String path) {
                this.path = path;
        }
@@ -77,11 +101,35 @@ public abstract class AbstractRapE4App implements ApplicationConfiguration {
                this.lifeCycleUri = lifeCycleUri;
        }
 
-       public void init(Map<String, Object> properties) {
+       protected BundleContext getBundleContext() {
+               return bundleContext;
+       }
+
+       public String getContextName() {
+               return contextName;
+       }
+
+       public void setContextName(String contextName) {
+               this.contextName = contextName;
+       }
+
+       public void init(BundleContext bundleContext, Map<String, Object> properties) {
+               this.bundleContext = bundleContext;
                for (String key : properties.keySet()) {
                        Object value = properties.get(key);
                        if (value != null)
                                baseProperties.put(key, value.toString());
                }
+
+               if (properties.containsKey(CONTEXT_NAME_PROPERTY)) {
+                       assert properties.get(CONTEXT_NAME_PROPERTY) != null;
+                       contextName = properties.get(CONTEXT_NAME_PROPERTY).toString();
+               } else {
+                       contextName = "<unknown context>";
+               }
+       }
+
+       public void destroy(Map<String, Object> properties) {
+
        }
 }