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

OO-635: remove the autoboxing of the Boolean object

parent 56db6a7a
No related branches found
No related tags found
No related merge requests found
......@@ -70,10 +70,10 @@ public class SPPeekviewController extends BasicController {
String fileLC = file.toLowerCase();
if (fileLC.endsWith(".html") || fileLC.endsWith(".htm") || fileLC.endsWith(".xhtml")) {
// Render normal view but scaled down to 75%
boolean allowRelativeLinks = config.getBooleanSafe(SPEditController.CONFIG_KEY_ALLOW_RELATIVE_LINKS);
SinglePageController spController = new SinglePageController(ureq, wControl,
userCourseEnv.getCourseEnvironment().getCourseFolderContainer(),
file, null,
config.getBooleanEntry(SPEditController.CONFIG_KEY_ALLOW_RELATIVE_LINKS), ores);
file, null, allowRelativeLinks, ores);
// but add scaling to fit preview into minimized space
spController.setScaleFactorAndHeight(0.75f, 400, true);
listenTo(spController);
......
......@@ -25,8 +25,6 @@
package org.olat.course.nodes.sp;
import java.util.Map;
import org.olat.core.commons.controllers.linkchooser.CustomLinkTreeModel;
import org.olat.core.commons.fullWebApp.LayoutMain3ColsController;
import org.olat.core.commons.fullWebApp.popup.BaseFullWebappPopupLayoutFactory;
......@@ -49,7 +47,6 @@ import org.olat.core.logging.AssertException;
import org.olat.core.util.resource.OresHelper;
import org.olat.core.util.vfs.VFSContainer;
import org.olat.course.CourseFactory;
import org.olat.course.CourseModule;
import org.olat.course.ICourse;
import org.olat.course.groupsandrights.CourseGroupManager;
import org.olat.course.groupsandrights.CourseRights;
......@@ -74,8 +71,6 @@ import org.olat.util.logging.activity.LoggingResourceable;
*/
public class SPRunController extends BasicController {
private static final String KEY_CURRENT_URI = "cururi";
private SPCourseNode courseNode;
private Panel main;
private SinglePageController spCtr;
......@@ -157,10 +152,10 @@ public class SPRunController extends BasicController {
}
private void doInlineIntegration(UserRequest ureq, boolean hasEditRightsTo) {
Boolean allowRelativeLinks = config.getBooleanEntry(SPEditController.CONFIG_KEY_ALLOW_RELATIVE_LINKS);
boolean allowRelativeLinks = config.getBooleanSafe(SPEditController.CONFIG_KEY_ALLOW_RELATIVE_LINKS);
// create the possibility to float
OLATResourceable ores = OresHelper.createOLATResourceableInstance(ICourse.class, userCourseEnv.getCourseEnvironment().getCourseResourceableId());
spCtr = new SinglePageController(ureq, getWindowControl(), courseFolderContainer, fileName, null, allowRelativeLinks.booleanValue(), ores);
spCtr = new SinglePageController(ureq, getWindowControl(), courseFolderContainer, fileName, null, allowRelativeLinks, ores);
spCtr.setAllowDownload(true);
// only for inline integration: register for controller event to forward a olatcmd to the course,
......
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