From 57bf918198fb1c15535c4f3062814faa3f966023 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Tue, 20 Aug 2019 16:12:18 +0200
Subject: [PATCH] OO-4186: More consistent method name
---
.../java/org/olat/course/assessment/AssessmentHelper.java | 6 +++---
.../olat/course/assessment/handler/AssessmentConfig.java | 4 ++--
.../olat/course/assessment/handler/AssessmentHandler.java | 2 +-
.../olat/course/assessment/handler/NonAssessmentConfig.java | 2 +-
.../ui/tool/AssessmentIdentityCourseNodeController.java | 2 +-
.../org/olat/course/nodes/basiclti/LTIAssessmentConfig.java | 2 +-
.../org/olat/course/nodes/cl/CheckListAssessmentConfig.java | 2 +-
.../java/org/olat/course/nodes/gta/GTAAssessmentConfig.java | 2 +-
.../org/olat/course/nodes/iq/IQTESTAssessmentConfig.java | 2 +-
.../java/org/olat/course/nodes/ms/MSAssessmentConfig.java | 2 +-
.../course/nodes/portfolio/PortfolioAssessmentConfig.java | 2 +-
.../nodes/projectbroker/ProjectBrokerAssessmentConfig.java | 2 +-
.../org/olat/course/nodes/scorm/ScormAssessmentConfig.java | 2 +-
.../java/org/olat/course/nodes/st/STAssessmentConfig.java | 2 +-
.../java/org/olat/course/nodes/ta/TAAssessmentConfig.java | 2 +-
15 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/olat/course/assessment/AssessmentHelper.java b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
index acb6afdf71b..52d18610773 100644
--- a/src/main/java/org/olat/course/assessment/AssessmentHelper.java
+++ b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
@@ -163,7 +163,7 @@ public class AssessmentHelper {
if (assessmentConfig.hasAttempts()) {
attempts = courseAssessmentService.getUserAttempts(courseNode, uce);
}
- if (assessmentConfig.hasDetails()) {
+ if (assessmentConfig.hasEditableDetails()) {
details = courseNode.getDetailsListView(uce);
if (details == null) {
details = DETAILS_NA_VALUE;
@@ -402,7 +402,7 @@ public class AssessmentHelper {
if (courseNode instanceof AssessableCourseNode && !(courseNode instanceof ProjectBrokerCourseNode)) {
CourseAssessmentService courseAssessmentService = CoreSpringFactory.getImpl(CourseAssessmentService.class);
AssessmentConfig assessmentConfig = courseAssessmentService.getAssessmentConfig(courseNode);
- if (assessmentConfig.hasDetails()
+ if (assessmentConfig.hasEditableDetails()
|| assessmentConfig.hasAttempts()
|| assessmentConfig.hasScore()
|| assessmentConfig.hasPassed()
@@ -515,7 +515,7 @@ public class AssessmentHelper {
if(!followUserVisibility || scoreEvaluation.getUserVisible() == null || scoreEvaluation.getUserVisible().booleanValue()) {
// details
- if (assessmentConfig.hasDetails()) {
+ if (assessmentConfig.hasEditableDetails()) {
hasDisplayableValuesConfigured = true;
String detailValue = assessableCourseNode.getDetailsListView(userCourseEnv);
if (detailValue == null) {
diff --git a/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java b/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java
index dc8f03064db..894df8be1fe 100644
--- a/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java
+++ b/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java
@@ -90,8 +90,8 @@ public interface AssessmentConfig {
public boolean isEditable();
/**
- * @return True if this course node has additional details to be edited / viewed
+ * @return True if this course node has additional details to be edited.
*/
- public boolean hasDetails();
+ public boolean hasEditableDetails();
}
diff --git a/src/main/java/org/olat/course/assessment/handler/AssessmentHandler.java b/src/main/java/org/olat/course/assessment/handler/AssessmentHandler.java
index 7154e2112e4..4ec83295252 100644
--- a/src/main/java/org/olat/course/assessment/handler/AssessmentHandler.java
+++ b/src/main/java/org/olat/course/assessment/handler/AssessmentHandler.java
@@ -40,7 +40,7 @@ public interface AssessmentHandler {
/**
* Returns a controller to edit the node specific details. Check
- * AssessmentConfig.hasDeatils() before invoking this method.
+ * AssessmentConfig.hasEditableDetails() before invoking this method.
*
* @param ureq
* @param wControl
diff --git a/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java b/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java
index e1053abdaee..ad107fb937f 100644
--- a/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java
+++ b/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java
@@ -98,7 +98,7 @@ public class NonAssessmentConfig implements AssessmentConfig {
}
@Override
- public boolean hasDetails() {
+ public boolean hasEditableDetails() {
return false;
}
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseNodeController.java b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseNodeController.java
index 544a548febe..09335e2c722 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseNodeController.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseNodeController.java
@@ -127,7 +127,7 @@ public class AssessmentIdentityCourseNodeController extends BasicController impl
// Add the users details controller
AssessmentConfig assessmentConfig = courseAssessmentService.getAssessmentConfig(courseNode);
- if (assessmentConfig.hasDetails() && courseNodeDetails) {
+ if (assessmentConfig.hasEditableDetails() && courseNodeDetails) {
detailsEditController = courseAssessmentService.getAssessmentHandler(aCourseNode)
.getDetailsEditController(ureq, wControl, stackPanel, courseNode, coachCourseEnv,
assessedUserCourseEnvironment);
diff --git a/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java b/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java
index 99a54cd54fc..36c64178514 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java
@@ -116,7 +116,7 @@ public class LTIAssessmentConfig implements AssessmentConfig {
}
@Override
- public boolean hasDetails() {
+ public boolean hasEditableDetails() {
// having score defined means the node is assessable
return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_SCORE_FIELD);
}
diff --git a/src/main/java/org/olat/course/nodes/cl/CheckListAssessmentConfig.java b/src/main/java/org/olat/course/nodes/cl/CheckListAssessmentConfig.java
index 8adfaa4f571..608d16a0133 100644
--- a/src/main/java/org/olat/course/nodes/cl/CheckListAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/cl/CheckListAssessmentConfig.java
@@ -50,7 +50,7 @@ public class CheckListAssessmentConfig extends ModuleAssessmentConfig {
}
@Override
- public boolean hasDetails() {
+ public boolean hasEditableDetails() {
return true;
}
diff --git a/src/main/java/org/olat/course/nodes/gta/GTAAssessmentConfig.java b/src/main/java/org/olat/course/nodes/gta/GTAAssessmentConfig.java
index 54cc5a2d550..832ed0070a6 100644
--- a/src/main/java/org/olat/course/nodes/gta/GTAAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/gta/GTAAssessmentConfig.java
@@ -87,7 +87,7 @@ public class GTAAssessmentConfig extends ModuleAssessmentConfig {
}
@Override
- public boolean hasDetails() {
+ public boolean hasEditableDetails() {
return config.getBooleanSafe(GTACourseNode.GTASK_ASSIGNMENT)
|| config.getBooleanSafe(GTACourseNode.GTASK_SUBMIT)
|| config.getBooleanSafe(GTACourseNode.GTASK_REVIEW_AND_CORRECTION)
diff --git a/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java b/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java
index 257c4c5cb3d..519d94d903f 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java
@@ -168,7 +168,7 @@ public class IQTESTAssessmentConfig implements AssessmentConfig {
}
@Override
- public boolean hasDetails() {
+ public boolean hasEditableDetails() {
return true;
}
diff --git a/src/main/java/org/olat/course/nodes/ms/MSAssessmentConfig.java b/src/main/java/org/olat/course/nodes/ms/MSAssessmentConfig.java
index ec7691ec603..dc1f4675ba8 100644
--- a/src/main/java/org/olat/course/nodes/ms/MSAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/ms/MSAssessmentConfig.java
@@ -75,7 +75,7 @@ public class MSAssessmentConfig extends ModuleAssessmentConfig {
}
@Override
- public boolean hasDetails() {
+ public boolean hasEditableDetails() {
return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_EVAL_FORM_ENABLED);
}
diff --git a/src/main/java/org/olat/course/nodes/portfolio/PortfolioAssessmentConfig.java b/src/main/java/org/olat/course/nodes/portfolio/PortfolioAssessmentConfig.java
index 3f770147f9e..38d3660583a 100644
--- a/src/main/java/org/olat/course/nodes/portfolio/PortfolioAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/portfolio/PortfolioAssessmentConfig.java
@@ -50,7 +50,7 @@ public class PortfolioAssessmentConfig extends ModuleAssessmentConfig {
}
@Override
- public boolean hasDetails() {
+ public boolean hasEditableDetails() {
return true;
}
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerAssessmentConfig.java b/src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerAssessmentConfig.java
index 8b209c69709..e6a80de70ee 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerAssessmentConfig.java
@@ -71,7 +71,7 @@ public class ProjectBrokerAssessmentConfig extends ModuleAssessmentConfig {
}
@Override
- public boolean hasDetails() {
+ public boolean hasEditableDetails() {
return config.getBooleanSafe(ProjectBrokerCourseNode.CONF_DROPBOX_ENABLED);
}
diff --git a/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java b/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java
index cf5d3631a8a..2b175e998d5 100644
--- a/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java
@@ -106,7 +106,7 @@ public class ScormAssessmentConfig implements AssessmentConfig {
}
@Override
- public boolean hasDetails() {
+ public boolean hasEditableDetails() {
return config.getBooleanSafe(ScormEditController.CONFIG_ISASSESSABLE, true);
}
diff --git a/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java b/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java
index 9613b82a2f7..7bc980423e1 100644
--- a/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java
@@ -106,7 +106,7 @@ public class STAssessmentConfig implements AssessmentConfig {
}
@Override
- public boolean hasDetails() {
+ public boolean hasEditableDetails() {
return false;
}
}
diff --git a/src/main/java/org/olat/course/nodes/ta/TAAssessmentConfig.java b/src/main/java/org/olat/course/nodes/ta/TAAssessmentConfig.java
index bc732f74a05..ef6fd967689 100644
--- a/src/main/java/org/olat/course/nodes/ta/TAAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/ta/TAAssessmentConfig.java
@@ -80,7 +80,7 @@ public class TAAssessmentConfig extends ModuleAssessmentConfig {
}
@Override
- public boolean hasDetails() {
+ public boolean hasEditableDetails() {
return config.getBooleanSafe(TACourseNode.CONF_TASK_ENABLED)
|| config.getBooleanSafe(TACourseNode.CONF_DROPBOX_ENABLED)
|| config.getBooleanSafe(TACourseNode.CONF_RETURNBOX_ENABLED);
--
GitLab