[LMS-1719] Never ask user to refresh openBIS. We rely on smart caching (see...

[LMS-1719] Never ask user to refresh openBIS. We rely on smart caching (see previous commit). Additionally, we auto-reload openBIS when running in embedded/simple mode, so that users won't have to deal with annoying popups.

SVN: 20686

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractAsyncCallback.java

@@ -230,7 +230,7 @@ public abstract class AbstractAsyncCallback<T> implements AsyncCallback<T>
         }
         if (caught instanceof InvalidSessionException)
         {
-            showSessionTerminated(msg);
+            handleSessionTerminated(msg);
         } else
         {
             callbackListener.onFailureOf(viewContext, this, msg, caught);
@@ -253,6 +253,25 @@ public abstract class AbstractAsyncCallback<T> implements AsyncCallback<T>
         }
     }
 
+    private void refreshPageInBrowser()
+    {
+        if (viewContext != null)
+        {
+            viewContext.getPageController().reload(true);
+        }
+    }
+
+    private void handleSessionTerminated(String msg)
+    {
+        if (viewContext.isSimpleOrEmbeddedMode())
+        {
+            refreshPageInBrowser();
+        } else
+        {
+            showSessionTerminated(msg);
+        }
+    }
+
     private void showSessionTerminated(String msg)
     {
         Dialog dialog = new Dialog();
@@ -269,10 +288,9 @@ public abstract class AbstractAsyncCallback<T> implements AsyncCallback<T>
                 @Override
                 public void windowHide(WindowEvent we)
                 {
-                    if (viewContext != null && reloadWhenSessionTerminated)
+                    if (reloadWhenSessionTerminated)
                     {
-                        final IPageController pageController = viewContext.getPageController();
-                        pageController.reload(true);
+                        refreshPageInBrowser();
                     }
                 }
             });

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Client.java

@@ -96,14 +96,16 @@ public class Client implements EntryPoint, ValueChangeHandler<String>
                 //
                 // IPageController
                 //
-
                 public final void reload(final boolean logout)
                 {
                     if (logout)
                     {
-                        initializeControllers(openUrlController);
+                        // refresh the entire page
+                        Window.Location.reload();
+                    } else
+                    {
+                        onModuleLoad();
                     }
-                    onModuleLoad();
                 }
 
             };

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutCallback.java

@@ -17,7 +17,6 @@
 package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.user.action;
 
 import com.google.gwt.user.client.History;
-import com.google.gwt.user.client.Window;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
@@ -42,6 +41,6 @@ final class LogoutCallback extends AbstractAsyncCallback<Void>
     {
         History.newItem(""); // clears history token in URL
         GWTUtils.removeConfirmExitMessage();
-        Window.Location.reload();
+        viewContext.getPageController().reload(true);
     }
 }
\ No newline at end of file