X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=core%2Forg.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FDefaultHeader.java;h=91154c3b9f7f09b7ca2ac936c56e28c58ac2cabe;hp=a251e14c78ffa0de572f661a56c524e106e11e9a;hb=9ab716f8f45fc34f4848bd1a8b8c0a5e7783a5a9;hpb=418ea1efbf3f0d6b706603c6ff1c0fdd17314773

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultHeader.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultHeader.java
index a251e14..91154c3 100644
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultHeader.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultHeader.java
@@ -1,19 +1,16 @@
 package org.argeo.suite.ui;
 
-import java.util.Dictionary;
 import java.util.Map;
-import java.util.TreeMap;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.argeo.cms.LocaleUtils;
+import org.argeo.cms.Localized;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.ui.CmsTheme;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.util.CmsUiUtils;
-import org.argeo.util.LangUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -23,12 +20,13 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
-import org.osgi.service.cm.ConfigurationException;
-import org.osgi.service.cm.ManagedService;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.wiring.BundleWiring;
 
-public class DefaultHeader implements CmsUiProvider, ManagedService {
+/** Header of a standard Argeo Suite application. */
+public class DefaultHeader implements CmsUiProvider {
 	public final static String TITLE_PROPERTY = "argeo.suite.ui.header.title";
-	private Map<String, String> properties;
+	private Localized title = null;
 
 	@Override
 	public Control createUi(Composite parent, Node context) throws RepositoryException {
@@ -43,9 +41,11 @@ public class DefaultHeader implements CmsUiProvider, ManagedService {
 		lead.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, true, false));
 		lead.setLayout(new GridLayout());
 		Label lbl = new Label(lead, SWT.NONE);
-		String title = properties.get(TITLE_PROPERTY);
-		lbl.setText(LocaleUtils.isLocaleKey(title) ? LocaleUtils.local(title, getClass().getClassLoader()).toString()
-				: title);
+//		String title = properties.get(TITLE_PROPERTY);
+//		// TODO expose the localized
+//		lbl.setText(LocaleUtils.isLocaleKey(title) ? LocaleUtils.local(title, getClass().getClassLoader()).toString()
+//				: title);
+		lbl.setText(title.lead());
 		CmsUiUtils.style(lbl, SuiteStyle.headerTitle);
 		lbl.setLayoutData(CmsUiUtils.fillWidth());
 
@@ -84,14 +84,36 @@ public class DefaultHeader implements CmsUiProvider, ManagedService {
 		return lbl;
 	}
 
-	public void init(Map<String, String> properties) {
-		this.properties = new TreeMap<>(properties);
+	public void init(BundleContext bundleContext, Map<String, String> properties) {
+		String titleStr = (String) properties.get(TITLE_PROPERTY);
+		if (titleStr != null) {
+			if (titleStr.startsWith("%")) {
+				title = new Localized() {
+
+					@Override
+					public String name() {
+						return titleStr;
+					}
+
+					@Override
+					public ClassLoader getL10nClassLoader() {
+						return bundleContext != null
+								? bundleContext.getBundle().adapt(BundleWiring.class).getClassLoader()
+								: getClass().getClassLoader();
+					}
+				};
+			} else {
+				title = new Localized.Untranslated(titleStr);
+			}
+		}
 	}
 
-	@Override
-	public void updated(Dictionary<String, ?> properties) throws ConfigurationException {
-		if (properties != null)
-			this.properties.putAll(LangUtils.dictToStringMap(properties));
+	public void destroy(BundleContext bundleContext, Map<String, String> properties) {
+
+	}
+
+	public Localized getTitle() {
+		return title;
 	}
 
 }