diff --git a/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduBuiltInServerUtils.java b/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduBuiltInServerUtils.java index 2e9ea09bfc05..d3b912b6e6ee 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduBuiltInServerUtils.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduBuiltInServerUtils.java @@ -44,9 +44,6 @@ import java.util.List; import static com.jetbrains.edu.learning.core.EduNames.STUDY_PROJECT_XML_PATH; import static com.jetbrains.edu.learning.navigation.StudyNavigator.navigateToTask; -/** - * @author meanmail - */ public class EduBuiltInServerUtils { public static boolean focusOpenProject(int courseId, int stepId) { Project[] openProjects = ProjectManager.getInstance().getOpenProjects(); diff --git a/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java b/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java index 1e0f94ee8b83..245797f796aa 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java @@ -34,12 +34,9 @@ import static com.jetbrains.edu.learning.builtInServer.EduBuiltInServerUtils.*; import static com.jetbrains.edu.learning.stepic.EduStepicNames.EDU_STEPIK_SERVICE_NAME; import static com.jetbrains.edu.learning.stepic.EduStepicNames.STEP_ID; -/** - * @author meanmail - */ public class EduStepikRestService extends RestService { private static final Logger LOG = Logger.getInstance(EduStepikRestService.class.getName()); - private static final Pattern OPEN_COURSE = Pattern.compile("/" + EDU_STEPIK_SERVICE_NAME + "/course/(\\d+)"); + private static final Pattern OPEN_COURSE_PATTERN = Pattern.compile("/" + EDU_STEPIK_SERVICE_NAME + "/course/(\\d+)"); @NotNull @Override @@ -64,7 +61,7 @@ public class EduStepikRestService extends RestService { LOG.info("Request: " + urlDecoder.uri()); String path = urlDecoder.path(); - Matcher matcher = OPEN_COURSE.matcher(path); + Matcher matcher = OPEN_COURSE_PATTERN.matcher(path); if (matcher.matches()) { int courseId = Integer.parseInt(matcher.group(1)); List stepIds = urlDecoder.parameters().get(STEP_ID); diff --git a/python/educational-core/src/com/jetbrains/edu/learning/newproject/EduCourseProjectGenerator.java b/python/educational-core/src/com/jetbrains/edu/learning/newproject/EduCourseProjectGenerator.java index 2fb6524fa7ce..704c6c3cf3f8 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/newproject/EduCourseProjectGenerator.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/newproject/EduCourseProjectGenerator.java @@ -22,9 +22,6 @@ import com.jetbrains.edu.learning.courseFormat.Course; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -/** - * @author meanmail - */ public interface EduCourseProjectGenerator { @NotNull DirectoryProjectGenerator getDirectoryProjectGenerator(); diff --git a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectDialog.java b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectDialog.java index 2e8b6389e4ca..0a70c41d750a 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectDialog.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectDialog.java @@ -47,21 +47,18 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -/** - * @author meanmail - */ public class EduCreateNewProjectDialog extends DialogWrapper { private static final Logger LOG = Logger.getInstance(EduCreateNewProjectDialog.class); - private Project project; - private Course course; - private final List listeners = new ArrayList<>(); - private final EduCreateNewProjectPanel panel; + private Project myProject; + private Course myCourse; + private final List myListeners = new ArrayList<>(); + private final EduCreateNewProjectPanel myPanel; public EduCreateNewProjectDialog() { super(false); - setTitle("New project"); + setTitle("New Project"); Project defaultProject = ProjectManager.getInstance().getDefaultProject(); - panel = new EduCreateNewProjectPanel(defaultProject, this); + myPanel = new EduCreateNewProjectPanel(defaultProject, this); setOKButtonText("Create"); init(); } @@ -69,45 +66,45 @@ public class EduCreateNewProjectDialog extends DialogWrapper { @Nullable @Override protected JComponent createCenterPanel() { - return panel; + return myPanel; } public void addListener(@NotNull EduCreateNewProjectListener listener) { - listeners.add(listener); + myListeners.add(listener); } public void setCourse(@Nullable Course course) { - this.course = course; + this.myCourse = course; } @Override protected void doOKAction() { - if (course == null) { - panel.setError("Selected course is null"); + if (myCourse == null) { + myPanel.setError("Selected course is null"); return; } - Language language = course.getLanguageById(); + Language language = myCourse.getLanguageById(); if (language == null) { String message = "Selected course don't have language"; - panel.setError(message); + myPanel.setError(message); LOG.warn(message); return; } EduPluginConfigurator configurator = EduPluginConfigurator.INSTANCE.forLanguage(language); if (configurator == null) { String message = "A configurator for the selected course not found"; - panel.setError(message); + myPanel.setError(message); LOG.warn(message + ": " + language); return; } EduCourseProjectGenerator projectGenerator = configurator.getEduCourseProjectGenerator(); String errorMessage = createProject(projectGenerator); if (errorMessage != null) { - panel.setError(errorMessage); + myPanel.setError(errorMessage); return; } - if (project == null) { - panel.setError("Project did't created"); + if (myProject == null) { + myPanel.setError("Project did't created"); return; } notifyCreated(); @@ -121,8 +118,8 @@ public class EduCreateNewProjectDialog extends DialogWrapper { */ @Nullable private String createProject(@NotNull final EduCourseProjectGenerator projectGenerator) { - String name = panel.getName(); - String path = FileUtil.join(FileUtil.toSystemDependentName(panel.getLocationPath()), name); + String name = myPanel.getName(); + String path = FileUtil.join(FileUtil.toSystemDependentName(myPanel.getLocationPath()), name); ValidationResult result = projectGenerator.validate(path); if (!result.isOk()) { @@ -136,7 +133,7 @@ public class EduCreateNewProjectDialog extends DialogWrapper { return message; } - projectGenerator.setCourse(course); + projectGenerator.setCourse(myCourse); final VirtualFile baseDir = ApplicationManager.getApplication() .runWriteAction((Computable)() -> @@ -152,9 +149,9 @@ public class EduCreateNewProjectDialog extends DialogWrapper { if (baseDir.getChildren().length > 0) { String message = String.format("Directory '%s' is not empty.\nFiles and directories will remove.\nDo you want continue?", location.getAbsolutePath()); - int rc = Messages.showYesNoDialog((Project)null, message, "New project", Messages.getQuestionIcon()); + int rc = Messages.showYesNoDialog((Project)null, message, "New Project", Messages.getQuestionIcon()); if (rc != Messages.YES) { - panel.resetError(); + myPanel.resetError(); return "Canceled by user"; } } @@ -179,11 +176,11 @@ public class EduCreateNewProjectDialog extends DialogWrapper { }; } EnumSet options = EnumSet.noneOf(PlatformProjectOpenProcessor.Option.class); - project = PlatformProjectOpenProcessor.doOpenProject(baseDir, null, -1, callback, options); + myProject = PlatformProjectOpenProcessor.doOpenProject(baseDir, null, -1, callback, options); return null; } private void notifyCreated() { - listeners.forEach(listener -> listener.created(project)); + myListeners.forEach(listener -> listener.created(myProject)); } } diff --git a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectListener.java b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectListener.java index 8c034be752e6..3c7b8e122f0c 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectListener.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectListener.java @@ -18,9 +18,6 @@ package com.jetbrains.edu.learning.newproject.ui; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -/** - * @author meanmail - */ public interface EduCreateNewProjectListener { void created(@NotNull Project project); } diff --git a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectPanel.form b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectPanel.form index 5365323d6369..087a3863e63e 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectPanel.form +++ b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectPanel.form @@ -1,6 +1,6 @@
- + @@ -17,7 +17,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectPanel.java b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectPanel.java index dbc7ed938a32..be758ac5dd39 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectPanel.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewProjectPanel.java @@ -31,31 +31,28 @@ import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import java.io.File; -/** - * @author meanmail - */ public class EduCreateNewProjectPanel extends JPanel { - private JPanel panel; - private JTextField nameField; - private TextFieldWithBrowseButton locationField; - private JLabel errorIcon; - private JLabel errorLabel; + private JPanel myPanel; + private JTextField myNameField; + private TextFieldWithBrowseButton myLocationField; + private JLabel myErrorIcon; + private JLabel myErrorLabel; public EduCreateNewProjectPanel(@NotNull final Project project, @NotNull EduCreateNewProjectDialog dialog) { setLayout(new BorderLayout()); - add(panel, BorderLayout.CENTER); - errorIcon.setIcon(AllIcons.Actions.Lightning); + add(myPanel, BorderLayout.CENTER); + myErrorIcon.setIcon(AllIcons.Actions.Lightning); resetError(); String location = RecentProjectsManager.getInstance().getLastProjectCreationLocation(); - locationField.setText(location); + myLocationField.setText(location); String name = ProjectWizardUtil.findNonExistingFileName(location, "course", ""); - nameField.setText(name); + myNameField.setText(name); FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor(); - locationField.addBrowseFolderListener("Choose Location Folder", null, project, descriptor); - locationField.addFocusListener(new FocusAdapter() { + myLocationField.addBrowseFolderListener("Choose Location Folder", null, project, descriptor); + myLocationField.addFocusListener(new FocusAdapter() { @Override public void focusLost(FocusEvent e) { - String location = FileUtil.toSystemDependentName(locationField.getText()); + String location = FileUtil.toSystemDependentName(myLocationField.getText()); File file = new File(location); if (!FileUtil.ensureCanCreateFile(file)) { dialog.setOKActionEnabled(false); @@ -69,21 +66,21 @@ public class EduCreateNewProjectPanel extends JPanel { } private void setState(boolean isVisible) { - errorIcon.setVisible(isVisible); - errorLabel.setVisible(isVisible); + myErrorIcon.setVisible(isVisible); + myErrorLabel.setVisible(isVisible); } void setError(@NotNull String message) { - errorLabel.setText(message); + myErrorLabel.setText(message); setState(true); } public String getName() { - return nameField.getText(); + return myNameField.getText(); } public String getLocationPath() { - return locationField.getText(); + return myLocationField.getText(); } public void resetError() { diff --git a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewStepikProjectDialog.java b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewStepikProjectDialog.java index f7bebcfd42c7..0c7079b58281 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewStepikProjectDialog.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCreateNewStepikProjectDialog.java @@ -29,9 +29,6 @@ import java.io.IOException; import static com.jetbrains.edu.learning.StudyUtils.execCancelable; -/** - * @author meanmail - */ public class EduCreateNewStepikProjectDialog extends EduCreateNewProjectDialog { private static final Logger LOG = Logger.getInstance(EduCreateNewStepikProjectDialog.class); @@ -52,7 +49,7 @@ public class EduCreateNewStepikProjectDialog extends EduCreateNewProjectDialog { try { Course course = EduStepicConnector.getCourseFromStepik(user, courseId); if (course != null) { - setTitle("New project - " + course.getName()); + setTitle("New Project - " + course.getName()); } setCourse(course); diff --git a/python/educational-python/Edu-Python/src/com/jetbrains/edu/common/newproject/PyEduCourseProjectGenerator.java b/python/educational-python/Edu-Python/src/com/jetbrains/edu/common/newproject/PyEduCourseProjectGenerator.java index 44a79b44979d..ad0d6f4469c4 100644 --- a/python/educational-python/Edu-Python/src/com/jetbrains/edu/common/newproject/PyEduCourseProjectGenerator.java +++ b/python/educational-python/Edu-Python/src/com/jetbrains/edu/common/newproject/PyEduCourseProjectGenerator.java @@ -34,53 +34,50 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -/** - * @author meanmail - */ public class PyEduCourseProjectGenerator implements EduCourseProjectGenerator { - private final PyStudyDirectoryProjectGenerator generator; + private final PyStudyDirectoryProjectGenerator myGenerator; public PyEduCourseProjectGenerator() { - this.generator = new PyStudyDirectoryProjectGenerator(); + this.myGenerator = new PyStudyDirectoryProjectGenerator(); } @NotNull @Override public DirectoryProjectGenerator getDirectoryProjectGenerator() { - return generator; + return myGenerator; } @Nullable @Override public Object getProjectSettings() { - return generator.getProjectSettings(); + return myGenerator.getProjectSettings(); } @Override public void setCourse(@NotNull Course course) { - generator.setSelectedCourse(course); + myGenerator.setSelectedCourse(course); } @Override public ValidationResult validate(@NotNull String path) { - generator.setValidationResult(ValidationResult.OK); - return generator.validate(path); + myGenerator.setValidationResult(ValidationResult.OK); + return myGenerator.validate(path); } @Override public boolean beforeProjectGenerated() { BooleanFunction function = - generator.beforeProjectGenerated(null); - return function != null && function.fun(generator); + myGenerator.beforeProjectGenerated(null); + return function != null && function.fun(myGenerator); } @Override public void afterProjectGenerated(@NotNull Project project) { - PyNewProjectSettings settings = (PyNewProjectSettings)generator.getProjectSettings(); + PyNewProjectSettings settings = (PyNewProjectSettings)myGenerator.getProjectSettings(); Sdk sdk = settings.getSdk(); if (sdk == null) { - generator.createAndAddVirtualEnv(project, settings); + myGenerator.createAndAddVirtualEnv(project, settings); sdk = settings.getSdk(); } diff --git a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java index dc5055e6d477..ddccfdce44cc 100644 --- a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java +++ b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java @@ -51,7 +51,6 @@ import java.awt.event.MouseEvent; import java.util.Collection; import java.util.List; - public class PyStudyDirectoryProjectGenerator extends PythonProjectGenerator { private static final Logger LOG = Logger.getInstance(PyStudyDirectoryProjectGenerator.class.getName()); private final StudyProjectGenerator myGenerator;