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

multiple authors for course, properly set task title

Browse Source
This commit is contained in:
Ekaterina Tuzova
2015-03-25 13:30:13 +03:00
parent 1632ad12c5
commit b6b785ba2c
9 changed files with 92 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCChangeCourseInfo.java
+2 -2
View File
@@ -78,12 +78,12 @@ public class CCChangeCourseInfo extends DumbAwareAction {
if (directory != null && !project.getBaseDir().equals(directory.getVirtualFile())) {
return;
}
CCNewProjectPanel panel = new CCNewProjectPanel(course.getName(), course.getAuthor(), course.getDescription());
CCNewProjectPanel panel = new CCNewProjectPanel(course.getName(), Course.getAuthorsString(course.getAuthors()), course.getDescription());
ChangeCourseInfoDialog changeCourseInfoDialog =
new ChangeCourseInfoDialog(project, panel);
changeCourseInfoDialog.show();
if (changeCourseInfoDialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
course.setAuthor(panel.getAuthor());
course.setAuthors(panel.getAuthors());
course.setName(panel.getName());
course.setDescription(panel.getDescription());
ProjectView.getInstance(project).refresh();
python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCNewProjectPanel.java
+2 -2
View File
@@ -51,8 +51,8 @@ public class CCNewProjectPanel {
}
@NotNull
public String getAuthor() {
return StringUtil.notNullize(myAuthorField.getText());
public String[] getAuthors() {
return StringUtil.splitByLines(StringUtil.notNullize(myAuthorField.getText()));
}
public void registerValidators(FacetValidatorsManager manager) {
python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java
+7 -4
View File
@@ -211,10 +211,13 @@ public class StudyProjectGenerator {
}
writer = new PrintWriter(cashFile);
for (CourseInfo courseInfo : myCourses) {
String line = String
.format("name=%s author=%s description=%s", courseInfo.getName(), courseInfo.getAuthor(),
courseInfo.getDescription());
writer.println(line);
final List<CourseInfo.Instructor> instructors = courseInfo.getInstructors();
StringBuilder builder = new StringBuilder("name=").append(courseInfo.getName()).append("description=").append(
courseInfo.getDescription());
for (CourseInfo.Instructor instructor : instructors) {
builder.append("instructor=").append(instructor.getName());
}
writer.println(builder.toString());
}
}
catch (FileNotFoundException e) {
python/educational/interactive-learning/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
+3 -2
View File
@@ -3,6 +3,7 @@ package com.jetbrains.edu.learning.ui;
import com.intellij.facet.ui.FacetValidatorsManager;
import com.intellij.facet.ui.ValidationResult;
import com.intellij.icons.AllIcons;
import com.jetbrains.edu.courseFormat.Course;
import com.jetbrains.edu.learning.StudyUtils;
import com.jetbrains.edu.learning.courseGeneration.StudyProjectGenerator;
import com.jetbrains.edu.stepic.CourseInfo;
@@ -42,7 +43,7 @@ public class StudyNewProjectPanel{
for (CourseInfo courseInfo : myAvailableCourses) {
myCoursesComboBox.addItem(courseInfo);
}
myAuthorLabel.setText("Author: " + StudyUtils.getFirst(myAvailableCourses).getAuthor());
myAuthorLabel.setText("Author: " + Course.getAuthorsString(StudyUtils.getFirst(myAvailableCourses).getInstructors()));
myDescriptionLabel.setText(StudyUtils.getFirst(myAvailableCourses).getDescription());
//setting the first course in list as selected
myGenerator.setSelectedCourse(StudyUtils.getFirst(myAvailableCourses));
@@ -126,7 +127,7 @@ public class StudyNewProjectPanel{
myDescriptionLabel.setText("");
return;
}
myAuthorLabel.setText("Author: " + selectedCourse.getAuthor());
myAuthorLabel.setText("Author: " + Course.getAuthorsString(selectedCourse.getInstructors()));
myCoursesComboBox.removeItem(CourseInfo.INVALID_COURSE);
myDescriptionLabel.setText(selectedCourse.getDescription());
myGenerator.setSelectedCourse(selectedCourse);
python/educational/interactive-learning/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java
+1 -2
View File
@@ -36,8 +36,7 @@ public class StudyToolWindowFactory implements ToolWindowFactory, DumbAware {
}
String courseName = UIUtil.toHtml("<h1>" + course.getName() + "</h1>", 10);
String description = UIUtil.toHtml(course.getDescription(), 5);
String author = taskManager.getCourse().getAuthor();
String authorLabel = UIUtil.toHtml("<b>Author: </b>" + author, 5);
String authorLabel = UIUtil.toHtml("<b>Author: </b>" + Course.getAuthorsString(course.getAuthors()), 5);
contentPanel.add(new JLabel(courseName));
contentPanel.add(new JLabel(authorLabel));
contentPanel.add(Box.createRigidArea(new Dimension(0, 10)));
python/educational/src/com/jetbrains/edu/courseFormat/Course.java
+25 -5
View File
@@ -3,8 +3,11 @@ package com.jetbrains.edu.courseFormat;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.intellij.lang.Language;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.Function;
import com.jetbrains.edu.EduNames;
import com.jetbrains.edu.EduUtils;
import com.jetbrains.edu.stepic.CourseInfo;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
@@ -17,7 +20,7 @@ public class Course {
@Expose private String description;
@Expose private String name;
private String myCourseDirectory = "";
@Expose private String author="";
@Expose private List<CourseInfo.Instructor> authors = new ArrayList<CourseInfo.Instructor>();
private boolean myUpToDate;
@Expose @SerializedName("language")
@@ -56,12 +59,25 @@ public class Course {
return lessons.get(lessonIndex);
}
public String getAuthor() {
return author;
@NotNull
public List<CourseInfo.Instructor> getAuthors() {
return authors;
}
public void setAuthor(String author) {
this.author = author;
public static String getAuthorsString(@NotNull List<CourseInfo.Instructor> authors) {
return StringUtil.join(authors, new Function<CourseInfo.Instructor, String>() {
@Override
public String fun(CourseInfo.Instructor instructor) {
return instructor.getName();
}
}, ", ");
}
public void setAuthors(String[] authors) {
this.authors = new ArrayList<CourseInfo.Instructor>();
for (String name : authors) {
this.authors.add(new CourseInfo.Instructor(name));
}
}
public String getName() {
@@ -107,4 +123,8 @@ public class Course {
public void setLanguage(@NotNull final String language) {
myLanguage = language;
}
public void setAuthors(List<CourseInfo.Instructor> instructors) {
this.authors = instructors;
}
}
python/educational/src/com/jetbrains/edu/stepic/CourseInfo.java
+22 -12
View File
@@ -1,7 +1,9 @@
package com.jetbrains.edu.stepic;
import com.google.gson.annotations.SerializedName;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
/**
@@ -19,22 +21,18 @@ public class CourseInfo {
//course type in format "pycharm <language>"
private String myType;
private String myAuthor;
public static CourseInfo INVALID_COURSE = new CourseInfo("", "", "", "");
@SerializedName("instructors")
List<Instructor> myInstructors = new ArrayList<Instructor>();
public CourseInfo(String name, String author, String description, String type) {
myName = name;
myAuthor = author;
myDescription = description;
myType = type;
}
public static CourseInfo INVALID_COURSE = new CourseInfo();
public String getName() {
return myName;
}
public String getAuthor() {
return myAuthor;
@NotNull
public List<Instructor> getInstructors() {
return myInstructors;
}
public String getDescription() {
@@ -55,15 +53,27 @@ public class CourseInfo {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CourseInfo that = (CourseInfo)o;
return that.getName().equals(myName) && that.getAuthor().equals(myAuthor)
if (that.getName() == null || that.getDescription() == null) return false;
return that.getName().equals(myName)
&& that.getDescription().equals(myDescription);
}
@Override
public int hashCode() {
int result = myName != null ? myName.hashCode() : 0;
result = 31 * result + (myAuthor != null ? myAuthor.hashCode() : 0);
result = 31 * result + (myDescription != null ? myDescription.hashCode() : 0);
return result;
}
public static class Instructor {
String name;
public Instructor(String name) {
this.name = name;
}
public String getName() {
return name;
}
}
}
python/educational/src/com/jetbrains/edu/stepic/EduStepicConnector.java
+26 -21
View File
@@ -8,6 +8,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.io.HttpRequests;
import com.intellij.util.net.ssl.CertificateManager;
@@ -42,7 +43,7 @@ public class EduStepicConnector {
private static String ourSessionId = "524iethiwju2tjywaqmf7tbwx0p0jk1b";
private static String ourCSRFToken = "LJ9n6OyLVA7hxU94dlYWUu65MF51Nx37";
//this prefix indicates that course can be opened by educational plugin
public static final String PYCHARM_PREFIX = "pycharm ";
public static final String PYCHARM_PREFIX = "pycharm";
private EduStepicConnector() {
}
@@ -61,36 +62,40 @@ public class EduStepicConnector {
@NotNull
public static List<CourseInfo> getCourses() {
try {
return getFromStepic("courses/99", CoursesContainer.class).courses;
List<CourseInfo> result = new ArrayList<CourseInfo>();
final List<CourseInfo> courseInfos =
HttpRequests.request(stepicApiUrl + "courses").connect(new HttpRequests.RequestProcessor<List<CourseInfo>>() {
@Override
public List<CourseInfo> process(@NotNull HttpRequests.Request request) throws IOException {
final BufferedReader reader = request.getReader();
Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create();
return gson.fromJson(reader, CoursesContainer.class).courses;
}
});
for (CourseInfo info : courseInfos) {
final String courseType = info.getType();
if (StringUtil.isEmptyOrSpaces(courseType)) continue;
final List<String> typeLanguage = StringUtil.split(courseType, " ");
if (typeLanguage.size() == 2 && PYCHARM_PREFIX.equals(typeLanguage.get(0))) {
result.add(info);
}
}
return result;
}
catch (IOException e) {
LOG.error("IOException " + e.getMessage());
LOG.error("Cannot load course list " + e.getMessage());
}
return Collections.emptyList();
/*try { // TODO: uncomment
return HttpRequests.request(stepicApiUrl + "courses").connect(new HttpRequests.RequestProcessor<List<CourseInfo>>() {
@Override
public List<CourseInfo> process(@NotNull HttpRequests.Request request) throws IOException {
final BufferedReader reader = request.getReader();
Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create();
return gson.fromJson(reader, CoursesContainer.class).courses;
}
});
}
catch (IOException e) {
LOG.error("IOException " + e.getMessage());
}
return null;*/
}
public static Course getCourse(@NotNull final CourseInfo info) {
final Course course = new Course();
course.setAuthor(info.getAuthor());
course.setAuthors(info.getInstructors());
course.setDescription(info.getDescription());
course.setName(info.getName());
String courseType = info.getType();
course.setLanguage(courseType.substring(PYCHARM_PREFIX.length()));
course.setLanguage(courseType.substring(PYCHARM_PREFIX.length() + 1));
course.setUpToDate(true); // TODO: get from stepic
try {
for (Integer section : info.sections) {
@@ -128,7 +133,7 @@ public class EduStepicConnector {
private static void createTask(Lesson lesson, Integer s) throws IOException {
final Step step = getStep(s);
final Task task = new Task();
task.setName(step.name);
task.setName(step.options != null ? step.options.title : PYCHARM_PREFIX);
task.setText(step.text);
for (TestFileWrapper wrapper : step.options.test) {
task.setTestsTexts(wrapper.name, wrapper.text);