Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
b4f1ed89
Commit
b4f1ed89
authored
11 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
OO-635: remove the autoboxing of the Boolean object
parent
56db6a7a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/olat/course/nodes/sp/SPPeekviewController.java
+2
-2
2 additions, 2 deletions
...n/java/org/olat/course/nodes/sp/SPPeekviewController.java
src/main/java/org/olat/course/nodes/sp/SPRunController.java
+2
-7
2 additions, 7 deletions
src/main/java/org/olat/course/nodes/sp/SPRunController.java
with
4 additions
and
9 deletions
src/main/java/org/olat/course/nodes/sp/SPPeekviewController.java
+
2
−
2
View file @
b4f1ed89
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/org/olat/course/nodes/sp/SPRunController.java
+
2
−
7
View file @
b4f1ed89
...
...
@@ -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
)
{
B
oolean
allowRelativeLinks
=
config
.
getBoolean
Entry
(
SPEditController
.
CONFIG_KEY_ALLOW_RELATIVE_LINKS
);
b
oolean
allowRelativeLinks
=
config
.
getBoolean
Safe
(
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,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment