Skip to content
Snippets Groups Projects
Commit 35afaba2 authored by srosse's avatar srosse
Browse files

Merge branch 'basiccontroller_cleanup' of git://github.com/tomgross/OpenOLAT...

Merge branch 'basiccontroller_cleanup' of git://github.com/tomgross/OpenOLAT into tomgross-basiccontroller_cleanup
parents 29a98fd2 ac954740
No related branches found
No related tags found
No related merge requests found
...@@ -84,15 +84,7 @@ public abstract class BasicController extends DefaultController { ...@@ -84,15 +84,7 @@ public abstract class BasicController extends DefaultController {
* @param wControl * @param wControl
*/ */
protected BasicController(UserRequest ureq, WindowControl wControl) { protected BasicController(UserRequest ureq, WindowControl wControl) {
super(wControl); this(ureq, wControl, null);
setLocale(ureq.getLocale());
identity = ureq.getIdentity();
Class<?> cl = this.getClass();
translator = Util.createPackageTranslator(cl, getLocale());
fallbackTranslator = null;
velocity_root = Util.getPackageVelocityRoot(cl);
logger = Tracing.createLoggerFor(cl);
} }
/** /**
...@@ -112,9 +104,6 @@ public abstract class BasicController extends DefaultController { ...@@ -112,9 +104,6 @@ public abstract class BasicController extends DefaultController {
super(wControl); super(wControl);
setLocale(ureq.getLocale()); setLocale(ureq.getLocale());
identity = ureq.getIdentity(); identity = ureq.getIdentity();
if (fallBackTranslator == null) {
throw new AssertException("please provide a fall translator if using this constructor!!");
}
Class<?> cl = this.getClass(); Class<?> cl = this.getClass();
fallbackTranslator = fallBackTranslator; fallbackTranslator = fallBackTranslator;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment