Merge branch 'master' of git@git.labs.intellij.net:idea/community

platform/lang-impl/src/com/intellij/refactoring/actions/ExtractSuperclassAction.java

@@ -20,6 +20,11 @@ import com.intellij.lang.refactoring.RefactoringSupportProvider;
 import com.intellij.refactoring.RefactoringActionHandler;
 
 public class ExtractSuperclassAction extends ExtractSuperActionBase {
+  
+  public ExtractSuperclassAction() {
+    setInjectedContext(true);
+  }
+
   @Override
   protected RefactoringActionHandler getRefactoringHandler(RefactoringSupportProvider supportProvider) {
     return supportProvider.getExtractSuperClassHandler();

platform/platform-resources-en/src/messages/RefactoringBundle.properties

@@ -100,6 +100,7 @@ delegate.members=Delegate members
 generate.getter.for.delegated.component=Generate &getter for delegated component
 package.for.new.superclass=&Package for new superclass:
 package.for.original.class=&Package for original class:
+package.for.original.interface=&Package for original interface:
 ExtractSuperClass.superclass=Superclass
 members.to.form.superclass=Members to form superclass
 no.superclass.name.specified=No superclass name specified
@@ -111,6 +112,7 @@ extractSuperInterface.interface=Interface
 members.to.form.interface=Members to form interface
 extract.interface.from=Extract interface from:
 rename.implementation.class.to=Rename implementation class to:
+rename.original.interface.to=Rename original interface to:
 extractSuperInterface.javadoc=JavaDoc
 no.interface.name.specified=No interface name specified
 replace.all.occurences=Replace &all occurrences ({0} occurrences)