From e8515fa4f87c22689d1e52ad05dcddfbc116c3af Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Mon, 26 Jan 2015 19:16:58 +0300 Subject: [PATCH] Store language as a String in the course Language can't be serialized because of there is no default constructor --- .../src/com/jetbrains/edu/learning/course/Course.java | 6 +++--- .../jetbrains/edu/learning/stepic/StudyStepicConnector.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/course/Course.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/course/Course.java index 326dfc12a0c0..4dd9091837b2 100644 --- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/course/Course.java +++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/course/Course.java @@ -24,7 +24,7 @@ public class Course { private String myCourseDirectory = ""; private String author=""; private boolean myUpToDate; - private Language myLanguage; + private String myLanguage; public List getLessons() { @@ -114,10 +114,10 @@ public class Course { } public Language getLanguage() { - return myLanguage; + return Language.findLanguageByID(myLanguage); } - public void setLanguage(Language language) { + public void setLanguage(@NotNull final String language) { myLanguage = language; } 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 93a8b2eea171..a6f07eea37ae 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 @@ -3,7 +3,6 @@ package com.jetbrains.edu.learning.stepic; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.intellij.lang.Language; import com.intellij.openapi.diagnostic.Logger; import com.intellij.util.io.HttpRequests; import com.jetbrains.edu.learning.course.*; @@ -49,7 +48,7 @@ public class StudyStepicConnector { course.setDescription(info.getDescription()); course.setName(info.getName()); course.lessons = new ArrayList(); - course.setLanguage(Language.findLanguageByID("Python")); // TODO: get from stepic + course.setLanguage("Python"); // TODO: get from stepic if (info.equals(ourTestCourseInfo)) { // TODO: to be removed try {