Merge remote-tracking branch 'origin/master'

java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java

@@ -69,8 +69,8 @@ public class AppletConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
   @NonNls
   protected static final String PARAMETER_ELEMENT_NAME = "parameter";
 
-  public AppletConfiguration(final String name, final Project project, ConfigurationFactory factory) {
-    super(name, new JavaRunConfigurationModule(project, false), factory);
+  public AppletConfiguration(final Project project, ConfigurationFactory factory) {
+    super(new JavaRunConfigurationModule(project, false), factory);
   }
 
   public void setMainClass(final PsiClass psiClass) {

java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationType.java

@@ -36,7 +36,7 @@ public class AppletConfigurationType implements ConfigurationType {
   AppletConfigurationType() {
     myFactory = new ConfigurationFactoryEx(this) {
       public RunConfiguration createTemplateConfiguration(Project project) {
-        return new AppletConfiguration("", project, this);
+        return new AppletConfiguration(project, this);
       }
 
       @Override

java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java

@@ -65,8 +65,8 @@ public class RemoteConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
   public String HOST;
   public String PORT;
 
-  public RemoteConfiguration(final String name, final Project project, ConfigurationFactory configurationFactory) {
-    super(name, new JavaRunConfigurationModule(project, true), configurationFactory);
+  public RemoteConfiguration(final Project project, ConfigurationFactory configurationFactory) {
+    super(new JavaRunConfigurationModule(project, true), configurationFactory);
   }
 
   public RemoteConnection createRemoteConnection() {

java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurationType.java

@@ -40,7 +40,7 @@ public class RemoteConfigurationType implements ConfigurationType {
   public RemoteConfigurationType() {
     myFactory = new ConfigurationFactory(this) {
       public RunConfiguration createTemplateConfiguration(Project project) {
-        return new RemoteConfiguration("", project, this);
+        return new RemoteConfiguration(project, this);
       }
 
     };

platform/lang-api/src/com/intellij/execution/configuration/AbstractRunConfiguration.java

@@ -3,6 +3,7 @@ package com.intellij.execution.configuration;
 import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.configurations.ModuleBasedConfiguration;
 import com.intellij.execution.configurations.RunConfigurationModule;
+import com.intellij.openapi.project.Project;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -18,6 +19,10 @@ public abstract class AbstractRunConfiguration extends ModuleBasedConfiguration<
     super(name, configurationModule, factory);
   }
 
+  public AbstractRunConfiguration(Project project, ConfigurationFactory factory) {
+    super(new RunConfigurationModule(project), factory);
+  }
+
   public Map<String, String> getEnvs() {
     return myEnvs;
   }

platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java

@@ -45,6 +45,11 @@ public abstract class ModuleBasedConfiguration<ConfigurationModule extends RunCo
     myModule = configurationModule;
   }
 
+  public ModuleBasedConfiguration(final ConfigurationModule configurationModule, final ConfigurationFactory factory) {
+    super("", configurationModule.getProject(), factory);
+    myModule = configurationModule;
+  }
+
   public abstract Collection<Module> getValidModules();
 
   public ConfigurationModule getConfigurationModule() {

platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java

@@ -58,6 +58,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
+import java.awt.event.ContainerEvent;
 import java.io.File;
 import java.util.*;
 import java.util.List;
@@ -827,6 +828,11 @@ public class EditorsSplitters extends JBPanel {
       if (component != null) {
         newWindow = findWindowWith(component);
       }
+      else if (cause instanceof ContainerEvent && cause.getID() == ContainerEvent.COMPONENT_REMOVED) {
+        // do not change current window in case of child removal as in JTable.removeEditor
+        // otherwise Escape in a toolwindow will not focus editor with JTable content
+        return;
+      }
 
       setCurrentWindow(newWindow);
       setCurrentWindow(newWindow, false);