X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.e4.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fe4%2Frap%2Fsettings%2FArgeoRapApp.java;fp=org.argeo.suite.e4.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fe4%2Frap%2Fsettings%2FArgeoRapApp.java;h=bb4fae976e63ee422e0f7f490d9818a7ea0195cc;hp=322a1bff7d773cab3038598f7631a382d073d1ca;hb=a548c15bfb23ed0120a6558b40d8b0362c9ba956;hpb=d6463016cbcd660c72cc74ebaa2a6e8247ccfa4f diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java index 322a1bf..bb4fae9 100644 --- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java +++ b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java @@ -1,8 +1,5 @@ package org.argeo.suite.e4.rap.settings; -import static org.argeo.suite.e4.rap.settings.AppDeployer.CMS_THEME_BUNDLE_PROPERTY; -import static org.argeo.suite.e4.rap.settings.AppDeployer.DEFAULT_CMS_THEME_BUNDLE; - import java.util.Enumeration; import java.util.Map; @@ -41,11 +38,11 @@ public class ArgeoRapApp extends AbstractRapE4App { public void init(BundleContext bundleContext, Map properties) { super.init(bundleContext, properties); // super must be first - if (getBaseProperties().containsKey(CMS_THEME_BUNDLE_PROPERTY)) { - String cmsThemeBundle = getBaseProperties().get(CMS_THEME_BUNDLE_PROPERTY); + if (getBaseProperties().containsKey(CmsTheme.CMS_THEME_BUNDLE_PROPERTY)) { + String cmsThemeBundle = getBaseProperties().get(CmsTheme.CMS_THEME_BUNDLE_PROPERTY); cmsTheme = new CmsTheme(getBundleContext(), cmsThemeBundle); } else { - cmsTheme = new CmsTheme(getBundleContext(), DEFAULT_CMS_THEME_BUNDLE); + cmsTheme = new CmsTheme(getBundleContext(), CmsTheme.DEFAULT_CMS_THEME_BUNDLE); } bundle = bundleContext.getBundle(); }