From ae5c5ac3f44793c5c2dd21de2aa163a0a884956c Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 20 Jan 2010 13:00:31 +0000
Subject: [PATCH] LMS-1343 making LogoutCallback a normal class
SVN: 14357
---
.../menu/user/action/LogoutAction.java | 17 -------
.../menu/user/action/LogoutCallback.java | 44 +++++++++++++++++++
2 files changed, 44 insertions(+), 17 deletions(-)
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutCallback.java
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutAction.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutAction.java
index f3678f4c595..9ea6d5a2af6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutAction.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutAction.java
@@ -17,9 +17,7 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.user.action;
import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings;
@@ -43,19 +41,4 @@ public class LogoutAction implements IDelegatedAction
viewContext.getModel().getSessionContext().getDisplaySettings();
viewContext.getService().logout(displaySettings, new LogoutCallback(viewContext));
}
-
- private final class LogoutCallback extends AbstractAsyncCallback<Void>
- {
- LogoutCallback(IViewContext<ICommonClientServiceAsync> viewContext)
- {
- super(viewContext);
- }
-
- @Override
- public final void process(final Void result)
- {
- viewContext.getPageController().reload(true);
- GWTUtils.setAllowConfirmOnExit(false);
- }
- }
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutCallback.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutCallback.java
new file mode 100644
index 00000000000..56615094b8c
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutCallback.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.user.action;
+
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
+
+final class LogoutCallback extends AbstractAsyncCallback<Void>
+{
+ LogoutCallback(IViewContext<ICommonClientServiceAsync> viewContext)
+ {
+ super(viewContext);
+ System.out.println("CREATE "+this);
+ }
+
+ @Override
+ protected void finalize() throws Throwable
+ {
+ System.out.println("FINALIZE "+this);
+ }
+
+ @Override
+ public final void process(final Void result)
+ {
+ viewContext.getPageController().reload(true);
+ GWTUtils.setAllowConfirmOnExit(false);
+ }
+}
\ No newline at end of file
--
GitLab