MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Wait for a user to be set correctly on project creation panel

Browse Source
This commit is contained in:
Valentina Kiryushkina
2017-05-10 12:46:00 +03:00
parent 3dad68ff00
commit d5cecc5783
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
+1 -1
View File
@@ -250,7 +250,7 @@ public class StudyNewProjectPanel extends JPanel implements PanelWithAnchor {
}
}
private void setOK() {
public void setOK() {
myGenerator.fireStateChanged(ValidationResult.OK);
if (myValidationManager != null) {
myValidationManager.validate();
python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java
+25 -6
View File
@@ -57,6 +57,7 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.TimeUnit;
public class PyStudyDirectoryProjectGenerator extends PythonProjectGenerator<PyNewProjectSettings>
implements EduCourseProjectGenerator {
@@ -203,14 +204,32 @@ public class PyStudyDirectoryProjectGenerator extends PythonProjectGenerator<PyN
@Override
public void mouseClicked(MouseEvent e) {
if (isCourseAdaptiveAndNotLogged()) {
StudySettings studySettings = StudySettings.getInstance();
StepicUser oldUser = studySettings.getUser();
EduStepicConnector.doAuthorize(() -> mySettingsPanel.showLoginDialog());
StepicUser user = StudySettings.getInstance().getUser();
if (user != null) {
ProgressManager.getInstance().runProcessWithProgressSynchronously(
() -> myGenerator.setEnrolledCoursesIds(EduAdaptiveStepicConnector.getEnrolledCoursesIds(user)), "Getting Enrolled Courses",
true, DefaultProjectFactory.getInstance().getDefaultProject());
}
ProgressManager.getInstance()
.runProcessWithProgressSynchronously(() -> {
ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true);
StepicUser user = StudyUtils.execCancelable(() -> {
StepicUser newUser = studySettings.getUser();
while (newUser == null || newUser.equals(oldUser)) {
TimeUnit.MILLISECONDS.sleep(500);
newUser = studySettings.getUser();
}
myGenerator.setEnrolledCoursesIds(EduAdaptiveStepicConnector.getEnrolledCoursesIds(newUser));
return newUser;
});
if (user != null) {
mySettingsPanel.setOK();
}
}, "Authorizing",
true,
DefaultProjectFactory.getInstance().getDefaultProject());
}
}