mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Fix NPE in StudyCheckTask for study project with no user
This commit is contained in:
+4
-3
@@ -36,7 +36,7 @@ import java.util.Map;
|
||||
public class StudyTaskManager implements PersistentStateComponent<Element>, DumbAware {
|
||||
private static final Logger LOG = Logger.getInstance(StudyTaskManager.class);
|
||||
public static final int CURRENT_VERSION = 3;
|
||||
private StepicUser myUser;
|
||||
private StepicUser myUser = new StepicUser();
|
||||
private Course myCourse;
|
||||
public int VERSION = 3;
|
||||
|
||||
@@ -193,12 +193,13 @@ public class StudyTaskManager implements PersistentStateComponent<Element>, Dumb
|
||||
public void setTurnEditingMode(boolean turnEditingMode) {
|
||||
myTurnEditingMode = turnEditingMode;
|
||||
}
|
||||
|
||||
|
||||
@NotNull
|
||||
public StepicUser getUser() {
|
||||
return myUser;
|
||||
}
|
||||
|
||||
public void setUser(StepicUser user) {
|
||||
public void setUser(@NotNull final StepicUser user) {
|
||||
myUser = user;
|
||||
}
|
||||
}
|
||||
|
||||
+4
-2
@@ -58,7 +58,7 @@ public class StudyProjectGenerator {
|
||||
private static final String COURSE_DESCRIPTION = "description";
|
||||
private static final String CACHE_NAME = "courseNames.txt";
|
||||
private final List<SettingsListener> myListeners = ContainerUtil.newArrayList();
|
||||
public StepicUser myUser;
|
||||
@Nullable public StepicUser myUser;
|
||||
private List<CourseInfo> myCourses = new ArrayList<>();
|
||||
private List<Integer> myEnrolledCoursesIds = new ArrayList<>();
|
||||
protected CourseInfo mySelectedCourseInfo;
|
||||
@@ -85,7 +85,9 @@ public class StudyProjectGenerator {
|
||||
}
|
||||
|
||||
public void generateProject(@NotNull final Project project, @NotNull final VirtualFile baseDir) {
|
||||
StudyTaskManager.getInstance(project).setUser(myUser);
|
||||
if (myUser != null) {
|
||||
StudyTaskManager.getInstance(project).setUser(myUser);
|
||||
}
|
||||
final Course course = getCourse(project);
|
||||
if (course == null) {
|
||||
LOG.warn("Course is null");
|
||||
|
||||
Reference in New Issue
Block a user