From 12c9dbe9599f5cdddc64bf61b2d6e29f882ab3da Mon Sep 17 00:00:00 2001 From: Valentina Kiryushkina Date: Wed, 15 Jun 2016 21:17:37 +0300 Subject: [PATCH] Fix according to review IDEA-CR-11509 --- .../jetbrains/edu/learning/StudyUtils.java | 2 +- .../StudyProjectGenerator.java | 4 ++-- .../edu/learning/stepic/CourseInfo.java | 22 ------------------- .../stepic/EduAdaptiveStepicConnector.java | 1 + .../edu/learning/stepic/LoginDialog.java | 1 - .../edu/learning/stepic/StepicUser.java | 8 +++---- .../edu/learning/ui/StudyNewProjectPanel.java | 3 +-- .../ui/StudyTestResultsToolWindowFactory.kt | 3 ++- 8 files changed, 11 insertions(+), 33 deletions(-) diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java index 175007d52afc..ea45745a363b 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java @@ -629,7 +629,7 @@ public class StudyUtils { return null; } - // supposd to be called under progress + // supposed to be called under progress @Nullable public static T execCancelable(@NotNull final Callable callable) { final Future future = ApplicationManager.getApplication().executeOnPooledThread(callable); diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java index 2200c7b791cb..1062a90897f4 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java @@ -334,7 +334,7 @@ public class StudyProjectGenerator { } // Supposed to be called under progress - public List getCoursesAsynchronouslyIfNeeded(boolean force) { + public List getCourses(boolean force) { if (OUR_COURSES_DIR.exists()) { myCourses = getCoursesFromCache(); } @@ -355,7 +355,7 @@ public class StudyProjectGenerator { @Override public List compute() throws RuntimeException { ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true); - return getCoursesAsynchronouslyIfNeeded(force); + return getCourses(force); } }, progressTitle, true, project); } diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/CourseInfo.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/CourseInfo.java index c8c0c90aaf04..b56d7a66485c 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/CourseInfo.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/CourseInfo.java @@ -1,7 +1,6 @@ package com.jetbrains.edu.learning.stepic; import com.google.gson.annotations.SerializedName; -import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -75,27 +74,6 @@ public class CourseInfo { this.username = username; } - public static class Author { - int id; - String first_name = ""; - String last_name = ""; - - public Author() {} - - public Author(String firstName, String lastName) { - first_name = firstName; - last_name = lastName; - } - - public String getName() { - return StringUtil.join(new String[]{first_name, last_name}, " "); - } - - public int getId() { - return id; - } - } - public void setName(String name) { myName = name; } diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java index 3da3bfc16b78..7301a5491c0b 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java @@ -195,6 +195,7 @@ public class EduAdaptiveStepicConnector { unsolvedTask.setStepicId(task.getStepicId()); unsolvedTask.setText(task.getText()); unsolvedTask.getTestsText().clear(); + unsolvedTask.setStatus(StudyStatus.Unchecked); final Map testsText = task.getTestsText(); for (String testName : testsText.keySet()) { unsolvedTask.addTestsTexts(testName, testsText.get(testName)); diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java index 09a132765873..c4805500fe09 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java @@ -14,7 +14,6 @@ public class LoginDialog extends DialogWrapper { myLoginPanel = new LoginPanel(this); setTitle("Login to Stepic"); setOKButtonText("Login"); - setTitle("Login to Stepic"); init(); } diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUser.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUser.java index ff40e3428d37..9c9f468debc5 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUser.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUser.java @@ -11,7 +11,7 @@ public class StepicUser { private static final Logger LOG = Logger.getInstance(StepicUser.class); int id; String firstName; - String last_name; + String lastName; String email; public StepicUser() { @@ -39,11 +39,11 @@ public class StepicUser { } public String getLastName() { - return last_name; + return lastName; } public void setLastName(String last_name) { - this.last_name = last_name; + this.lastName = last_name; } public String getEmail() { @@ -80,6 +80,6 @@ public class StepicUser { } public String getName() { - return StringUtil.join(new String[]{firstName, last_name}, " "); + return StringUtil.join(new String[]{firstName, lastName}, " "); } } diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java index 8f4475372b85..18633c8a7b57 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java @@ -20,7 +20,6 @@ import com.intellij.openapi.ui.popup.util.BaseListPopupStep; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.AncestorListenerAdapter; -import com.intellij.util.Consumer; import com.jetbrains.edu.learning.StudyUtils; import com.jetbrains.edu.learning.courseFormat.Course; import com.jetbrains.edu.learning.courseGeneration.StudyProjectGenerator; @@ -313,7 +312,7 @@ public class StudyNewProjectPanel { myGenerator.myUser = stepicUser; - final List courses = myGenerator.getCoursesAsynchronouslyIfNeeded(true); + final List courses = myGenerator.getCourses(true); if (courses != null) { ApplicationManager.getApplication().invokeLater(() -> refreshCoursesList(courses)); } diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyTestResultsToolWindowFactory.kt b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyTestResultsToolWindowFactory.kt index 652d758ebfc6..549d4dd288a9 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyTestResultsToolWindowFactory.kt +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyTestResultsToolWindowFactory.kt @@ -6,11 +6,12 @@ import com.intellij.openapi.fileEditor.FileEditorManagerListener import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.wm.ToolWindow +import com.intellij.openapi.wm.ToolWindowFactory import com.jetbrains.edu.learning.StudyUtils import com.jetbrains.python.console.PythonConsoleView -class StudyTestResultsToolWindowFactory: StudyToolWindowFactory() { +class StudyTestResultsToolWindowFactory: ToolWindowFactory { override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) { val currentTask = StudyUtils.getCurrentTask(project) if (currentTask != null) {