diff options
Diffstat (limited to 'plugins/junit/src/com')
4 files changed, 5 insertions, 11 deletions
diff --git a/plugins/junit/src/com/intellij/execution/junit/AddToTestsPatternAction.java b/plugins/junit/src/com/intellij/execution/junit/AddToTestsPatternAction.java index 03bc8450a764..3dad8e9d8302 100644 --- a/plugins/junit/src/com/intellij/execution/junit/AddToTestsPatternAction.java +++ b/plugins/junit/src/com/intellij/execution/junit/AddToTestsPatternAction.java @@ -97,7 +97,8 @@ public class AddToTestsPatternAction extends AnAction { } private static List<JUnitConfiguration> collectPatternConfigurations(Set<PsiMember> foundClasses, Project project) { - final RunConfiguration[] configurations = RunManager.getInstance(project).getConfigurations(JUnitConfigurationType.getInstance()); + final List<RunConfiguration> configurations = RunManager.getInstance(project).getConfigurationsList( + JUnitConfigurationType.getInstance()); final List<JUnitConfiguration> foundConfigurations = new ArrayList<JUnitConfiguration>(); for (RunConfiguration configuration : configurations) { final JUnitConfiguration.Data data = ((JUnitConfiguration)configuration).getPersistentData(); diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java index cdd5ad02b84f..1020065d44fc 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java @@ -295,6 +295,7 @@ public abstract class TestObject implements JavaCommandLine { } } }; + Disposer.register(consoleView, packetsReceiver); final DeferredActionsQueue queue = new DeferredActionsQueueImpl(); handler.getOut().setPacketDispatcher(packetsReceiver, queue); diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java index 4be99aea9a8d..d564b54a6f2f 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java +++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java @@ -31,14 +31,13 @@ import com.intellij.execution.ui.ClassBrowser; import com.intellij.execution.ui.CommonJavaParametersPanel; import com.intellij.execution.ui.ConfigurationModuleSelector; import com.intellij.icons.AllIcons; -import com.intellij.openapi.fileTypes.PlainTextLanguage; -import com.intellij.ui.ListCellRendererWrapper; import com.intellij.ide.util.ClassFilter; import com.intellij.ide.util.PackageChooserDialog; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.fileChooser.FileChooserFactory; +import com.intellij.openapi.fileTypes.PlainTextLanguage; import com.intellij.openapi.module.Module; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; @@ -47,10 +46,7 @@ import com.intellij.openapi.ui.ex.MessagesEx; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.ui.EditorTextField; -import com.intellij.ui.EditorTextFieldWithBrowseButton; -import com.intellij.ui.InsertPathAction; -import com.intellij.ui.PanelWithAnchor; +import com.intellij.ui.*; import com.intellij.ui.components.JBLabel; import com.intellij.util.IconUtil; import com.intellij.util.TextFieldCompletionProvider; @@ -577,9 +573,6 @@ public class JUnitConfigurable extends SettingsEditor<JUnitConfiguration> implem return myWholePanel; } - public void disposeEditor() { - } - private void applyHelpersTo(final JUnitConfiguration currentState) { myCommonJavaParameters.applyTo(currentState); getModuleSelector().applyTo(currentState); diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/TestsPacketsReceiver.java b/plugins/junit/src/com/intellij/execution/junit2/ui/TestsPacketsReceiver.java index b6c1257a4b6c..90aa44287e96 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/TestsPacketsReceiver.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/TestsPacketsReceiver.java @@ -83,7 +83,6 @@ public class TestsPacketsReceiver implements OutputPacketProcessor, Disposable { myUnboundOutput = unboundOutput; myObjectRegistry = new InputObjectRegistry(); myConsoleProperties = (JUnitConsoleProperties)consoleView.getProperties(); - Disposer.register(consoleView, this); } @Override |