OO-4186: Consistent method names

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

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

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

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;
 	}
 

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;
 	}
 	

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

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())));
 			}

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;
 	}
 

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;
 	}
 

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;
 	}
 

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;
 	}
 

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 {