diff options
Diffstat (limited to 'platform/lang-impl/src/com/intellij/execution/impl')
3 files changed, 16 insertions, 15 deletions
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java b/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java index de5405b87a89..191c0f79b25c 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import com.intellij.openapi.actionSystem.impl.SimpleDataContext; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; -import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.Conditions; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.SystemInfo; @@ -300,7 +300,7 @@ class BeforeRunStepsPanel extends JPanel { final ListPopup popup = popupFactory.createActionGroupPopup(ExecutionBundle.message("add.new.run.configuration.acrtion.name"), actionGroup, SimpleDataContext.getProjectContext(myRunConfiguration.getProject()), false, false, false, null, - -1, Condition.TRUE); + -1, Conditions.<AnAction>alwaysTrue()); popup.show(button.getPreferredPopupPoint()); } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java index 3fce510e725e..ae5cfe829f6c 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java @@ -290,9 +290,16 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo myFilters = new CompositeFilter(project); if (usePredefinedMessageFilter) { for (ConsoleFilterProvider eachProvider : Extensions.getExtensions(ConsoleFilterProvider.FILTER_PROVIDERS)) { - Filter[] filters = eachProvider instanceof ConsoleFilterProviderEx - ? ((ConsoleFilterProviderEx)eachProvider).getDefaultFilters(project, searchScope) - : eachProvider.getDefaultFilters(project); + Filter[] filters; + if (eachProvider instanceof ConsoleDependentFilterProvider) { + filters = ((ConsoleDependentFilterProvider)eachProvider).getDefaultFilters(this, project, searchScope); + } + else if (eachProvider instanceof ConsoleFilterProviderEx) { + filters = ((ConsoleFilterProviderEx)eachProvider).getDefaultFilters(project, searchScope); + } + else { + filters = eachProvider.getDefaultFilters(project); + } for (Filter filter : filters) { myFilters.addFilter(filter); } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java index 95d4db09c297..1a006c294275 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java @@ -588,15 +588,9 @@ class RunConfigurable extends BaseConfigurable { @Override public JComponent createComponent() { - for (RunConfigurationsSettings each : Extensions.getExtensions(RunConfigurationsSettings.EXTENSION_POINT)) { - try { - UnnamedConfigurable configurable = each.createConfigurable(myProject); - myAdditionalSettings.add(Pair.create(configurable, configurable.createComponent())); - } - catch (NoSuchMethodError e) { - // in case someone has already implemented old RunConfigurationsSettings.createConfigurable() - LOG.error(e); - } + for (RunConfigurationsSettings each : Extensions.getExtensions(RunConfigurationsSettings.EXTENSION_POINT, myProject)) { + UnnamedConfigurable configurable = each.createConfigurable(); + myAdditionalSettings.add(Pair.create(configurable, configurable.createComponent())); } myWholePanel = new JPanel(new BorderLayout()); |