From f9648cee6273dd4fc7b8d43acb940bf5384b4cbe Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Mon, 26 Aug 2019 09:04:16 +0200
Subject: [PATCH] OO-4186: Consistent method names
---
.../org/olat/course/assessment/CourseAssessmentService.java | 4 ++--
.../olat/course/assessment/handler/AssessmentConfig.java | 6 +++---
.../olat/course/assessment/handler/AssessmentHandler.java | 6 +++---
.../course/assessment/handler/ModuleAssessmentConfig.java | 4 ++--
.../olat/course/assessment/handler/NonAssessmentConfig.java | 4 ++--
.../assessment/manager/CourseAssessmentServiceImpl.java | 4 ++--
.../ui/tool/IdentityListCourseNodeController.java | 2 +-
.../org/olat/course/nodes/basiclti/LTIAssessmentConfig.java | 4 ++--
.../org/olat/course/nodes/iq/IQTESTAssessmentConfig.java | 4 ++--
.../org/olat/course/nodes/scorm/ScormAssessmentConfig.java | 4 ++--
.../java/org/olat/course/nodes/st/STAssessmentConfig.java | 4 ++--
.../java/org/olat/course/run/scoring/ScoreAccounting.java | 4 ++--
12 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/olat/course/assessment/CourseAssessmentService.java b/src/main/java/org/olat/course/assessment/CourseAssessmentService.java
index 377d6089cde..7752af750e8 100644
--- a/src/main/java/org/olat/course/assessment/CourseAssessmentService.java
+++ b/src/main/java/org/olat/course/assessment/CourseAssessmentService.java
@@ -56,7 +56,7 @@ public interface CourseAssessmentService {
/**
* Returns the persisted AssessmentEntry of the user. Check
- * AssessmentConfig.isScoreEvaluationPersisted() before invoking this method.
+ * AssessmentConfig.isEvaluationPersisted() before invoking this method.
*
* @param courseNode
* @param userCourseEnvironment
@@ -120,7 +120,7 @@ public interface CourseAssessmentService {
/**
* Returns the ScoreCalculator if the course nod can calculate its score. Check
- * AssessmentConfig.isScoreEvaluationCalculated() before invoking this method.
+ * AssessmentConfig.isEvaluationCalculated() before invoking this method.
*
* @param courseNode
* @return
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 7e35c0b4da1..35492325763 100644
--- a/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java
+++ b/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java
@@ -35,14 +35,14 @@ public interface AssessmentConfig {
public boolean isAssessable();
/**
- * @return true if the score evaluation is persisted
+ * @return true if the assessment evaluation is persisted
*/
- public boolean isScoreEvaluationPersisted();
+ public boolean isEvaluationPersisted();
/**
* @return true if the score evaluation is calculated e.g as sum of other assessments.
*/
- public boolean isScoreEvaluationCalculated();
+ public boolean isEvaluationCalculated();
/**
* @return True if this course node produces a score variable for the learner
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 ee63f7eaf45..056ba8e38d6 100644
--- a/src/main/java/org/olat/course/assessment/handler/AssessmentHandler.java
+++ b/src/main/java/org/olat/course/assessment/handler/AssessmentHandler.java
@@ -51,7 +51,7 @@ public interface AssessmentHandler {
public AssessmentConfig getAssessmentConfig(CourseNode courseNode);
/**
- * This method has to be implemented if the AssessmentConfig.isScoreEvaluationPersisted() return true.
+ * This method has to be implemented if the AssessmentConfig.isEvaluationPersisted() return true.
*
* @param courseNode
* @param userCourseEnvironment
@@ -60,7 +60,7 @@ public interface AssessmentHandler {
public AssessmentEntry getAssessmentEntry(CourseNode courseNode, UserCourseEnvironment userCourseEnvironment);
/**
- * This method has to be implemented if the AssessmentConfig.isScoreEvaluationCalculated() return true.
+ * This method has to be implemented if the AssessmentConfig.isEvaluationCalculated() return true.
*
* @param courseNode
* @param userCourseEnvironment
@@ -69,7 +69,7 @@ public interface AssessmentHandler {
public AssessmentEvaluation getCalculatedScoreEvaluation(CourseNode courseNode, UserCourseEnvironment userCourseEnvironment);
/**
- * This method has to be implemented if the AssessmentConfig.isScoreEvaluationCalculated() return true.
+ * This method has to be implemented if the AssessmentConfig.isEvaluationCalculated() return true.
*
* @param courseNode
* @param userCourseEnvironment
diff --git a/src/main/java/org/olat/course/assessment/handler/ModuleAssessmentConfig.java b/src/main/java/org/olat/course/assessment/handler/ModuleAssessmentConfig.java
index c7ee34a9a67..ce59e6d54ca 100644
--- a/src/main/java/org/olat/course/assessment/handler/ModuleAssessmentConfig.java
+++ b/src/main/java/org/olat/course/assessment/handler/ModuleAssessmentConfig.java
@@ -43,12 +43,12 @@ public abstract class ModuleAssessmentConfig implements AssessmentConfig {
}
@Override
- public boolean isScoreEvaluationPersisted() {
+ public boolean isEvaluationPersisted() {
return true;
}
@Override
- public boolean isScoreEvaluationCalculated() {
+ public boolean isEvaluationCalculated() {
return false;
}
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 3b44d38c0e3..be804e51788 100644
--- a/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java
+++ b/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java
@@ -39,12 +39,12 @@ public class NonAssessmentConfig implements AssessmentConfig {
}
@Override
- public boolean isScoreEvaluationPersisted() {
+ public boolean isEvaluationPersisted() {
return false;
}
@Override
- public boolean isScoreEvaluationCalculated() {
+ public boolean isEvaluationCalculated() {
return false;
}
diff --git a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentServiceImpl.java b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentServiceImpl.java
index deb20f7ed64..bcac004fa20 100644
--- a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentServiceImpl.java
+++ b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentServiceImpl.java
@@ -122,9 +122,9 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService {
AssessmentHandler assessmentHandler = getAssessmentHandler(courseNode);
AssessmentEvaluation assessmentEvaluation = AssessmentEvaluation.EMPTY_EVAL;
- if (assessmentConfig.isScoreEvaluationCalculated()) {
+ if (assessmentConfig.isEvaluationCalculated()) {
assessmentEvaluation = assessmentHandler.getCalculatedScoreEvaluation(courseNode, userCourseEnvironment);
- } else if (assessmentConfig.isScoreEvaluationPersisted()) {
+ } else if (assessmentConfig.isEvaluationPersisted()) {
assessmentEvaluation = getPersistedAssessmentEvaluation(courseNode, userCourseEnvironment);
}
// Other handlers should be able to have other implementations
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
index ec03574b731..f3588769248 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
@@ -358,7 +358,7 @@ public class IdentityListCourseNodeController extends FormBasicController
if(assessmentConfig.hasAttempts()) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.attempts));
}
- if(!assessmentConfig.isScoreEvaluationCalculated()) {
+ if(!assessmentConfig.isEvaluationCalculated()) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.userVisibility,
new UserVisibilityCellRenderer(getTranslator())));
}
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 30c2a555edf..eb45acc4ee2 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java
@@ -45,12 +45,12 @@ public class LTIAssessmentConfig implements AssessmentConfig {
}
@Override
- public boolean isScoreEvaluationPersisted() {
+ public boolean isEvaluationPersisted() {
return true;
}
@Override
- public boolean isScoreEvaluationCalculated() {
+ public boolean isEvaluationCalculated() {
return false;
}
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 9d7fd0a40f8..816a15f0061 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java
@@ -47,12 +47,12 @@ public class IQTESTAssessmentConfig implements AssessmentConfig {
}
@Override
- public boolean isScoreEvaluationPersisted() {
+ public boolean isEvaluationPersisted() {
return true;
}
@Override
- public boolean isScoreEvaluationCalculated() {
+ public boolean isEvaluationCalculated() {
return false;
}
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 652c8860812..a261f355449 100644
--- a/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java
@@ -42,12 +42,12 @@ public class ScormAssessmentConfig implements AssessmentConfig {
}
@Override
- public boolean isScoreEvaluationPersisted() {
+ public boolean isEvaluationPersisted() {
return true;
}
@Override
- public boolean isScoreEvaluationCalculated() {
+ public boolean isEvaluationCalculated() {
return false;
}
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 c78df5cdec7..6994eaa9429 100644
--- a/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java
@@ -44,12 +44,12 @@ public class STAssessmentConfig implements AssessmentConfig {
}
@Override
- public boolean isScoreEvaluationPersisted() {
+ public boolean isEvaluationPersisted() {
return true;
}
@Override
- public boolean isScoreEvaluationCalculated() {
+ public boolean isEvaluationCalculated() {
return true;
}
diff --git a/src/main/java/org/olat/course/run/scoring/ScoreAccounting.java b/src/main/java/org/olat/course/run/scoring/ScoreAccounting.java
index 1a6d481ee65..13032db95d8 100644
--- a/src/main/java/org/olat/course/run/scoring/ScoreAccounting.java
+++ b/src/main/java/org/olat/course/run/scoring/ScoreAccounting.java
@@ -153,14 +153,14 @@ public class ScoreAccounting {
AssessmentEvaluation se = null;
if (recursionLevel <= 15) {
AssessmentConfig assessmentConfig = courseAssessmentService.getAssessmentConfig(cn);
- if (update && assessmentConfig.isScoreEvaluationCalculated()) {
+ if (update && assessmentConfig.isEvaluationCalculated()) {
AssessmentEntry entry = identToEntries.get(cn.getIdent());
se = calculateScoreEvaluation(entry, cn, assessmentConfig);
cachedScoreEvals.put(cn, se);
} else {
se = cachedScoreEvals.get(cn);
if (se == null) { // result of this node has not been cached yet, do it
- if(assessmentConfig.isScoreEvaluationPersisted()) {
+ if(assessmentConfig.isEvaluationPersisted()) {
AssessmentEntry entry = identToEntries.get(cn.getIdent());
se = courseAssessmentService.toAssessmentEvaluation(entry, assessmentConfig);
} else {
--
GitLab