From e7409cb20ea8ce49076b29bf350f07eaddbfd90d Mon Sep 17 00:00:00 2001 From: medvector Date: Thu, 14 Aug 2014 14:35:26 +0400 Subject: [PATCH] cleanup renamed classes --- python/edu/src/META-INF/plugin.xml | 16 ++++++++-------- .../python/edu/StudyTaskManager.java | 14 +++++++------- .../com/jetbrains/python/edu/StudyUtils.java | 18 ++++++++---------- ...CheckAction.java => StudyCheckAction.java} | 19 +++++++++++-------- ...tAction.java => StudyEditInputAction.java} | 14 +++++++------- ...ion.java => StudyNextStudyTaskAction.java} | 2 +- ...Action.java => StudyNextWindowAction.java} | 4 ++-- ...Action.java => StudyPrevWindowAction.java} | 4 ++-- ...java => StudyPreviousStudyTaskAction.java} | 2 +- ...ction.java => StudyRefreshTaskAction.java} | 4 ++-- ...ntAction.java => StudyShowHintAction.java} | 4 ++-- ...on.java => StudyTaskNavigationAction.java} | 2 +- .../python/edu/editor/StudyEditor.java | 19 ++++++++++--------- ...tPanel.java => StudyTestContentPanel.java} | 4 ++-- 14 files changed, 64 insertions(+), 62 deletions(-) rename python/edu/src/com/jetbrains/python/edu/actions/{CheckAction.java => StudyCheckAction.java} (95%) rename python/edu/src/com/jetbrains/python/edu/actions/{WatchInputAction.java => StudyEditInputAction.java} (93%) rename python/edu/src/com/jetbrains/python/edu/actions/{NextTaskAction.java => StudyNextStudyTaskAction.java} (87%) rename python/edu/src/com/jetbrains/python/edu/actions/{NextWindowAction.java => StudyNextWindowAction.java} (95%) rename python/edu/src/com/jetbrains/python/edu/actions/{PrevWindowAction.java => StudyPrevWindowAction.java} (95%) rename python/edu/src/com/jetbrains/python/edu/actions/{PreviousTaskAction.java => StudyPreviousStudyTaskAction.java} (86%) rename python/edu/src/com/jetbrains/python/edu/actions/{RefreshTaskAction.java => StudyRefreshTaskAction.java} (97%) rename python/edu/src/com/jetbrains/python/edu/actions/{ShowHintAction.java => StudyShowHintAction.java} (97%) rename python/edu/src/com/jetbrains/python/edu/actions/{TaskNavigationAction.java => StudyTaskNavigationAction.java} (97%) rename python/edu/src/com/jetbrains/python/edu/ui/{TestContentPanel.java => StudyTestContentPanel.java} (95%) diff --git a/python/edu/src/META-INF/plugin.xml b/python/edu/src/META-INF/plugin.xml index cdf2fdac1a26..30749046da8b 100644 --- a/python/edu/src/META-INF/plugin.xml +++ b/python/edu/src/META-INF/plugin.xml @@ -35,25 +35,25 @@ - - + - + - - + - - - diff --git a/python/edu/src/com/jetbrains/python/edu/StudyTaskManager.java b/python/edu/src/com/jetbrains/python/edu/StudyTaskManager.java index 2b8e165eef9c..03dfea6696d9 100644 --- a/python/edu/src/com/jetbrains/python/edu/StudyTaskManager.java +++ b/python/edu/src/com/jetbrains/python/edu/StudyTaskManager.java @@ -19,9 +19,9 @@ import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowAnchor; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.util.xmlb.XmlSerializer; -import com.jetbrains.python.edu.actions.NextWindowAction; -import com.jetbrains.python.edu.actions.PrevWindowAction; -import com.jetbrains.python.edu.actions.ShowHintAction; +import com.jetbrains.python.edu.actions.StudyNextWindowAction; +import com.jetbrains.python.edu.actions.StudyPrevWindowAction; +import com.jetbrains.python.edu.actions.StudyShowHintAction; import com.jetbrains.python.edu.course.Course; import com.jetbrains.python.edu.course.Lesson; import com.jetbrains.python.edu.course.Task; @@ -129,10 +129,10 @@ public class StudyTaskManager implements ProjectComponent, PersistentStateCompon StudyUtils.updateStudyToolWindow(myProject); studyToolWindow.show(null); } - addShortcut(NextWindowAction.SHORTCUT, NextWindowAction.ACTION_ID); - addShortcut(PrevWindowAction.SHORTCUT, PrevWindowAction.ACTION_ID); - addShortcut(ShowHintAction.SHORTCUT, ShowHintAction.ACTION_ID); - addShortcut(NextWindowAction.SHORTCUT2, NextWindowAction.ACTION_ID); + addShortcut(StudyNextWindowAction.SHORTCUT, StudyNextWindowAction.ACTION_ID); + addShortcut(StudyPrevWindowAction.SHORTCUT, StudyPrevWindowAction.ACTION_ID); + addShortcut(StudyShowHintAction.SHORTCUT, StudyShowHintAction.ACTION_ID); + addShortcut(StudyNextWindowAction.SHORTCUT2, StudyNextWindowAction.ACTION_ID); } } }); diff --git a/python/edu/src/com/jetbrains/python/edu/StudyUtils.java b/python/edu/src/com/jetbrains/python/edu/StudyUtils.java index 7087c5297540..4a516aa36398 100644 --- a/python/edu/src/com/jetbrains/python/edu/StudyUtils.java +++ b/python/edu/src/com/jetbrains/python/edu/StudyUtils.java @@ -23,10 +23,6 @@ import org.jetbrains.annotations.NotNull; import java.io.*; import java.util.Collection; -/** - * author: liana - * data: 7/15/14. - */ public class StudyUtils { private static final Logger LOG = Logger.getInstance(StudyUtils.class.getName()); public static void closeSilently(Closeable stream) { @@ -53,6 +49,7 @@ public class StudyUtils { return index >= 0 && index < size; } + @SuppressWarnings("IOResourceOpenedButNotSafelyClosed") public static String getFileText(String parentDir, String fileName, boolean wrapHTML) { File inputFile = parentDir !=null ? new File(parentDir, fileName) : new File(fileName); @@ -118,16 +115,17 @@ public class StudyUtils { return Integer.parseInt(fullName.substring(logicalName.length())) - 1; } + @SuppressWarnings("IOResourceOpenedButNotSafelyClosed") public static VirtualFile flushWindows(Document document, TaskFile taskFile, VirtualFile file) { VirtualFile taskDir = file.getParent(); - VirtualFile file_windows = null; + VirtualFile fileWindows = null; if (taskDir != null) { String name = file.getNameWithoutExtension() + "_windows"; PrintWriter printWriter = null; try { - file_windows = taskDir.createChildData(taskFile, name); - printWriter = new PrintWriter(new FileOutputStream(file_windows.getPath())); + fileWindows = taskDir.createChildData(taskFile, name); + printWriter = new PrintWriter(new FileOutputStream(fileWindows.getPath())); for (TaskWindow taskWindow : taskFile.getTaskWindows()) { if (!taskWindow.isValid(document)) { continue; @@ -138,13 +136,13 @@ public class StudyUtils { } } catch (IOException e) { - e.printStackTrace(); + LOG.error(e); } finally { closeSilently(printWriter); - StudyUtils.synchronize(); + synchronize(); } } - return file_windows; + return fileWindows; } } diff --git a/python/edu/src/com/jetbrains/python/edu/actions/CheckAction.java b/python/edu/src/com/jetbrains/python/edu/actions/StudyCheckAction.java similarity index 95% rename from python/edu/src/com/jetbrains/python/edu/actions/CheckAction.java rename to python/edu/src/com/jetbrains/python/edu/actions/StudyCheckAction.java index 63844a57d0c7..3a7f08e7ff7e 100644 --- a/python/edu/src/com/jetbrains/python/edu/actions/CheckAction.java +++ b/python/edu/src/com/jetbrains/python/edu/actions/StudyCheckAction.java @@ -35,9 +35,10 @@ import java.awt.*; import java.io.*; import java.util.Map; -public class CheckAction extends DumbAwareAction { +public class StudyCheckAction extends DumbAwareAction { - private static final Logger LOG = Logger.getInstance(CheckAction.class.getName()); + private static final Logger LOG = Logger.getInstance(StudyCheckAction.class.getName()); + public static final String PYTHONPATH = "PYTHONPATH"; static class StudyTestRunner { public static final String TEST_OK = "#study_plugin test OK"; @@ -58,7 +59,7 @@ public class CheckAction extends DumbAwareAction { final Map env = commandLine.getEnvironment(); final VirtualFile courseDir = project.getBaseDir(); if (courseDir != null) - env.put("PYTHONPATH", courseDir.getPath()); + env.put(PYTHONPATH, courseDir.getPath()); if (sdk != null) { String pythonPath = sdk.getHomePath(); if (pythonPath != null) { @@ -103,9 +104,6 @@ public class CheckAction extends DumbAwareAction { CommandProcessor.getInstance().runUndoTransparentAction(new Runnable() { @Override public void run() { - //CommandProcessor.getInstance().executeCommand(project, new Runnable() { - // @Override - // public void run() { final Editor selectedEditor = StudyEditor.getSelectedEditor(project); if (selectedEditor != null) { final FileDocumentManager fileDocumentManager = FileDocumentManager.getInstance(); @@ -114,7 +112,7 @@ public class CheckAction extends DumbAwareAction { StudyTaskManager taskManager = StudyTaskManager.getInstance(project); final TaskFile selectedTaskFile = taskManager.getTaskFile(openedFile); if (selectedTaskFile != null) { - StudyUtils.flushWindows(selectedEditor.getDocument(), selectedTaskFile, openedFile); + VirtualFile windowsDescription = StudyUtils.flushWindows(selectedEditor.getDocument(), selectedTaskFile, openedFile); FileDocumentManager.getInstance().saveAllDocuments(); final VirtualFile taskDir = openedFile.getParent(); Task currentTask = selectedTaskFile.getTask(); @@ -156,6 +154,12 @@ public class CheckAction extends DumbAwareAction { catch (IOException e) { LOG.error(e); } + try { + windowsDescription.delete(this); + } + catch (IOException e) { + LOG.error("failed to delete windows description", e); + } selectedTaskFile.drawAllWindows(selectedEditor); createTestResultPopUp(failedMessage, JBColor.RED, project); } @@ -165,7 +169,6 @@ public class CheckAction extends DumbAwareAction { } }); - //}, null, null); } }); } diff --git a/python/edu/src/com/jetbrains/python/edu/actions/WatchInputAction.java b/python/edu/src/com/jetbrains/python/edu/actions/StudyEditInputAction.java similarity index 93% rename from python/edu/src/com/jetbrains/python/edu/actions/WatchInputAction.java rename to python/edu/src/com/jetbrains/python/edu/actions/StudyEditInputAction.java index bedf04d58804..5b9a6fef23ac 100644 --- a/python/edu/src/com/jetbrains/python/edu/actions/WatchInputAction.java +++ b/python/edu/src/com/jetbrains/python/edu/actions/StudyEditInputAction.java @@ -25,7 +25,7 @@ import com.jetbrains.python.edu.course.Task; import com.jetbrains.python.edu.course.TaskFile; import com.jetbrains.python.edu.course.UserTest; import com.jetbrains.python.edu.editor.StudyEditor; -import com.jetbrains.python.edu.ui.TestContentPanel; +import com.jetbrains.python.edu.ui.StudyTestContentPanel; import icons.StudyIcons; import org.jetbrains.annotations.NotNull; @@ -38,12 +38,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class WatchInputAction extends DumbAwareAction { +public class StudyEditInputAction extends DumbAwareAction { public static final String TEST_TAB_NAME = "test"; public static final String USER_TEST_INPUT = "input"; public static final String USER_TEST_OUTPUT = "output"; - private static final Logger LOG = Logger.getInstance(WatchInputAction.class.getName()); + private static final Logger LOG = Logger.getInstance(StudyEditInputAction.class.getName()); private JBEditorTabs tabbedPane; private Map myEditableTabs = new HashMap(); @@ -68,7 +68,7 @@ public class WatchInputAction extends DumbAwareAction { assert testsDir != null; UserTest userTest = createUserTest(testsDir, currentTask); userTest.setEditable(true); - TestContentPanel testContentPanel = new TestContentPanel(userTest); + StudyTestContentPanel testContentPanel = new StudyTestContentPanel(userTest); TabInfo testTab = addTestTab(tabbedPane.getTabCount(), testContentPanel, currentTask, true); myEditableTabs.put(testTab, userTest); tabbedPane.addTabSilently(testTab, tabCount - 1); @@ -81,7 +81,7 @@ public class WatchInputAction extends DumbAwareAction { for (UserTest userTest : userTests) { String inputFileText = StudyUtils.getFileText(null, userTest.getInput(), false); String outputFileText = StudyUtils.getFileText(null, userTest.getOutput(), false); - TestContentPanel myContentPanel = new TestContentPanel(userTest); + StudyTestContentPanel myContentPanel = new StudyTestContentPanel(userTest); myContentPanel.addInputContent(inputFileText); myContentPanel.addOutputContent(outputFileText); TabInfo testTab = addTestTab(i, myContentPanel, currentTask, userTest.isEditable()); @@ -137,12 +137,12 @@ public class WatchInputAction extends DumbAwareAction { return userTest; } - private TabInfo addTestTab(int nameIndex, final TestContentPanel contentPanel, @NotNull final Task currentTask, boolean toBeClosable) { + private TabInfo addTestTab(int nameIndex, final StudyTestContentPanel contentPanel, @NotNull final Task currentTask, boolean toBeClosable) { TabInfo testTab = toBeClosable ? createClosableTab(contentPanel, currentTask) : new TabInfo(contentPanel); return testTab.setText(TEST_TAB_NAME + String.valueOf(nameIndex)); } - private TabInfo createClosableTab(TestContentPanel contentPanel, Task currentTask) { + private TabInfo createClosableTab(StudyTestContentPanel contentPanel, Task currentTask) { TabInfo closableTab = new TabInfo(contentPanel); final DefaultActionGroup tabActions = new DefaultActionGroup(); tabActions.add(new CloseTab(closableTab, currentTask)); diff --git a/python/edu/src/com/jetbrains/python/edu/actions/NextTaskAction.java b/python/edu/src/com/jetbrains/python/edu/actions/StudyNextStudyTaskAction.java similarity index 87% rename from python/edu/src/com/jetbrains/python/edu/actions/NextTaskAction.java rename to python/edu/src/com/jetbrains/python/edu/actions/StudyNextStudyTaskAction.java index 51fe494552ba..81818a95c044 100644 --- a/python/edu/src/com/jetbrains/python/edu/actions/NextTaskAction.java +++ b/python/edu/src/com/jetbrains/python/edu/actions/StudyNextStudyTaskAction.java @@ -5,7 +5,7 @@ import com.jetbrains.python.edu.course.Task; import javax.swing.*; -public class NextTaskAction extends TaskNavigationAction { +public class StudyNextStudyTaskAction extends StudyTaskNavigationAction { @Override protected JButton getButton(StudyEditor selectedStudyEditor) { diff --git a/python/edu/src/com/jetbrains/python/edu/actions/NextWindowAction.java b/python/edu/src/com/jetbrains/python/edu/actions/StudyNextWindowAction.java similarity index 95% rename from python/edu/src/com/jetbrains/python/edu/actions/NextWindowAction.java rename to python/edu/src/com/jetbrains/python/edu/actions/StudyNextWindowAction.java index 3938e90d8617..a4ecfda8baba 100644 --- a/python/edu/src/com/jetbrains/python/edu/actions/NextWindowAction.java +++ b/python/edu/src/com/jetbrains/python/edu/actions/StudyNextWindowAction.java @@ -17,12 +17,12 @@ import icons.StudyIcons; /** * move caret to next task window */ -public class NextWindowAction extends DumbAwareAction { +public class StudyNextWindowAction extends DumbAwareAction { public static final String ACTION_ID = "NextWindow"; public static final String SHORTCUT = "ctrl pressed PERIOD"; public static final String SHORTCUT2 = "ctrl pressed ENTER"; - public NextWindowAction() { + public StudyNextWindowAction() { super("NextWindowAction", "Select next window", StudyIcons.Next); } diff --git a/python/edu/src/com/jetbrains/python/edu/actions/PrevWindowAction.java b/python/edu/src/com/jetbrains/python/edu/actions/StudyPrevWindowAction.java similarity index 95% rename from python/edu/src/com/jetbrains/python/edu/actions/PrevWindowAction.java rename to python/edu/src/com/jetbrains/python/edu/actions/StudyPrevWindowAction.java index a98bffe527ff..3cc41511c069 100644 --- a/python/edu/src/com/jetbrains/python/edu/actions/PrevWindowAction.java +++ b/python/edu/src/com/jetbrains/python/edu/actions/StudyPrevWindowAction.java @@ -18,11 +18,11 @@ import icons.StudyIcons; * author: liana * data: 6/30/14. */ -public class PrevWindowAction extends DumbAwareAction { +public class StudyPrevWindowAction extends DumbAwareAction { public static final String ACTION_ID = "PrevWindowAction"; public static final String SHORTCUT = "ctrl pressed COMMA"; - public PrevWindowAction() { + public StudyPrevWindowAction() { super("PrevWindowAction", "Select previous window", StudyIcons.Prev); } diff --git a/python/edu/src/com/jetbrains/python/edu/actions/PreviousTaskAction.java b/python/edu/src/com/jetbrains/python/edu/actions/StudyPreviousStudyTaskAction.java similarity index 86% rename from python/edu/src/com/jetbrains/python/edu/actions/PreviousTaskAction.java rename to python/edu/src/com/jetbrains/python/edu/actions/StudyPreviousStudyTaskAction.java index 4474656f4fea..bc26c28cfabd 100644 --- a/python/edu/src/com/jetbrains/python/edu/actions/PreviousTaskAction.java +++ b/python/edu/src/com/jetbrains/python/edu/actions/StudyPreviousStudyTaskAction.java @@ -6,7 +6,7 @@ import com.jetbrains.python.edu.course.Task; import javax.swing.*; -public class PreviousTaskAction extends TaskNavigationAction { +public class StudyPreviousStudyTaskAction extends StudyTaskNavigationAction { @Override protected JButton getButton(StudyEditor selectedStudyEditor) { diff --git a/python/edu/src/com/jetbrains/python/edu/actions/RefreshTaskAction.java b/python/edu/src/com/jetbrains/python/edu/actions/StudyRefreshTaskAction.java similarity index 97% rename from python/edu/src/com/jetbrains/python/edu/actions/RefreshTaskAction.java rename to python/edu/src/com/jetbrains/python/edu/actions/StudyRefreshTaskAction.java index cf1e32ab95b5..982c8e339803 100644 --- a/python/edu/src/com/jetbrains/python/edu/actions/RefreshTaskAction.java +++ b/python/edu/src/com/jetbrains/python/edu/actions/StudyRefreshTaskAction.java @@ -23,8 +23,8 @@ import com.jetbrains.python.edu.editor.StudyEditor; import java.io.*; -public class RefreshTaskAction extends DumbAwareAction { - private static final Logger LOG = Logger.getInstance(RefreshTaskAction.class.getName()); +public class StudyRefreshTaskAction extends DumbAwareAction { + private static final Logger LOG = Logger.getInstance(StudyRefreshTaskAction.class.getName()); public void refresh(final Project project) { ApplicationManager.getApplication().invokeLater(new Runnable() { diff --git a/python/edu/src/com/jetbrains/python/edu/actions/ShowHintAction.java b/python/edu/src/com/jetbrains/python/edu/actions/StudyShowHintAction.java similarity index 97% rename from python/edu/src/com/jetbrains/python/edu/actions/ShowHintAction.java rename to python/edu/src/com/jetbrains/python/edu/actions/StudyShowHintAction.java index 80a5c45a8a2b..1efa90889449 100644 --- a/python/edu/src/com/jetbrains/python/edu/actions/ShowHintAction.java +++ b/python/edu/src/com/jetbrains/python/edu/actions/StudyShowHintAction.java @@ -24,11 +24,11 @@ import icons.StudyIcons; import java.io.File; -public class ShowHintAction extends DumbAwareAction { +public class StudyShowHintAction extends DumbAwareAction { public static final String ACTION_ID = "ShowHintAction"; public static final String SHORTCUT = "ctrl pressed 7"; - public ShowHintAction() { + public StudyShowHintAction() { super("Show hint", "Show hint", StudyIcons.ShowHint); } diff --git a/python/edu/src/com/jetbrains/python/edu/actions/TaskNavigationAction.java b/python/edu/src/com/jetbrains/python/edu/actions/StudyTaskNavigationAction.java similarity index 97% rename from python/edu/src/com/jetbrains/python/edu/actions/TaskNavigationAction.java rename to python/edu/src/com/jetbrains/python/edu/actions/StudyTaskNavigationAction.java index d9ca43b3a6ea..427313f37b26 100644 --- a/python/edu/src/com/jetbrains/python/edu/actions/TaskNavigationAction.java +++ b/python/edu/src/com/jetbrains/python/edu/actions/StudyTaskNavigationAction.java @@ -25,7 +25,7 @@ import java.util.Map; * author: liana * data: 7/21/14. */ -abstract public class TaskNavigationAction extends DumbAwareAction { +abstract public class StudyTaskNavigationAction extends DumbAwareAction { public void navigateTask(Project project) { Editor selectedEditor = StudyEditor.getSelectedEditor(project); FileDocumentManager fileDocumentManager = FileDocumentManager.getInstance(); diff --git a/python/edu/src/com/jetbrains/python/edu/editor/StudyEditor.java b/python/edu/src/com/jetbrains/python/edu/editor/StudyEditor.java index 4acdc8c1cc3e..ac3ac64d26a8 100644 --- a/python/edu/src/com/jetbrains/python/edu/editor/StudyEditor.java +++ b/python/edu/src/com/jetbrains/python/edu/editor/StudyEditor.java @@ -121,38 +121,39 @@ public class StudyEditor implements FileEditor { watchInputButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - WatchInputAction watchInputAction = (WatchInputAction)ActionManager.getInstance().getAction("WatchInputAction"); - watchInputAction.showInput(project); + StudyEditInputAction studyEditInputAction = (StudyEditInputAction)ActionManager.getInstance().getAction("WatchInputAction"); + studyEditInputAction.showInput(project); } }); } myCheckButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - CheckAction checkAction = (CheckAction)ActionManager.getInstance().getAction("CheckAction"); - checkAction.check(project); + StudyCheckAction studyCheckAction = (StudyCheckAction)ActionManager.getInstance().getAction("CheckAction"); + studyCheckAction.check(project); } }); myNextTaskButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - NextTaskAction nextTaskAction = (NextTaskAction)ActionManager.getInstance().getAction("NextTaskAction"); - nextTaskAction.navigateTask(project); + StudyNextStudyTaskAction studyNextTaskAction = (StudyNextStudyTaskAction)ActionManager.getInstance().getAction("NextTaskAction"); + studyNextTaskAction.navigateTask(project); } }); myPrevTaskButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - PreviousTaskAction prevTaskAction = (PreviousTaskAction)ActionManager.getInstance().getAction("PreviousTaskAction"); + StudyPreviousStudyTaskAction + prevTaskAction = (StudyPreviousStudyTaskAction)ActionManager.getInstance().getAction("PreviousTaskAction"); prevTaskAction.navigateTask(project); } }); myRefreshButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - RefreshTaskAction refreshTaskAction = (RefreshTaskAction)ActionManager.getInstance().getAction("RefreshTaskAction"); - refreshTaskAction.refresh(project); + StudyRefreshTaskAction studyRefreshTaskAction = (StudyRefreshTaskAction)ActionManager.getInstance().getAction("RefreshTaskAction"); + studyRefreshTaskAction.refresh(project); } }); } diff --git a/python/edu/src/com/jetbrains/python/edu/ui/TestContentPanel.java b/python/edu/src/com/jetbrains/python/edu/ui/StudyTestContentPanel.java similarity index 95% rename from python/edu/src/com/jetbrains/python/edu/ui/TestContentPanel.java rename to python/edu/src/com/jetbrains/python/edu/ui/StudyTestContentPanel.java index 1bef9366b0d5..dee4fbaf9d01 100644 --- a/python/edu/src/com/jetbrains/python/edu/ui/TestContentPanel.java +++ b/python/edu/src/com/jetbrains/python/edu/ui/StudyTestContentPanel.java @@ -10,12 +10,12 @@ import javax.swing.event.DocumentEvent; import javax.swing.text.BadLocationException; import java.awt.*; -public class TestContentPanel extends JPanel { +public class StudyTestContentPanel extends JPanel { public static final Dimension PREFERRED_SIZE = new Dimension(300, 200); private static final Font HEADER_FONT = new Font("Arial", Font.BOLD, 16); private final JTextArea myInputArea = new JTextArea(); private final JTextArea myOutputArea = new JTextArea(); - public TestContentPanel(UserTest userTest) { + public StudyTestContentPanel(UserTest userTest) { this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); initContentLabel("input", myInputArea); myInputArea.getDocument().addDocumentListener(new BufferUpdater(userTest.getInputBuffer()));