From edbae1045723699e22dc671b9a50dc445a79e942 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 9 Feb 2016 09:57:20 +0100
Subject: [PATCH] OO-1889: remove the assert exception
---
.../java/org/olat/core/gui/components/panel/ListPanel.java | 7 +++++--
.../java/org/olat/core/gui/components/panel/OncePanel.java | 6 ++++--
.../olat/core/gui/components/panel/SimpleStackedPanel.java | 6 +++++-
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/components/panel/ListPanel.java b/src/main/java/org/olat/core/gui/components/panel/ListPanel.java
index 0715e28fa98..74f9300019c 100644
--- a/src/main/java/org/olat/core/gui/components/panel/ListPanel.java
+++ b/src/main/java/org/olat/core/gui/components/panel/ListPanel.java
@@ -27,7 +27,8 @@ import org.olat.core.gui.components.AbstractComponent;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.ComponentCollection;
import org.olat.core.gui.components.ComponentRenderer;
-import org.olat.core.logging.AssertException;
+import org.olat.core.logging.OLog;
+import org.olat.core.logging.Tracing;
/**
*
@@ -37,6 +38,8 @@ import org.olat.core.logging.AssertException;
*/
public class ListPanel extends AbstractComponent implements ComponentCollection {
+ private static final OLog log = Tracing.createLoggerFor(ListPanel.class);
+
private static final ComponentRenderer RENDERER = new ListPanelRenderer();
private final List<Component> content = new ArrayList<>(3);
@@ -63,7 +66,7 @@ public class ListPanel extends AbstractComponent implements ComponentCollection
*/
@Override
protected void doDispatchRequest(UserRequest ureq) {
- throw new AssertException("a panel should never dispatch a request (unless it has droppables, which it has not), ureq = "+ureq);
+ log.error("a panel should never dispatch a request (unless it has droppables, which it has not), ureq = "+ureq);
}
public String getCssClass() {
diff --git a/src/main/java/org/olat/core/gui/components/panel/OncePanel.java b/src/main/java/org/olat/core/gui/components/panel/OncePanel.java
index 9ab426cd03a..657c2043dfb 100644
--- a/src/main/java/org/olat/core/gui/components/panel/OncePanel.java
+++ b/src/main/java/org/olat/core/gui/components/panel/OncePanel.java
@@ -33,7 +33,8 @@ import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.ComponentCollection;
import org.olat.core.gui.components.ComponentRenderer;
import org.olat.core.gui.render.ValidationResult;
-import org.olat.core.logging.AssertException;
+import org.olat.core.logging.OLog;
+import org.olat.core.logging.Tracing;
/**
* Description:<br>
@@ -45,6 +46,7 @@ import org.olat.core.logging.AssertException;
* @author Felix Jost, http://www.goodsolutions.ch
*/
public class OncePanel extends AbstractComponent implements ComponentCollection {
+ private static final OLog log = Tracing.createLoggerFor(OncePanel.class);
private static final ComponentRenderer RENDERER = new PanelRenderer();
private boolean hideOnNextValidate;
@@ -92,7 +94,7 @@ public class OncePanel extends AbstractComponent implements ComponentCollection
@Override
protected void doDispatchRequest(UserRequest ureq) {
- throw new AssertException("a panel should never dispatch a request (unless it has droppables, which it has not), ureq = "+ureq);
+ log.error("a panel should never dispatch a request (unless it has droppables, which it has not), ureq = "+ureq);
}
@Override
diff --git a/src/main/java/org/olat/core/gui/components/panel/SimpleStackedPanel.java b/src/main/java/org/olat/core/gui/components/panel/SimpleStackedPanel.java
index 9a8f48e67a6..4ec98480557 100644
--- a/src/main/java/org/olat/core/gui/components/panel/SimpleStackedPanel.java
+++ b/src/main/java/org/olat/core/gui/components/panel/SimpleStackedPanel.java
@@ -35,6 +35,8 @@ import org.olat.core.gui.components.AbstractComponent;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.ComponentRenderer;
import org.olat.core.logging.AssertException;
+import org.olat.core.logging.OLog;
+import org.olat.core.logging.Tracing;
/**
* Description: <br>
@@ -44,6 +46,7 @@ import org.olat.core.logging.AssertException;
* @author Felix Jost
*/
public class SimpleStackedPanel extends AbstractComponent implements StackedPanel {
+ private static final OLog log = Tracing.createLoggerFor(SimpleStackedPanel.class);
private static final ComponentRenderer RENDERER = new PanelRenderer();
private Component curContent;
@@ -62,8 +65,9 @@ public class SimpleStackedPanel extends AbstractComponent implements StackedPane
* delegate
* @param ureq
*/
+ @Override
protected void doDispatchRequest(UserRequest ureq) {
- throw new AssertException("a panel should never dispatch a request (unless it has droppables, which it has not), ureq = "+ureq);
+ log.error("a panel should never dispatch a request (unless it has droppables, which it has not), ureq = "+ureq);
}
/**
--
GitLab