From a548c15bfb23ed0120a6558b40d8b0362c9ba956 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 27 Sep 2020 12:46:29 +0200 Subject: [PATCH] Move theme constants to Argeo Commons. --- .../src/org/argeo/suite/e4/rap/settings/AppDeployer.java | 9 +++------ .../src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) 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 c158811..bb32488 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 @@ -19,9 +19,6 @@ import org.osgi.service.cm.ManagedServiceFactory; * Managed service factory deploying Argeo RAP app based on OSGi configurations. */ public class AppDeployer implements ManagedServiceFactory { - public final static String CMS_THEME_BUNDLE_PROPERTY = "argeo.cms.theme.bundle"; - public final static String DEFAULT_CMS_THEME_BUNDLE = "org.argeo.theme.argeo2"; - private final static Log log = LogFactory.getLog(AppDeployer.class); private BundleContext bundleContext; @@ -49,11 +46,11 @@ public class AppDeployer implements ManagedServiceFactory { protected void deploy(Bundle bundle, Map properties) { CmsTheme cmsTheme; - if (properties.containsKey(CMS_THEME_BUNDLE_PROPERTY)) { - String cmsThemeBundle = properties.get(CMS_THEME_BUNDLE_PROPERTY); + 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, DEFAULT_CMS_THEME_BUNDLE); + cmsTheme = new CmsTheme(bundleContext, CmsTheme.DEFAULT_CMS_THEME_BUNDLE); } ArgeoRapApp app = new ArgeoRapApp(bundleContext, bundle, cmsTheme); 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(); } -- 2.30.2