Make layer switching more robust

[gpl/argeo-suite.git] / org.argeo.app.ui / src / org / argeo / app / ui / SuiteUi.java

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 a19da2164029b95b5f09ce1a75a1f1a5a872ec31..2e27d6a439854b9ab06bbab40156fdd0de1bf289 100644 (file)
--- 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,12 @@ 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);
+                               switchToLayer(layerId, context);
                        }
                }
                throw new IllegalArgumentException("Layer is not registered.");