Skip to content

Commit 02b3c2e

Browse files
committed
[java] [student_grades] Extract method without arguments
1 parent c09ff6a commit 02b3c2e

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

examples/java/java-student_grades-02_extract_method/src/main/java/tv/codely/student_grades/StudentGradeCalculator.java

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,7 @@ public StudentGradeCalculator(final int yearToCalculate) {
3131

3232
public float calculateGrades(final List<Pair<Integer, Float>> examsGrades, final boolean hasReachedMinimumClasses) {
3333
if (!examsGrades.isEmpty()) {
34-
boolean hasToIncreaseOneExtraPoint = false;
35-
36-
for (Map.Entry<Integer, List<Pair<String, Boolean>>> yearlyTeachers : allYearsTeachers.entrySet()) {
37-
if (!(yearToCalculate != yearlyTeachers.getKey())) {
38-
List<Pair<String, Boolean>> teachers = yearlyTeachers.getValue();
39-
40-
for (Pair<String, Boolean> teacher : teachers) {
41-
if (teacher.second() != true) {
42-
continue;
43-
}
44-
hasToIncreaseOneExtraPoint = true;
45-
}
46-
} else {
47-
continue;
48-
}
49-
}
34+
boolean hasToIncreaseOneExtraPoint = hasToIncreaseOneExtraPoint();
5035

5136
float gradesSum = 0f;
5237
int gradesWeightSum = 0;
@@ -75,4 +60,24 @@ public float calculateGrades(final List<Pair<Integer, Float>> examsGrades, final
7560
return 0f;
7661
}
7762
}
63+
64+
private boolean hasToIncreaseOneExtraPoint() {
65+
boolean hasToIncreaseOneExtraPoint = false;
66+
67+
for (Map.Entry<Integer, List<Pair<String, Boolean>>> yearlyTeachers : allYearsTeachers.entrySet()) {
68+
if (!(yearToCalculate != yearlyTeachers.getKey())) {
69+
List<Pair<String, Boolean>> teachers = yearlyTeachers.getValue();
70+
71+
for (Pair<String, Boolean> teacher : teachers) {
72+
if (teacher.second() != true) {
73+
continue;
74+
}
75+
hasToIncreaseOneExtraPoint = true;
76+
}
77+
} else {
78+
continue;
79+
}
80+
}
81+
return hasToIncreaseOneExtraPoint;
82+
}
7883
}

0 commit comments

Comments
 (0)