From d09c91914b8d3b9c88c7c4d9a46e84d898b4a9f2 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 17 Jun 2023 12:51:05 +0200
Subject: [PATCH] Working read-only DocBook

---
 org.argeo.product.knowledge/OSGI-INF/structureLayer.xml      | 2 +-
 org.argeo.product.knowledge/OSGI-INF/termsLayer.xml          | 2 +-
 .../src/org/argeo/app/swt/ux/DefaultEditionLayer.java        | 2 ++
 swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtAppUi.java | 5 +++++
 swt/org.argeo.app.ui/OSGI-INF/contentLayer.xml               | 2 +-
 swt/org.argeo.app.ui/OSGI-INF/leadPane.xml                   | 1 +
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/org.argeo.product.knowledge/OSGI-INF/structureLayer.xml b/org.argeo.product.knowledge/OSGI-INF/structureLayer.xml
index 68753f6..5d77e20 100644
--- a/org.argeo.product.knowledge/OSGI-INF/structureLayer.xml
+++ b/org.argeo.product.knowledge/OSGI-INF/structureLayer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="argeo.product.knowledge.structureLayer">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="argeo.product.knowledge.structureLayer">
    <implementation class="org.argeo.app.swt.ux.DefaultEditionLayer"/>
    <service>
       <provide interface="org.argeo.app.swt.ux.SwtAppLayer"/>
diff --git a/org.argeo.product.knowledge/OSGI-INF/termsLayer.xml b/org.argeo.product.knowledge/OSGI-INF/termsLayer.xml
index 5849ebc..c3e8882 100644
--- a/org.argeo.product.knowledge/OSGI-INF/termsLayer.xml
+++ b/org.argeo.product.knowledge/OSGI-INF/termsLayer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="argeo.product.knowledge.termsLayer">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="argeo.product.knowledge.termsLayer">
    <implementation class="org.argeo.app.swt.ux.DefaultEditionLayer"/>
    <service>
       <provide interface="org.argeo.app.swt.ux.SwtAppLayer"/>
diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/DefaultEditionLayer.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/DefaultEditionLayer.java
index fd5dca7..109dd22 100644
--- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/DefaultEditionLayer.java
+++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/DefaultEditionLayer.java
@@ -3,6 +3,7 @@ package org.argeo.app.swt.ux;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.argeo.api.acr.Content;
 import org.argeo.app.ux.SuiteIcon;
@@ -130,6 +131,7 @@ public class DefaultEditionLayer implements SwtAppLayer {
 	public void init(BundleContext bundleContext, Map<String, Object> properties) {
 		String pid = (String) properties.get(Constants.SERVICE_PID);
 		id = pid;
+		Objects.requireNonNull(id, "Layer id must be set.");
 
 		weights = LangUtils.toStringList(properties.get(Property.weights.name()));
 		startMaximized = properties.containsKey(Property.startMaximized.name())
diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtAppUi.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtAppUi.java
index f5ad257..9654a8e 100644
--- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtAppUi.java
+++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtAppUi.java
@@ -153,6 +153,11 @@ public class SwtAppUi extends CmsSwtUi implements AppUi {
 	}
 
 	public void addLayer(String id, SwtAppLayer layer) {
+		if (!id.equals(layer.getId())) {
+			log.error("Layer id as key '" + id + "' is not consistent with layer id '" + layer.getId()
+					+ "', ignoring...");
+			return;
+		}
 		layers.put(id, layer);
 	}
 
diff --git a/swt/org.argeo.app.ui/OSGI-INF/contentLayer.xml b/swt/org.argeo.app.ui/OSGI-INF/contentLayer.xml
index 9a550f4..37622b8 100644
--- a/swt/org.argeo.app.ui/OSGI-INF/contentLayer.xml
+++ b/swt/org.argeo.app.ui/OSGI-INF/contentLayer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Content Layer">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="Content Layer">
    <implementation class="org.argeo.app.swt.ux.DefaultEditionLayer"/>
    <service>
       <provide interface="org.argeo.app.swt.ux.SwtAppLayer"/>
diff --git a/swt/org.argeo.app.ui/OSGI-INF/leadPane.xml b/swt/org.argeo.app.ui/OSGI-INF/leadPane.xml
index 57a7468..9c0df65 100644
--- a/swt/org.argeo.app.ui/OSGI-INF/leadPane.xml
+++ b/swt/org.argeo.app.ui/OSGI-INF/leadPane.xml
@@ -8,6 +8,7 @@
    <properties entry="config/leadPane.properties"/>
    <property name="defaultLayers" type="String">argeo.suite.ui.dashboardLayer
 argeo.library.ui.contentLayer
+argeo.product.knowledge.structureLayer
 argeo.people.ui.peopleLayer
 argeo.geo.ui.mapLayer
    </property>
-- 
2.30.2