From d038f6ad13466a587f36474b4172a240bd331942 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Sun, 15 Feb 2015 17:56:51 +0300 Subject: [PATCH] simplified create answer placeholder dialog --- .../edu/coursecreator/actions/CCAddAnswerPlaceholder.java | 5 ++--- .../edu/coursecreator/actions/CCCreateCourseArchive.java | 3 +-- .../actions/CCShowAnswerPlaceholderDetails.java | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java b/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java index b2b21e9646e5..6743b25eb374 100644 --- a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java +++ b/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java @@ -83,9 +83,8 @@ public class CCAddAnswerPlaceholder extends DumbAwareAction { answerPlaceholder.setStart(realStart); answerPlaceholder.setPossibleAnswer(model.getSelectedText()); - CCCreateAnswerPlaceholderDialog dlg = new CCCreateAnswerPlaceholderDialog(project, answerPlaceholder, lesson.getIndex(), - task.getIndex(), file.getVirtualFile().getNameWithoutExtension(), - taskFile.getAnswerPlaceholders().size() + 1); + CCCreateAnswerPlaceholderDialog dlg = new CCCreateAnswerPlaceholderDialog(project, answerPlaceholder + ); dlg.show(); if (dlg.getExitCode() != DialogWrapper.OK_EXIT_CODE) { return; diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java b/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java index cb00a7f2e5c2..ab0a37613690 100644 --- a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java +++ b/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java @@ -174,8 +174,7 @@ public class CCCreateCourseArchive extends DumbAwareAction { @NotNull final Document document, @NotNull final AnswerPlaceholder answerPlaceholder) { final String taskText = answerPlaceholder.getTaskText(); - final int lineStartOffset = document.getLineStartOffset(answerPlaceholder.getLine()); - final int offset = lineStartOffset + answerPlaceholder.getStart(); + final int offset = answerPlaceholder.getRealStartOffset(document); CommandProcessor.getInstance().executeCommand(project, new Runnable() { @Override public void run() { diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java b/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java index d030811460ca..47c18071d68a 100644 --- a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java +++ b/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java @@ -29,9 +29,8 @@ public class CCShowAnswerPlaceholderDetails extends CCAnswerPlaceholderAction { final Task task = service.getTask(taskDir.getVirtualFile().getPath()); final TaskFile taskFile = state.getTaskFile(); AnswerPlaceholder answerPlaceholder = state.getAnswerPlaceholder(); - CCCreateAnswerPlaceholderDialog dlg = new CCCreateAnswerPlaceholderDialog(project, answerPlaceholder, lesson.getIndex(), task.getIndex(), - file.getVirtualFile().getNameWithoutExtension(), - taskFile.getAnswerPlaceholders().size() + 1); + CCCreateAnswerPlaceholderDialog dlg = new CCCreateAnswerPlaceholderDialog(project, answerPlaceholder + ); dlg.setTitle("Edit Answer Placeholder"); dlg.show(); }