From 6664e357887b4d397ee4f751df0b782b5a1e1d79 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Mon, 16 Feb 2015 15:02:59 +0300 Subject: [PATCH] public field (xml serialization) --- .../edu/learning/courseGeneration/StudyGenerator.java | 2 +- .../edu/learning/courseGeneration/StudyProjectGenerator.java | 2 +- .../jetbrains/edu/learning/stepic/StudyStepicConnector.java | 3 +-- .../educational/src/com/jetbrains/edu/courseFormat/Course.java | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java index e412aa9a59ad..0f15a475346e 100644 --- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java +++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java @@ -128,7 +128,7 @@ public class StudyGenerator { * Initializes state of course */ public static void initCourse(@NotNull final Course course, boolean isRestarted) { - for (Lesson lesson : course.lessons) { + for (Lesson lesson : course.getLessons()) { initLesson(lesson, course, isRestarted); } } diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java index 418daca5cd6b..8fded5aca6e6 100644 --- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java +++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java @@ -114,7 +114,7 @@ public class StudyProjectGenerator { flushCourseJson(course, courseDirectory); int lessonIndex = 1; - for (Lesson lesson : course.lessons) { + for (Lesson lesson : course.getLessons()) { final File lessonDirectory = new File(courseDirectory, EduNames.LESSON + String.valueOf(lessonIndex)); FileUtil.createDirectory(lessonDirectory); int taskIndex = 1; diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/stepic/StudyStepicConnector.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/stepic/StudyStepicConnector.java index 3dd7690ea348..7d209750af1c 100644 --- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/stepic/StudyStepicConnector.java +++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/stepic/StudyStepicConnector.java @@ -64,12 +64,11 @@ public class StudyStepicConnector { course.setAuthor(info.getAuthor()); course.setDescription(info.getDescription()); course.setName(info.getName()); - course.lessons = new ArrayList(); course.setLanguage("Python"); // TODO: get from stepic course.setUpToDate(true); // TODO: get from stepic try { for (Integer section : info.sections) { - course.lessons.addAll(getLessons(section)); + course.addLessons(getLessons(section)); } return course; } diff --git a/python/educational/src/com/jetbrains/edu/courseFormat/Course.java b/python/educational/src/com/jetbrains/edu/courseFormat/Course.java index d1b456dc01e6..5ad627f4bbd2 100644 --- a/python/educational/src/com/jetbrains/edu/courseFormat/Course.java +++ b/python/educational/src/com/jetbrains/edu/courseFormat/Course.java @@ -23,6 +23,9 @@ public class Course { public void setLessons(List lessons) { this.lessons = lessons; } + public void addLessons(List lessons) { + lessons.addAll(lessons); + } public void addLesson(@NotNull final Lesson lesson) { lessons.add(lesson);