X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.e4.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fe4%2Frap%2Fsettings%2FAppDeployer.java;h=978a8e2d337ea5a62d424df56620ab16b392e35d;hp=bb3248838fe71b58baf27703eaa592133f62571a;hb=6dd21e8d47a1ecc92cf9f958af9ce1a97655fa68;hpb=a5ba54441da727f3965105a71b3a114b31dd34de 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 bb32488..978a8e2 100644 --- 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,6 @@ 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.ui.util.CmsTheme; import org.argeo.util.LangUtils; import org.eclipse.rap.rwt.application.ApplicationConfiguration; import org.osgi.framework.Bundle; @@ -45,15 +44,15 @@ public class AppDeployer implements ManagedServiceFactory { } protected void deploy(Bundle bundle, Map properties) { - CmsTheme cmsTheme; - if (properties.containsKey(CmsTheme.CMS_THEME_BUNDLE_PROPERTY)) { - String cmsThemeBundle = properties.get(CmsTheme.CMS_THEME_BUNDLE_PROPERTY); - cmsTheme = new CmsTheme(bundleContext, cmsThemeBundle); - } else { - cmsTheme = new CmsTheme(bundleContext, CmsTheme.DEFAULT_CMS_THEME_BUNDLE); - } +// CmsTheme cmsTheme; +// if (properties.containsKey(CmsTheme.CMS_THEME_BUNDLE_PROPERTY)) { +// String cmsThemeBundle = properties.get(CmsTheme.CMS_THEME_BUNDLE_PROPERTY); +// cmsTheme = new CmsTheme(bundleContext, cmsThemeBundle); +// } else { +// cmsTheme = new CmsTheme(bundleContext, CmsTheme.DEFAULT_CMS_THEME_BUNDLE); +// } - ArgeoRapApp app = new ArgeoRapApp(bundleContext, bundle, cmsTheme); + ArgeoRapApp app = new ArgeoRapApp(bundleContext, bundle, null); Hashtable props = new Hashtable(); props.put(AbstractRapE4App.CONTEXT_NAME_PROPERTY, app.getContextName());