Fix NPE in StudyCheckTask for study project with no user

This commit is contained in:
Valentina Kiryushkina
2016-06-22 16:01:36 +03:00
parent 068e6edb72
commit 5c70a6701b
2 changed files with 8 additions and 5 deletions
@@ -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;
}
}
@@ -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");