projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make web publishing easier to configure.
[gpl/argeo-suite.git]
/
core
/
org.argeo.suite.ui
/
src
/
org
/
argeo
/
suite
/
ui
/
DefaultHeader.java
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 080bac2cfa121b92817a22a95aecabfb700c6641..91154c3b9f7f09b7ca2ac936c56e28c58ac2cabe 100644
(file)
--- 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,8
+1,6
@@
package org.argeo.suite.ui;
package org.argeo.suite.ui;
-import java.util.Dictionary;
import java.util.Map;
import java.util.Map;
-import java.util.TreeMap;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@
-13,7
+11,6
@@
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.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;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@
-25,14
+22,10
@@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.osgi.framework.BundleContext;
import org.osgi.framework.wiring.BundleWiring;
import org.eclipse.swt.widgets.Label;
import org.osgi.framework.BundleContext;
import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.service.cm.ConfigurationException;
-import org.osgi.service.cm.ManagedService;
-/** H
E
ader of a standard Argeo Suite application. */
-public class DefaultHeader implements CmsUiProvider
, ManagedService
{
+/** H
e
ader of a standard Argeo Suite application. */
+public class DefaultHeader implements CmsUiProvider {
public final static String TITLE_PROPERTY = "argeo.suite.ui.header.title";
public final static String TITLE_PROPERTY = "argeo.suite.ui.header.title";
- private Map<String, String> properties;
-
private Localized title = null;
@Override
private Localized title = null;
@Override
@@
-92,7
+85,6
@@
public class DefaultHeader implements CmsUiProvider, ManagedService {
}
public void init(BundleContext bundleContext, Map<String, String> properties) {
}
public void init(BundleContext bundleContext, Map<String, String> properties) {
- this.properties = new TreeMap<>(properties);
String titleStr = (String) properties.get(TITLE_PROPERTY);
if (titleStr != null) {
if (titleStr.startsWith("%")) {
String titleStr = (String) properties.get(TITLE_PROPERTY);
if (titleStr != null) {
if (titleStr.startsWith("%")) {
@@
-116,14
+108,8
@@
public class DefaultHeader implements CmsUiProvider, ManagedService {
}
}
}
}
- public void destroy() {
-
- }
+ public void destroy(BundleContext bundleContext, Map<String, String> properties) {
- @Override
- public void updated(Dictionary<String, ?> properties) throws ConfigurationException {
- if (properties != null)
- this.properties.putAll(LangUtils.dictToStringMap(properties));
}
public Localized getTitle() {
}
public Localized getTitle() {