Better deal with missing layer when anonymous.

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
index cad5a9b994e093dce57c08c18dc147e630f54686..d93c3a8b38eb54de555474f13853e6d72646b28b 100644 (file)
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
@@ -90,15 +90,16 @@ class SuiteUi extends Composite {
 
        private Composite getLayer(String id, Node context) {
                if (!layers.containsKey(id))
 
        private Composite getLayer(String id, Node context) {
                if (!layers.containsKey(id))

-                       throw new IllegalArgumentException("No layer " + id + " is available.");
+                       return null;

                if (!workAreas.containsKey(id))
                        initLayer(id, layers.get(id), context);
                return workAreas.get(id);
        }
 
        Composite switchToLayer(String layerId, Node context) {
                if (!workAreas.containsKey(id))
                        initLayer(id, layers.get(id), context);
                return workAreas.get(id);
        }
 
        Composite switchToLayer(String layerId, Node context) {

+               Composite current = null;

                if (currentLayerId != null) {
                if (currentLayerId != null) {

-                       Composite current = getCurrentWorkArea();
+                       current = getCurrentWorkArea();

                        if (currentLayerId.equals(layerId))
                                return current;
                }
                        if (currentLayerId.equals(layerId))
                                return current;
                }


@@ -107,16 +108,20 @@ class SuiteUi extends Composite {
                                context = userDir;
                }
                Composite toShow = getLayer(layerId, context);
                                context = userDir;
                }
                Composite toShow = getLayer(layerId, context);

-               currentLayerId = layerId;
-               if (!isDisposed())
-                       getDisplay().syncExec(() -> {
-                               if (!toShow.isDisposed())
-                                       toShow.moveAbove(null);
-                               else
-                                       log.warn("Cannot show work area because it is disposed.");
-                               dynamicArea.layout(true, true);
-                       });
-               return toShow;
+               if (toShow != null) {
+                       currentLayerId = layerId;
+                       if (!isDisposed())
+                               getDisplay().syncExec(() -> {
+                                       if (!toShow.isDisposed())
+                                               toShow.moveAbove(null);
+                                       else
+                                               log.warn("Cannot show work area because it is disposed.");
+                                       dynamicArea.layout(true, true);
+                               });
+                       return toShow;
+               } else {
+                       return current;
+               }

        }
 
        Composite switchToLayer(SuiteLayer layer, Node context) {
        }
 
        Composite switchToLayer(SuiteLayer layer, Node context) {