X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FSuiteUi.java;h=de060df0b086563f90d5653039bc8fe35b726c42;hb=b32a7ed960be8dbaa50e605a409c14402db5b489;hp=a19da2164029b95b5f09ce1a75a1f1a5a872ec31;hpb=8317c50a86ebb2d50add224816e3dd6103e36150;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUi.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUi.java
index a19da21..de060df 100644
--- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUi.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUi.java
@@ -5,8 +5,8 @@ import java.util.Map;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.cms.CmsLog;
-import org.argeo.api.cms.CmsUi;
-import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.ux.CmsUi;
+import org.argeo.api.cms.ux.CmsView;
 import org.argeo.cms.Localized;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.eclipse.swt.SWT;
@@ -140,12 +140,13 @@ class SuiteUi extends Composite implements CmsUi {
 		}
 	}
 
-	Composite switchToLayer(SuiteLayer layer, Content context) {
+	void switchToLayer(SuiteLayer layer, Content context) {
 		// TODO make it more robust
 		for (String layerId : layers.keySet()) {
 			SuiteLayer l = layers.get(layerId);
-			if (layer == l) {
-				return switchToLayer(layerId, context);
+			if (layer.getId().equals(l.getId())) {
+				switchToLayer(layerId, context);
+				return;
 			}
 		}
 		throw new IllegalArgumentException("Layer is not registered.");