From 5625b128c73eae2e8ad5c1b5a3b55b53ac064c72 Mon Sep 17 00:00:00 2001 From: srosse <none@none> Date: Mon, 21 Nov 2011 09:05:32 +0100 Subject: [PATCH] FXOLAT-358: remove more unused classes and packages (SpringController, recorder i18n package, unused layouter) --- .../commons/dispatcher/SessionDispatcher.java | 151 ------------------ .../JavaSystemPropertiesConfigurator.java | 48 ------ .../core/gui/control/DefaultController.java | 2 +- .../gui/control/DefaultSpringController.java | 73 --------- .../core/gui/control/SpringController.java | 42 ----- .../generic/layouter/LayoutController.java | 93 ----------- .../generic/layouter/_content/vertical.html | 5 - .../olat/core/gui/control/locks/LockInfo.java | 36 ----- .../gui/control/recorder/_content/manage.html | 6 - .../_i18n/LocalStrings_pt_PT.properties | 14 -- .../exception/ExceptionWindowController.java | 7 +- .../logging/StaleObjectRuntimeException.java | 64 -------- .../org/olat/dispatcher/DMZDispatcher.java | 3 +- .../gui/control/OlatFooterController.java | 5 - .../control/OlatGuestFooterController.java | 5 - 15 files changed, 3 insertions(+), 551 deletions(-) delete mode 100644 src/main/java/org/olat/commons/dispatcher/SessionDispatcher.java delete mode 100644 src/main/java/org/olat/core/configuration/JavaSystemPropertiesConfigurator.java delete mode 100644 src/main/java/org/olat/core/gui/control/DefaultSpringController.java delete mode 100644 src/main/java/org/olat/core/gui/control/SpringController.java delete mode 100644 src/main/java/org/olat/core/gui/control/generic/layouter/LayoutController.java delete mode 100644 src/main/java/org/olat/core/gui/control/generic/layouter/_content/vertical.html delete mode 100644 src/main/java/org/olat/core/gui/control/locks/LockInfo.java delete mode 100644 src/main/java/org/olat/core/gui/control/recorder/_content/manage.html delete mode 100644 src/main/java/org/olat/core/gui/control/recorder/_i18n/LocalStrings_pt_PT.properties delete mode 100644 src/main/java/org/olat/core/logging/StaleObjectRuntimeException.java diff --git a/src/main/java/org/olat/commons/dispatcher/SessionDispatcher.java b/src/main/java/org/olat/commons/dispatcher/SessionDispatcher.java deleted file mode 100644 index f4da38db891..00000000000 --- a/src/main/java/org/olat/commons/dispatcher/SessionDispatcher.java +++ /dev/null @@ -1,151 +0,0 @@ -/** -* OLAT - Online Learning and Training<br> -* http://www.olat.org -* <p> -* Licensed under the Apache License, Version 2.0 (the "License"); <br> -* you may not use this file except in compliance with the License.<br> -* You may obtain a copy of the License at -* <p> -* http://www.apache.org/licenses/LICENSE-2.0 -* <p> -* Unless required by applicable law or agreed to in writing,<br> -* software distributed under the License is distributed on an "AS IS" BASIS, <br> -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br> -* See the License for the specific language governing permissions and <br> -* limitations under the License. -* <p> -* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br> -* University of Zurich, Switzerland. -* <p> -*/ - -package org.olat.commons.dispatcher; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.olat.core.dispatcher.Dispatcher; -import org.olat.core.gui.UserRequest; -import org.olat.core.gui.Windows; -import org.olat.core.gui.components.Window; -import org.olat.core.gui.control.ChiefController; -import org.olat.core.gui.control.ChiefControllerCreator; -import org.olat.core.gui.exception.MsgFactory; -import org.olat.core.logging.Tracing; -import org.olat.core.util.UserSession; - -/** - * - * @author Felix Jost - */ -public class SessionDispatcher implements Dispatcher { - private ChiefControllerCreator chiefControllerCreator; - - private Dispatcher preDispatcher = null, postDispatcher = null; - - /** - * Main method called by DispatcherAction. - * This processess all requests for users who are not authenticated. - * - * @param request - * @param response - * @param uriPrefix - */ - public void execute(HttpServletRequest request, HttpServletResponse response, String uriPrefix) { - if (preDispatcher != null) { - preDispatcher.execute(request, response, uriPrefix); - } - - UserRequest ureq = new UserRequest(uriPrefix, request, response); - //String sessionId = request.getRequestedSessionId(); - try { - UserSession usess = ureq.getUserSession(); - Windows ws = Windows.getWindows(usess); - synchronized (ws) { //o_clusterOK by:fj - - Window window; - boolean windowHere = ws.isExisting(ureq.getWindowID()); - boolean validDispatchUri = ureq.isValidDispatchURI(); - if (validDispatchUri && !windowHere) { - // probably valid framework link from previous user && new Session(no window): - // when a previous user logged off, and 30min later (when the httpsession is invalidated), the next user clicks e.g. on - // the log-in link in the -same- browser window -> - // -> there is no window -> create a new one - window = null; - usess.signOffAndClear(); - // request new windows since it is a new usersession, the old one was purged - ws = Windows.getWindows(usess); - } else { - if (validDispatchUri) { - window = ws.getWindow(ureq); - } else { - // e.g. /dmz/ -> start screen, clear previous session data - window = null; - usess.signOffAndClear(); - // request new windows since it is a new usersession, the old one was purged - ws = Windows.getWindows(usess); - } - } - - if (window == null) { - // no window found, -> start a new WorkFlow/Controller and obtain the window - // main controller which also implements the windowcontroller for pagestatus and modal dialogs - ChiefController occ = chiefControllerCreator.createChiefController(ureq); - - // browser did not send a cookie && url has a window id with it (= we - // are clicking a framework link or submitting a framework form) - //if (sessionId == null && ureq.getWindowID() != null) { - //Translator trans = new PackageTranslator("org.olat", ureq.getLocale()); // locale - //occ.getWindowControl().setWarning(trans.translate("wayf.cookies")); - //} - - window = occ.getWindow(); - window.setUriPrefix(uriPrefix); - ws.registerWindow(window); - window.dispatchRequest(ureq, true); - - } else { - window.dispatchRequest(ureq); - } - } - } catch (Throwable th) { - try { - ChiefController msgcc = MsgFactory.createMessageChiefController(ureq, th); - // the controller's window must be failsafe also - msgcc.getWindow().dispatchRequest(ureq, true); - // do not dispatch (render only), since this is a new Window created as - // a result of another window's click. - } catch (Throwable t) { - Tracing.logError("An exception occured while handling the exception...",t, SessionDispatcher.class); - } - } finally { - if (postDispatcher != null) { - postDispatcher.execute(request, response, uriPrefix); - } - } - } - - /** - * [used by spring] - * @param chiefControllerCreator The chiefControllerCreator to set. - */ - public void setChiefControllerCreator(ChiefControllerCreator chiefControllerCreator) { - this.chiefControllerCreator = chiefControllerCreator; - } - - /** - * [spring] - * @param postDispatcher - */ - public void setPostDispatcher(Dispatcher postDispatcher) { - this.postDispatcher = postDispatcher; - } - - /** - * [spring] - * @param preDispatcher - */ - public void setPreDispatcher(Dispatcher preDispatcher) { - this.preDispatcher = preDispatcher; - } -} diff --git a/src/main/java/org/olat/core/configuration/JavaSystemPropertiesConfigurator.java b/src/main/java/org/olat/core/configuration/JavaSystemPropertiesConfigurator.java deleted file mode 100644 index 351eb8c44f4..00000000000 --- a/src/main/java/org/olat/core/configuration/JavaSystemPropertiesConfigurator.java +++ /dev/null @@ -1,48 +0,0 @@ -/** -* OLAT - Online Learning and Training<br> -* http://www.olat.org -* <p> -* Licensed under the Apache License, Version 2.0 (the "License"); <br> -* you may not use this file except in compliance with the License.<br> -* You may obtain a copy of the License at -* <p> -* http://www.apache.org/licenses/LICENSE-2.0 -* <p> -* Unless required by applicable law or agreed to in writing,<br> -* software distributed under the License is distributed on an "AS IS" BASIS, <br> -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br> -* See the License for the specific language governing permissions and <br> -* limitations under the License. -* <p> -* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br> -* University of Zurich, Switzerland. -* <p> -*/ -package org.olat.core.configuration; - -import java.util.Map; -import java.util.Properties; - -/** - * Description:<br> - * Set derby system properties - * - * <P> - * Initial Date: 30.04.2009 <br> - * @author guido - */ -public class JavaSystemPropertiesConfigurator { - - Map<String, String> map; - - /** - * Set java system properties provided by spring at runtime. See spring config - * for properties set - * [used by spring] - */ - private JavaSystemPropertiesConfigurator(Map<String, String> map) { - Properties p = System.getProperties(); - p.putAll(map); - } - -} diff --git a/src/main/java/org/olat/core/gui/control/DefaultController.java b/src/main/java/org/olat/core/gui/control/DefaultController.java index 9d6bfe3a353..6e88c76a3ed 100644 --- a/src/main/java/org/olat/core/gui/control/DefaultController.java +++ b/src/main/java/org/olat/core/gui/control/DefaultController.java @@ -87,7 +87,7 @@ public abstract class DefaultController implements Controller, ControllerEventLi } /** - * if you need to instantiate controllers e.g. via spring -> see SpringController and SpringDefaultController + * */ @SuppressWarnings("unused") private DefaultController() { diff --git a/src/main/java/org/olat/core/gui/control/DefaultSpringController.java b/src/main/java/org/olat/core/gui/control/DefaultSpringController.java deleted file mode 100644 index b4f5f1f513a..00000000000 --- a/src/main/java/org/olat/core/gui/control/DefaultSpringController.java +++ /dev/null @@ -1,73 +0,0 @@ -/** -* OLAT - Online Learning and Training<br> -* http://www.olat.org -* <p> -* Licensed under the Apache License, Version 2.0 (the "License"); <br> -* you may not use this file except in compliance with the License.<br> -* You may obtain a copy of the License at -* <p> -* http://www.apache.org/licenses/LICENSE-2.0 -* <p> -* Unless required by applicable law or agreed to in writing,<br> -* software distributed under the License is distributed on an "AS IS" BASIS, <br> -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br> -* See the License for the specific language governing permissions and <br> -* limitations under the License. -* <p> -* Copyright (c) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br> -* University of Zurich, Switzerland. -* <p> -*/ - -package org.olat.core.gui.control; - -import org.olat.core.gui.UserRequest; -import org.olat.core.gui.components.Component; - -/** - * Description:<br> - * TODO: patrickb Class Description for DefaultSpringController - * - * <P> - * Initial Date: 13.06.2006 <br> - * @author patrickb - */ -public abstract class DefaultSpringController extends DefaultController implements SpringController { - - - /** - * [used by spring] - * the caller must call init(ureq, windowcontrol) later - * brasato:::: replace with ControllerCreator - */ - public DefaultSpringController() { - super(null); - //via init: we use this.setOrigWControl(); to set the WControl later!! - } - - /** - * @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest, org.olat.core.gui.components.Component, org.olat.core.gui.control.Event) - */ - public abstract void event(UserRequest ureq, Component source, Event event); - - /** - * @see org.olat.core.gui.control.DefaultController#doDispose(boolean) - */ - protected abstract void doDispose(); - - /** - * all implementors do their "normal" init here, which would normally be done in the constructor. - * to use the windowcontrol in the doInit, use "getWindowControl()" - */ - protected abstract void doInit(UserRequest ureq); - - /** - * - * @see org.olat.core.gui.control.SpringController#init(org.olat.core.gui.UserRequest, org.olat.core.gui.control.WindowControl) - */ - public final void init(UserRequest ureq, WindowControl wControl){ - this.setOrigWControl(wControl); - doInit(ureq); - } - -} diff --git a/src/main/java/org/olat/core/gui/control/SpringController.java b/src/main/java/org/olat/core/gui/control/SpringController.java deleted file mode 100644 index eec951c1199..00000000000 --- a/src/main/java/org/olat/core/gui/control/SpringController.java +++ /dev/null @@ -1,42 +0,0 @@ -/** -* OLAT - Online Learning and Training<br> -* http://www.olat.org -* <p> -* Licensed under the Apache License, Version 2.0 (the "License"); <br> -* you may not use this file except in compliance with the License.<br> -* You may obtain a copy of the License at -* <p> -* http://www.apache.org/licenses/LICENSE-2.0 -* <p> -* Unless required by applicable law or agreed to in writing,<br> -* software distributed under the License is distributed on an "AS IS" BASIS, <br> -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br> -* See the License for the specific language governing permissions and <br> -* limitations under the License. -* <p> -* Copyright (c) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br> -* University of Zurich, Switzerland. -* <p> -*/ - -package org.olat.core.gui.control; - -import org.olat.core.gui.UserRequest; - -/** - * Description:<br> - * this is an interface (see DefaultSpringController for a default class) to allow controllers to be created using spring. - * callers must call myInstance.init(ureq, getWindowControl()) after having obtained the new instance from spring - * - * <P> - * Initial Date: 13.06.2006 <br> - * @author patrickb, Felix Jost - */ -public interface SpringController extends Controller{ - /** - * - * @param ureq - * @param wControl - */ - public void init(UserRequest ureq, WindowControl wControl); -} diff --git a/src/main/java/org/olat/core/gui/control/generic/layouter/LayoutController.java b/src/main/java/org/olat/core/gui/control/generic/layouter/LayoutController.java deleted file mode 100644 index 9a32d4e9045..00000000000 --- a/src/main/java/org/olat/core/gui/control/generic/layouter/LayoutController.java +++ /dev/null @@ -1,93 +0,0 @@ -/** -* OLAT - Online Learning and Training<br> -* http://www.olat.org -* <p> -* Licensed under the Apache License, Version 2.0 (the "License"); <br> -* you may not use this file except in compliance with the License.<br> -* You may obtain a copy of the License at -* <p> -* http://www.apache.org/licenses/LICENSE-2.0 -* <p> -* Unless required by applicable law or agreed to in writing,<br> -* software distributed under the License is distributed on an "AS IS" BASIS, <br> -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br> -* See the License for the specific language governing permissions and <br> -* limitations under the License. -* <p> -* Copyright (c) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br> -* University of Zurich, Switzerland. -* <p> -*/ - -package org.olat.core.gui.control.generic.layouter; - -import java.util.Iterator; -import java.util.List; - -import org.olat.core.gui.UserRequest; -import org.olat.core.gui.components.Component; -import org.olat.core.gui.components.velocity.VelocityContainer; -import org.olat.core.gui.control.Controller; -import org.olat.core.gui.control.DefaultController; -import org.olat.core.gui.control.Event; -import org.olat.core.logging.AssertException; -import org.olat.core.util.Util; - -/** - * enclosing_type Description: <br> - * - * @author Felix Jost<br> - * TODO:fj:b make a generic layouter like swings gridbaglayout or such - */ -public class LayoutController extends DefaultController { - private static final String VELOCITY_ROOT = Util.getPackageVelocityRoot(LayoutController.class); - - private VelocityContainer myContent; - private List controllers; - - /** - * @deprecated - * brasato:: improve / usage?? at least use mycontroller.add(component comp) - as in swing / layout - * @param layouter a layouter (@see Layouts). if null, a vertical layout will - * be applied - * @param controllers - */ - public LayoutController(Layouter layouter, List controllers) { - super(null); - // TODO:fj:b Layoutmanagers which make sense for the web - if (layouter != null && layouter != Layouts.VERTICAL) throw new AssertException("not implemented yet!"); - this.controllers = controllers; - - myContent = new VelocityContainer("layouter", VELOCITY_ROOT + "/vertical.html", null, null); - - int cnt = controllers.size(); - String[] names = new String[cnt]; - for (int i = 0; i < cnt; i++) { - String cName = "c" + i; // c0 c1 c2 - names[i] = cName; - Controller cont = (Controller) controllers.get(i); - myContent.put(cName, cont.getInitialComponent()); - } - myContent.contextPut("names", names); - setInitialComponent(myContent); - } - - /** - * @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest, - * org.olat.core.gui.components.Component, org.olat.core.gui.control.Event) - */ - public void event(UserRequest ureq, Component source, Event event) { - // nothing to listen to - } - - /** - * @see org.olat.core.gui.control.DefaultController#doDispose(boolean) - */ - protected void doDispose() { - for (Iterator it_conts = controllers.iterator(); it_conts.hasNext();) { - Controller cont = (Controller) it_conts.next(); - cont.dispose(); - } - } - -} \ No newline at end of file diff --git a/src/main/java/org/olat/core/gui/control/generic/layouter/_content/vertical.html b/src/main/java/org/olat/core/gui/control/generic/layouter/_content/vertical.html deleted file mode 100644 index 3b4ddbc7573..00000000000 --- a/src/main/java/org/olat/core/gui/control/generic/layouter/_content/vertical.html +++ /dev/null @@ -1,5 +0,0 @@ -#foreach ($name in $names) -<div> - $r.render($name) -</div> -#end \ No newline at end of file diff --git a/src/main/java/org/olat/core/gui/control/locks/LockInfo.java b/src/main/java/org/olat/core/gui/control/locks/LockInfo.java deleted file mode 100644 index 2db88c76c5c..00000000000 --- a/src/main/java/org/olat/core/gui/control/locks/LockInfo.java +++ /dev/null @@ -1,36 +0,0 @@ -/** -* OLAT - Online Learning and Training<br> -* http://www.olat.org -* <p> -* Licensed under the Apache License, Version 2.0 (the "License"); <br> -* you may not use this file except in compliance with the License.<br> -* You may obtain a copy of the License at -* <p> -* http://www.apache.org/licenses/LICENSE-2.0 -* <p> -* Unless required by applicable law or agreed to in writing,<br> -* software distributed under the License is distributed on an "AS IS" BASIS, <br> -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br> -* See the License for the specific language governing permissions and <br> -* limitations under the License. -* <p> -* Copyright (c) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br> -* University of Zurich, Switzerland. -* <p> -*/ - -package org.olat.core.gui.control.locks; - -import org.olat.core.gui.control.Disposable; - -/** - * Description:<br> - * Initial Date: 23.08.2005 <br> - * @author Felix - */ -public interface LockInfo extends Disposable { -//FIXME:fj:b implement - public boolean isAlreadyLocked(); - public String getLockFailedMessage(); - -} diff --git a/src/main/java/org/olat/core/gui/control/recorder/_content/manage.html b/src/main/java/org/olat/core/gui/control/recorder/_content/manage.html deleted file mode 100644 index 9b5f8b709f2..00000000000 --- a/src/main/java/org/olat/core/gui/control/recorder/_content/manage.html +++ /dev/null @@ -1,6 +0,0 @@ -#if($chooseFile) - $r.render("ffc") -#else - $r.render("mtc") -#end - diff --git a/src/main/java/org/olat/core/gui/control/recorder/_i18n/LocalStrings_pt_PT.properties b/src/main/java/org/olat/core/gui/control/recorder/_i18n/LocalStrings_pt_PT.properties deleted file mode 100644 index 9dbd958e556..00000000000 --- a/src/main/java/org/olat/core/gui/control/recorder/_i18n/LocalStrings_pt_PT.properties +++ /dev/null @@ -1,14 +0,0 @@ -#Mon Mar 02 09:54:04 CET 2009 -key.clear=Apagar -key.closeIt=Voltar ao gravador -key.delete=Apagar -key.load=Carregar -key.manage=Administrar macros -key.nextandmark=Executar e mostrar -key.record=Gravar -key.save=Salvar -key.start=Iniciar -key.startreplay=Rebobinar -key.status=Status -key.stop=Parar -title=T\u00EDtulo diff --git a/src/main/java/org/olat/core/gui/exception/ExceptionWindowController.java b/src/main/java/org/olat/core/gui/exception/ExceptionWindowController.java index 9aac117f1e4..4f0593af8e4 100644 --- a/src/main/java/org/olat/core/gui/exception/ExceptionWindowController.java +++ b/src/main/java/org/olat/core/gui/exception/ExceptionWindowController.java @@ -40,7 +40,6 @@ import org.olat.core.helpers.Settings; import org.olat.core.id.Identity; import org.olat.core.logging.KnownIssueException; import org.olat.core.logging.OLATRuntimeException; -import org.olat.core.logging.StaleObjectRuntimeException; import org.olat.core.logging.Tracing; import org.olat.core.util.Formatter; import org.olat.core.util.Util; @@ -110,11 +109,7 @@ public class ExceptionWindowController extends DefaultChiefController { } // fix detailed message if (detailedmessage == null) { - if (o3e instanceof StaleObjectRuntimeException) { - StaleObjectRuntimeException soe = (StaleObjectRuntimeException) o3e; - detailedmessage = trans.translate("error.staleobjectexception") + "<br />(" + soe.getKey() + " : " + soe.getPersClassName() + ")"; - } - else detailedmessage = "-"; + detailedmessage = "-"; } // fetch more info diff --git a/src/main/java/org/olat/core/logging/StaleObjectRuntimeException.java b/src/main/java/org/olat/core/logging/StaleObjectRuntimeException.java deleted file mode 100644 index 4a67199ed3e..00000000000 --- a/src/main/java/org/olat/core/logging/StaleObjectRuntimeException.java +++ /dev/null @@ -1,64 +0,0 @@ -/** -* OLAT - Online Learning and Training<br> -* http://www.olat.org -* <p> -* Licensed under the Apache License, Version 2.0 (the "License"); <br> -* you may not use this file except in compliance with the License.<br> -* You may obtain a copy of the License at -* <p> -* http://www.apache.org/licenses/LICENSE-2.0 -* <p> -* Unless required by applicable law or agreed to in writing,<br> -* software distributed under the License is distributed on an "AS IS" BASIS, <br> -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br> -* See the License for the specific language governing permissions and <br> -* limitations under the License. -* <p> -* Copyright (c) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br> -* University of Zurich, Switzerland. -* <p> -*/ - -package org.olat.core.logging; - -/** -* @author Felix Jost -*/ -public class StaleObjectRuntimeException extends DBRuntimeException { - - - private String key; - private String persClassName; - - /** - * @param logMsg - * @param persClassName - * @param key - */ - public StaleObjectRuntimeException(String logMsg, String key, String persClassName) { - super(logMsg); - this.key = key; - this.persClassName = persClassName; - } - - /** - * @param logMsg - * @param cause - */ - public StaleObjectRuntimeException(String logMsg, Throwable cause) { - super(logMsg, cause); - } - - /** - * @return Returns the key. - */ - public String getKey() { - return key; - } - /** - * @return Returns the persClassName. - */ - public String getPersClassName() { - return persClassName; - } -} diff --git a/src/main/java/org/olat/dispatcher/DMZDispatcher.java b/src/main/java/org/olat/dispatcher/DMZDispatcher.java index 2b1c14cb41c..e9efc70a623 100644 --- a/src/main/java/org/olat/dispatcher/DMZDispatcher.java +++ b/src/main/java/org/olat/dispatcher/DMZDispatcher.java @@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.olat.basesecurity.AuthHelper; -import org.olat.commons.dispatcher.SessionDispatcher; import org.olat.core.dispatcher.Dispatcher; import org.olat.core.dispatcher.DispatcherAction; import org.olat.core.gui.UserRequest; @@ -305,7 +304,7 @@ public class DMZDispatcher implements Dispatcher { // do not dispatch (render only), since this is a new Window created as // a result of another window's click. } catch (Throwable t) { - Tracing.logError("An exception occured while handling the exception...",t, SessionDispatcher.class); + Tracing.logError("An exception occured while handling the exception...",t, DMZDispatcher.class); //XX:GUIInterna.setLoadPerformanceMode(null); } //XX:GUIInterna.setLoadPerformanceMode(null); diff --git a/src/main/java/org/olat/gui/control/OlatFooterController.java b/src/main/java/org/olat/gui/control/OlatFooterController.java index a0b8b94d973..7f87ae2a75c 100644 --- a/src/main/java/org/olat/gui/control/OlatFooterController.java +++ b/src/main/java/org/olat/gui/control/OlatFooterController.java @@ -108,11 +108,6 @@ public class OlatFooterController extends BasicController implements GenericEven putInitialPanel(olatFootervc); } - /** - * @see org.olat.core.gui.control.DefaultSpringController#event(org.olat.core.gui.UserRequest, - * org.olat.core.gui.components.Component, - * org.olat.core.gui.control.Event) - */ public void event(UserRequest ureq, Component source, Event event) { if (source == showOtherUsers) { diff --git a/src/main/java/org/olat/gui/control/OlatGuestFooterController.java b/src/main/java/org/olat/gui/control/OlatGuestFooterController.java index 5c0c102df4f..f98330a7c6f 100644 --- a/src/main/java/org/olat/gui/control/OlatGuestFooterController.java +++ b/src/main/java/org/olat/gui/control/OlatGuestFooterController.java @@ -93,11 +93,6 @@ public class OlatGuestFooterController extends BasicController { putInitialPanel(olatFootervc); } - /** - * @see org.olat.core.gui.control.DefaultSpringController#event(org.olat.core.gui.UserRequest, - * org.olat.core.gui.components.Component, - * org.olat.core.gui.control.Event) - */ public void event(UserRequest ureq, Component source, Event event) { if (source == showOtherUsers) { // show list of other online users that are connected to jabber server -- GitLab