X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Finternal%2FActivator.java;h=e10da3aedb534d32fd074e81ffa7a9a3b9618bdf;hb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hp=052762ec0e76b2f1a6d9cc972270d8d81b948ced;hpb=c5fa035468228d1f87ab5431a3fad17403eee1c3;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java index 052762ec0..e10da3aed 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java @@ -1,11 +1,6 @@ package org.argeo.cms.ui.internal; -import org.argeo.cms.maintenance.MaintenanceUi; -import org.argeo.cms.ui.CmsStyles; -import org.argeo.cms.ui.internal.rwt.UserUi; -import org.argeo.node.NodeState; -import org.argeo.util.LangUtils; -import org.eclipse.rap.rwt.application.ApplicationConfiguration; +import org.argeo.api.cms.CmsState; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.util.tracker.ServiceTracker; @@ -15,16 +10,16 @@ public class Activator implements BundleActivator { // avoid dependency to RWT OSGi private final static String CONTEXT_NAME_PROP = "contextName"; - private static ServiceTracker nodeState; + private static ServiceTracker nodeState; // @Override public void start(BundleContext bc) throws Exception { // UI - bc.registerService(ApplicationConfiguration.class, new MaintenanceUi(), - LangUtils.init(CONTEXT_NAME_PROP, "system")); - bc.registerService(ApplicationConfiguration.class, new UserUi(), LangUtils.init(CONTEXT_NAME_PROP, "user")); +// bc.registerService(ApplicationConfiguration.class, new MaintenanceUi(), +// LangUtils.dico(CONTEXT_NAME_PROP, "system")); +// bc.registerService(ApplicationConfiguration.class, new UserUi(), LangUtils.dico(CONTEXT_NAME_PROP, "user")); - nodeState = new ServiceTracker<>(bc, NodeState.class, null); + nodeState = new ServiceTracker<>(bc, CmsState.class, null); nodeState.open(); } @@ -36,7 +31,7 @@ public class Activator implements BundleActivator { } } - public static NodeState getNodeState() { + public static CmsState getNodeState() { return nodeState.getService(); } }