From b4f1ed89b52afa780884ad6dd0d95f2c988ff750 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 25 Jun 2013 10:18:12 +0200
Subject: [PATCH] OO-635: remove the autoboxing of the Boolean object
---
.../org/olat/course/nodes/sp/SPPeekviewController.java | 4 ++--
.../java/org/olat/course/nodes/sp/SPRunController.java | 9 ++-------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/sp/SPPeekviewController.java b/src/main/java/org/olat/course/nodes/sp/SPPeekviewController.java
index 80880d46ab4..e621316a1a2 100644
--- a/src/main/java/org/olat/course/nodes/sp/SPPeekviewController.java
+++ b/src/main/java/org/olat/course/nodes/sp/SPPeekviewController.java
@@ -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);
diff --git a/src/main/java/org/olat/course/nodes/sp/SPRunController.java b/src/main/java/org/olat/course/nodes/sp/SPRunController.java
index 2beb5d45e5b..d93a9e054fa 100644
--- a/src/main/java/org/olat/course/nodes/sp/SPRunController.java
+++ b/src/main/java/org/olat/course/nodes/sp/SPRunController.java
@@ -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,
--
GitLab