From c89c64d8f36667cece51c1fea8f362ef67784baa Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Fri, 31 Mar 2017 17:01:31 +0300 Subject: [PATCH] fix move lesson --- .../coursecreator/handlers/CCLessonMoveHandlerDelegate.java | 2 +- .../com/jetbrains/edu/learning/StudyProjectComponent.java | 2 +- .../src/com/jetbrains/edu/learning/courseFormat/Course.java | 4 ++-- .../jetbrains/edu/learning/navigation/StudyNavigator.java | 6 +----- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/python/educational-core/src/com/jetbrains/edu/coursecreator/handlers/CCLessonMoveHandlerDelegate.java b/python/educational-core/src/com/jetbrains/edu/coursecreator/handlers/CCLessonMoveHandlerDelegate.java index 15da6057e0c7..3b163cd947ca 100644 --- a/python/educational-core/src/com/jetbrains/edu/coursecreator/handlers/CCLessonMoveHandlerDelegate.java +++ b/python/educational-core/src/com/jetbrains/edu/coursecreator/handlers/CCLessonMoveHandlerDelegate.java @@ -109,7 +109,7 @@ public class CCLessonMoveHandlerDelegate extends MoveHandlerDelegate { newItemIndex - 1, EduNames.LESSON, 1); sourceLesson.setIndex(newItemIndex); - Collections.sort(course.getLessons(), EduUtils.INDEX_COMPARATOR); + Collections.sort(course.getLessons(true), EduUtils.INDEX_COMPARATOR); ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { diff --git a/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java index 6a18fc88aff1..e2e84ae3ea67 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java @@ -162,7 +162,7 @@ public class StudyProjectComponent implements ProjectComponent { final ArrayList updatedLessons = new ArrayList<>(); int lessonIndex = 0; - for (Lesson lesson : course.getLessons()) { + for (Lesson lesson : course.getLessons(true)) { lessonIndex += 1; Lesson studentLesson = currentCourse.getLesson(lesson.getId()); final String lessonDirName = EduNames.LESSON + String.valueOf(lessonIndex); diff --git a/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java index 26466145a7c4..0cdd56b523c4 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java @@ -48,8 +48,8 @@ public class Course { return getLessons(false); } - public List getLessons(boolean withAadditional) { - return withAadditional ? lessons + public List getLessons(boolean withAdditional) { + return withAdditional ? lessons : lessons.stream().filter(lesson -> !EduNames.PYCHARM_ADDITIONAL.equals(lesson.getName())).collect(Collectors.toList()); } diff --git a/python/educational-core/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java b/python/educational-core/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java index 2da4ed9f1394..91b8a0c7aaf8 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java @@ -64,11 +64,7 @@ public class StudyNavigator { if (nextLessonIndex >= lessons.size()) { return null; } - final Lesson nextLesson = lessons.get(nextLessonIndex); - if (EduNames.PYCHARM_ADDITIONAL.equals(nextLesson.getName())) { - return null; - } - return nextLesson; + return lessons.get(nextLessonIndex); } public static Lesson previousLesson(@NotNull final Lesson lesson) {