X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FDefaultEditionLayer.java;h=9e399f0e8d6eeaba335b72c60f4058809c935b5a;hb=f1b87af2e0de38f1f49ab8fe68f9988018914811;hp=d383e450f0f7158b1762fa1a9b03a522ef11ff22;hpb=9c3baf6fd38128aea09679be4c0b54d23cf7a876;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java
index d383e45..9e399f0 100644
--- a/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java
@@ -10,7 +10,6 @@ import org.argeo.cms.swt.CmsSwtTheme;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.acr.SwtTabbedArea;
 import org.argeo.cms.swt.acr.SwtUiProvider;
-import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.util.LangUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
@@ -18,13 +17,15 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
 import org.osgi.framework.wiring.BundleWiring;
 
 /** An app layer based on an entry area and an editor area. */
 public class DefaultEditionLayer implements SuiteLayer {
-	private CmsUiProvider entryArea;
-	private CmsUiProvider defaultView;
-	private CmsUiProvider workArea;
+	private String id;
+	private SwtUiProvider entryArea;
+	private SwtUiProvider defaultView;
+	private SwtUiProvider workArea;
 	private List<String> weights = new ArrayList<>();
 	private boolean startMaximized = false;
 	private boolean fixedEntryArea = false;
@@ -118,7 +119,15 @@ public class DefaultEditionLayer implements SuiteLayer {
 		return title;
 	}
 
+	@Override
+	public String getId() {
+		return id;
+	}
+
 	public void init(BundleContext bundleContext, Map<String, Object> properties) {
+		String pid = (String) properties.get(Constants.SERVICE_PID);
+		id = pid;
+
 		weights = LangUtils.toStringList(properties.get(Property.weights.name()));
 		startMaximized = properties.containsKey(Property.startMaximized.name())
 				&& "true".equals(properties.get(Property.startMaximized.name()));
@@ -158,15 +167,15 @@ public class DefaultEditionLayer implements SuiteLayer {
 
 	}
 
-	public void setEntryArea(CmsUiProvider entryArea) {
+	public void setEntryArea(SwtUiProvider entryArea) {
 		this.entryArea = entryArea;
 	}
 
-	public void setWorkArea(CmsUiProvider workArea) {
+	public void setWorkArea(SwtUiProvider workArea) {
 		this.workArea = workArea;
 	}
 
-	public void setDefaultView(CmsUiProvider defaultView) {
+	public void setDefaultView(SwtUiProvider defaultView) {
 		this.defaultView = defaultView;
 	}