From b5a75b96faa137ea7e527307e182478f1e5e769b Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 27 Jan 2014 17:17:44 +0400 Subject: [PATCH] Show 'Logs' tab and extensions in run configurations The code is copied from JUnitConfiguration, TestNGConfiguration and ApplicationConfiguration (it's the same in those three places) --- .../jet/plugin/run/JetRunConfiguration.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java index 068fb6c60c1..7c6ca3d3862 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.plugin.run; +import com.intellij.diagnostic.logging.LogConfigurationPanel; import com.intellij.execution.*; import com.intellij.execution.configuration.EnvironmentVariablesComponent; import com.intellij.execution.configurations.*; @@ -26,7 +27,10 @@ import com.intellij.openapi.components.PathMacroManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.options.SettingsEditor; -import com.intellij.openapi.util.*; +import com.intellij.openapi.options.SettingsEditorGroup; +import com.intellij.openapi.util.DefaultJDOMExternalizer; +import com.intellij.openapi.util.InvalidDataException; +import com.intellij.openapi.util.WriteExternalException; import org.jdom.Element; import org.jetbrains.annotations.NotNull; @@ -63,9 +67,14 @@ public class JetRunConfiguration extends ModuleBasedConfiguration getConfigurationEditor() { - return new JetRunConfigurationEditor(getProject()); + SettingsEditorGroup group = new SettingsEditorGroup(); + group.addEditor(ExecutionBundle.message("run.configuration.configuration.tab.title"), new JetRunConfigurationEditor(getProject())); + JavaRunConfigurationExtensionManager.getInstance().appendEditors(this, group); + group.addEditor(ExecutionBundle.message("logs.tab.title"), new LogConfigurationPanel()); + return group; } @Override