Improve CMS theming.

[lgpl/argeo-commons.git] / org.argeo.cms.ui / src / org / argeo / cms / web / MinimalWebApp.java

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/web/MinimalWebApp.java b/org.argeo.cms.ui/src/org/argeo/cms/web/MinimalWebApp.java
index b4af7595d231604e8f07e3696faebb92ace33eb0..188391c42e68d4b736d444fc88e374a06d142946 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/web/MinimalWebApp.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/web/MinimalWebApp.java
@@ -1,53 +1,56 @@
 package org.argeo.cms.web;
 
+import static org.argeo.cms.ui.util.BundleCmsTheme.CMS_THEME_BUNDLE_PROPERTY;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import org.argeo.cms.ui.util.CmsTheme;
+import org.argeo.cms.ui.util.BundleCmsTheme;
 import org.eclipse.rap.rwt.RWT;
-import org.eclipse.rap.rwt.application.AbstractEntryPoint;
 import org.eclipse.rap.rwt.application.Application;
 import org.eclipse.rap.rwt.application.ApplicationConfiguration;
 import org.eclipse.rap.rwt.client.WebClient;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
 import org.osgi.framework.BundleContext;
 
 /** Lightweight web app using only RWT and not the whole Eclipse platform. */
 public class MinimalWebApp implements ApplicationConfiguration {
 
-       private CmsTheme theme;
+       private BundleCmsTheme theme;
 
-       public void init(BundleContext bundleContext) {
-               theme = new CmsTheme(bundleContext);
+       public void init(BundleContext bundleContext, Map<String, Object> properties) {
+               if (properties.containsKey(CMS_THEME_BUNDLE_PROPERTY)) {
+                       String cmsThemeBundle = properties.get(CMS_THEME_BUNDLE_PROPERTY).toString();
+                       theme = new BundleCmsTheme(bundleContext, cmsThemeBundle);
+               }
        }
 
        public void destroy() {
 
        }
 
+       /** To be overridden. Does nothing by default. */
+       protected void addEntryPoints(Application application, Map<String, String> properties) {
+
+       }
+
        @Override
        public void configure(Application application) {
-               theme.apply(application);
+               if (theme != null)
+                       WebThemeUtils.apply(application, theme);
 
                Map<String, String> properties = new HashMap<>();
-               properties.put(WebClient.THEME_ID, RWT.DEFAULT_THEME_ID);
-               properties.put(WebClient.HEAD_HTML, theme.getAdditionalHeaders());
-               application.addEntryPoint("/test", TextEntryPoint.class, properties);
+               if (theme != null) {
+                       properties.put(WebClient.THEME_ID, theme.getThemeId());
+                       properties.put(WebClient.HEAD_HTML, theme.getHtmlHeaders());
+               } else {
+                       properties.put(WebClient.THEME_ID, RWT.DEFAULT_THEME_ID);
+               }
+               addEntryPoints(application, properties);
 
        }
 
-       static class TextEntryPoint extends AbstractEntryPoint {
-               private static final long serialVersionUID = 2245808564950897823L;
-
-               @Override
-               protected void createContents(Composite parent) {
-                       parent.setLayout(new GridLayout());
-                       new Label(parent, SWT.NONE).setText("Hello World!");
-               }
-
+       public void setTheme(BundleCmsTheme theme) {
+               this.theme = theme;
        }
 
 }