diff --git a/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java b/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java index 36ca4da6b46a..f2c8a028a57c 100644 --- a/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java +++ b/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java @@ -53,8 +53,7 @@ public abstract class RunConfigurationExtension { public abstract SettingsEditor createEditor(RunConfigurationBase configuration); public abstract String getEditorTitle(); public abstract String getName(); - @Nullable - public abstract Icon getIcon(RunConfigurationBase runConfiguration); + public abstract void updateJavaParameters(final T configuration, final JavaParameters params, RunnerSettings runnerSettings); protected abstract void readExternal(RunConfigurationBase runConfiguration, Element element) throws InvalidDataException; @@ -94,15 +93,7 @@ public abstract class RunConfigurationExtension { } } - public static Icon getIcon(RunConfigurationBase configuration, Icon icon) { - for (RunConfigurationExtension extension : Extensions.getExtensions(EP_NAME)) { - final Icon extIcon = extension.getIcon(configuration); - if (extIcon != null) { - return LayeredIcon.create(icon, extIcon); - } - } - return icon; - } + public static void readSettings(RunConfigurationBase runConfiguration, Element parentNode) throws InvalidDataException { final List children = parentNode.getChildren("extension"); diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationType.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationType.java index aaa321b09ad3..7d1ea6033393 100644 --- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationType.java +++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationType.java @@ -50,7 +50,7 @@ public class ApplicationConfigurationType implements ConfigurationType { @Override public Icon getIcon(@NotNull final RunConfiguration configuration) { - return RunConfigurationExtension.getIcon((ApplicationConfiguration)configuration, getIcon()); + return getIcon(); } @Override diff --git a/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionsManager.java b/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionsManager.java index cf5ab083b125..72c4956fd366 100644 --- a/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionsManager.java +++ b/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionsManager.java @@ -86,11 +86,6 @@ public class RunConfigurationExtensionsManager void appendEditors(@NotNull final U configuration, @NotNull final SettingsEditorGroup group) { for (T extension : getApplicableExtensions(configuration)) { diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java index a71ae85b6b65..594a054fdb0e 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java @@ -45,7 +45,7 @@ public class JUnitConfigurationType implements ConfigurationType { @Override public Icon getIcon(@NotNull final RunConfiguration configuration) { - return RunConfigurationExtension.getIcon((JUnitConfiguration)configuration, getIcon()); + return getIcon(); } @Override diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java index 5f7da52415b4..08cb9c134888 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java @@ -59,7 +59,7 @@ public class TestNGConfigurationType implements ConfigurationType @Override public Icon getIcon(@NotNull final RunConfiguration configuration) { - return RunConfigurationExtension.getIcon((TestNGConfiguration)configuration, ICON); + return ICON; } @Override @@ -73,11 +73,7 @@ public class TestNGConfigurationType implements ConfigurationType return ConfigurationTypeUtil.findConfigurationType(TestNGConfigurationType.class); } - public RunnerAndConfigurationSettings createConfigurationByLocation(Location location) { - return null; - } - - public boolean isConfigurationByLocation(RunConfiguration runConfiguration, Location location) { + public boolean isConfigurationByLocation(RunConfiguration runConfiguration, Location location) { TestNGConfiguration config = (TestNGConfiguration) runConfiguration; TestData testobject = config.getPersistantData(); if (testobject == null) diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterConfigurationExtension.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterConfigurationExtension.java index f6890d3b2a72..b2d96791bb6b 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterConfigurationExtension.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterConfigurationExtension.java @@ -45,7 +45,6 @@ import gnu.trove.THashMap; import org.jdom.Document; import org.jdom.Element; -import javax.swing.*; import java.io.IOException; import java.util.Set; import java.util.TreeSet; @@ -131,11 +130,6 @@ public class SnapShooterConfigurationExtension extends RunConfigurationExtension return "snapshooter"; } - @Override - public Icon getIcon(RunConfigurationBase runConfiguration) { - return null; - } - @Override public void readExternal(RunConfigurationBase runConfiguration, Element element) throws InvalidDataException {