X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FMinimalWebApp.java;h=fe8b20c92097286b31e9dc63986ac50502f7dbbb;hb=28eae1d74809cb8752ab72219063e822e264c77d;hp=31c93af22c92dc0dbe1e2b03ffe49747de0e175d;hpb=7a62cdf5e9d2e1350b0b5e1fdac9cbf22b97ef42;p=lgpl%2Fargeo-commons.git

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 31c93af22..fe8b20c92 100644
--- 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,7 +1,6 @@
 package org.argeo.cms.web;
 
 import static org.argeo.cms.ui.util.CmsTheme.CMS_THEME_BUNDLE_PROPERTY;
-import static org.argeo.cms.ui.util.CmsTheme.DEFAULT_CMS_THEME_BUNDLE;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,8 +21,6 @@ public class MinimalWebApp implements ApplicationConfiguration {
 		if (properties.containsKey(CMS_THEME_BUNDLE_PROPERTY)) {
 			String cmsThemeBundle = properties.get(CMS_THEME_BUNDLE_PROPERTY).toString();
 			theme = new CmsTheme(bundleContext, cmsThemeBundle);
-		} else {
-			theme = new CmsTheme(bundleContext, DEFAULT_CMS_THEME_BUNDLE);
 		}
 	}
 
@@ -38,11 +35,16 @@ public class MinimalWebApp implements ApplicationConfiguration {
 
 	@Override
 	public void configure(Application application) {
-		theme.apply(application);
+		if (theme != null)
+			theme.apply(application);
 
 		Map<String, String> properties = new HashMap<>();
-		properties.put(WebClient.THEME_ID, RWT.DEFAULT_THEME_ID);
-		properties.put(WebClient.HEAD_HTML, theme.getAdditionalHeaders());
+		if (theme != null) {
+			properties.put(WebClient.THEME_ID, theme.getThemeId());
+			properties.put(WebClient.HEAD_HTML, theme.getAdditionalHeaders());
+		} else {
+			properties.put(WebClient.THEME_ID, RWT.DEFAULT_THEME_ID);
+		}
 		addEntryPoints(application, properties);
 
 	}