From 1e6a387db4a4255179fcf29759f1a27182ea2d1f Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Thu, 13 May 2010 19:44:55 +0400
Subject: [PATCH] cleanup

---
 .../applet/AppletConfigurationProducer.java      |  3 +--
 .../execution/actions/PreferedProducerFind.java  | 16 ++++++++++++++++
 .../junit/RuntimeConfigurationProducer.java      | 11 -----------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java
index 640656aae5b9..4c6706faf070 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java
@@ -22,7 +22,6 @@ package com.intellij.execution.applet;
 
 import com.intellij.execution.JavaExecutionUtil;
 import com.intellij.execution.Location;
-import com.intellij.execution.RunManagerEx;
 import com.intellij.execution.RunnerAndConfigurationSettings;
 import com.intellij.execution.actions.ConfigurationContext;
 import com.intellij.execution.junit.JUnitUtil;
@@ -57,7 +56,7 @@ public class AppletConfigurationProducer extends JavaRuntimeConfigurationProduce
     final PsiElement element = location.getPsiElement();
     myPsiClass = getAppletClass(element, PsiManager.getInstance(project));
     if (myPsiClass == null) return null;
-    RunnerAndConfigurationSettings settings = RunManagerEx.getInstanceEx(project).createConfiguration("", getConfigurationFactory());
+    RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context);
     final AppletConfiguration configuration = (AppletConfiguration)settings.getConfiguration();
     configuration.MAIN_CLASS_NAME = JavaExecutionUtil.getRuntimeQualifiedName(myPsiClass);
     configuration.setModule(new JUnitUtil.ModuleOfClass().convert(myPsiClass));
diff --git a/platform/lang-api/src/com/intellij/execution/actions/PreferedProducerFind.java b/platform/lang-api/src/com/intellij/execution/actions/PreferedProducerFind.java
index 97284c476e5a..502580dd600f 100644
--- a/platform/lang-api/src/com/intellij/execution/actions/PreferedProducerFind.java
+++ b/platform/lang-api/src/com/intellij/execution/actions/PreferedProducerFind.java
@@ -114,6 +114,22 @@ class PreferedProducerFind {
       return ((LocatableConfigurationType)getConfigurationType()).createConfigurationByLocation(location);
     }
 
+    @Override
+    protected RunnerAndConfigurationSettings findExistingByElement(Location location,
+                                                                   @NotNull RunnerAndConfigurationSettings[] existingConfigurations) {
+      if (existingConfigurations.length > 0) {
+        ConfigurationType type = existingConfigurations[0].getType();
+        if (type instanceof LocatableConfigurationType) {
+          for (final RunnerAndConfigurationSettings configuration : existingConfigurations) {
+            if (((LocatableConfigurationType)type).isConfigurationByLocation(configuration.getConfiguration(), location)) {
+              return configuration;
+            }
+          }
+        }
+      }
+      return null;
+    }
+
     public int compareTo(final Object o) {
       return PREFERED;
     }
diff --git a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
index 25ff1553e1bf..81b9a7184a0e 100644
--- a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
+++ b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
@@ -80,17 +80,6 @@ public abstract class RuntimeConfigurationProducer implements Comparable {
   @Nullable
   protected RunnerAndConfigurationSettings findExistingByElement(final Location location,
                                                                  @NotNull final RunnerAndConfigurationSettings[] existingConfigurations) {
-    if (existingConfigurations.length > 0) {
-      ConfigurationType type = existingConfigurations[0].getType();
-      if (type instanceof LocatableConfigurationType) {
-        for (final RunnerAndConfigurationSettings configuration : existingConfigurations) {
-          if (((LocatableConfigurationType)type).isConfigurationByLocation(configuration.getConfiguration(), location)) {
-            return configuration;
-          }
-        }
-      }
-    }
-
     return null;
   }