renamed static import -> import static (IDEA-161681)

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportConstantFix.java

@@ -40,7 +40,7 @@ public class StaticImportConstantFix extends StaticImportMemberFix<PsiField> {
   @NotNull
   @Override
   protected String getBaseText() {
-    return "Static import constant";
+    return "Import static constant";
   }
 
   @NotNull

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java

@@ -15,12 +15,10 @@
  */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
-import com.intellij.codeInsight.JavaProjectCodeInsightSettings;
 import com.intellij.codeInsight.daemon.QuickFixBundle;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.resolve.DefaultParameterTypeInferencePolicy;
 import com.intellij.psi.infos.MethodCandidateInfo;
 import com.intellij.psi.search.PsiShortNamesCache;
 import com.intellij.psi.util.PsiFormatUtil;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportConstant/afterConstant.java

@@ -1,4 +1,4 @@
-// "Static import constant..." "true"
+// "Import static constant..." "true"
 package foo;
 
 import static foo.B.aaaaaaa;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportConstant/afterConstantInAssignment.java

@@ -1,4 +1,4 @@
-// "Static import constant 'foo.B.aaaaaaa'" "true"
+// "Import static constant 'foo.B.aaaaaaa'" "true"
 package foo;
 
 import static foo.B.aaaaaaa;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportConstant/beforeConstant.java

@@ -1,4 +1,4 @@
-// "Static import constant..." "true"
+// "Import static constant..." "true"
 package foo;
 
 public class X {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportConstant/beforeConstantInAssignment.java

@@ -1,4 +1,4 @@
-// "Static import constant 'foo.B.aaaaaaa'" "true"
+// "Import static constant 'foo.B.aaaaaaa'" "true"
 package foo;
 
 public class X {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportConstant/beforeConstantOnTheLeftSideOfAssignment.java

@@ -1,4 +1,4 @@
-// "Static import constant 'foo.B.K'" "false"
+// "Import static constant 'foo.B.K'" "false"
 package foo;
 
 public class X {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportConstant/beforeConstantOnTypeElementPlace.java

@@ -1,4 +1,4 @@
-// "Static import constant 'foo.B.K'" "false"
+// "Import static constant 'foo.B.K'" "false"
 package foo;
 
 public class X {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportConstant/beforeStringConstant.java

@@ -1,4 +1,4 @@
-// "Static import constant 'foo.B.String'" "false"
+// "Import static constant 'foo.B.String'" "false"
 package foo;
 
 public class X {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/after1.java

@@ -1,6 +1,6 @@
 import static java.lang.Integer.parseInt;
 
-// "Static import method 'java.lang.Integer.parseInt'" "true"
+// "Import static method 'java.lang.Integer.parseInt'" "true"
 public class X {
     {
         <caret>parseInt("",10);

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/after2.java

@@ -1,4 +1,4 @@
-// "Static import method..." "true"
+// "Import static method..." "true"
 package p;
 
 import static p.FFF.myEqualTo;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/afterOverloads.java

@@ -1,4 +1,4 @@
-// "Static import method..." "true"
+// "Import static method..." "true"
 package foo;
 
 import static foo.B.a;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/afterReplaceAllRefs.java

@@ -1,6 +1,6 @@
 import static java.lang.String.format;
 
-// "Static import method 'java.lang.String.format'" "true"
+// "Import static method 'java.lang.String.format'" "true"
 public class X {
     {
       format("");

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/afterReturnType.java

@@ -1,4 +1,4 @@
-// "Static import method 'foo.B.aaaaaaa'" "true"
+// "Import static method 'foo.B.aaaaaaa'" "true"
 package foo;
 
 import static foo.B.aaaaaaa;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/afterVarargs.java

@@ -1,4 +1,4 @@
-// "Static import method 'foo.B.aaaaaaa'" "true"
+// "Import static method 'foo.B.aaaaaaa'" "true"
 package foo;
 
 import static foo.B.aaaaaaa;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/before1.java

@@ -1,4 +1,4 @@
-// "Static import method 'java.lang.Integer.parseInt'" "true"
+// "Import static method 'java.lang.Integer.parseInt'" "true"
 public class X {
     {
         <caret>parseInt("",10);

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/before2.java

@@ -1,4 +1,4 @@
-// "Static import method..." "true"
+// "Import static method..." "true"
 package p;
 public class X {
   public void test() throws Exception {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/beforeInacceptable.java

@@ -1,4 +1,4 @@
-// "Static import method 'foo.B.aaaaaaa'" "false"
+// "Import static method 'foo.B.aaaaaaa'" "false"
 package foo;
 
 public class X {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/beforeOverloads.java

@@ -1,4 +1,4 @@
-// "Static import method..." "true"
+// "Import static method..." "true"
 package foo;
 
 public class X {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/beforeQualified.java

@@ -1,4 +1,4 @@
-// "Static import method 'java.lang.Integer.parseInt'" "false"
+// "Import static method 'java.lang.Integer.parseInt'" "false"
 public class X {
     {
         this.<caret>parseInt("",10);

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/beforeReplaceAllRefs.java

@@ -1,4 +1,4 @@
-// "Static import method 'java.lang.String.format'" "true"
+// "Import static method 'java.lang.String.format'" "true"
 public class X {
     {
       String.format("");

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/beforeReturnType.java

@@ -1,4 +1,4 @@
-// "Static import method 'foo.B.aaaaaaa'" "true"
+// "Import static method 'foo.B.aaaaaaa'" "true"
 package foo;
 public class X {
     {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/beforeVarargs.java

@@ -1,4 +1,4 @@
-// "Static import method 'foo.B.aaaaaaa'" "true"
+// "Import static method 'foo.B.aaaaaaa'" "true"
 package foo;
 
 public class X {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod8/after1.java

@@ -1,4 +1,4 @@
-// "Static import method 'java.util.Collections.emptyList'" "true"
+// "Import static method 'java.util.Collections.emptyList'" "true"
 import java.util.List;
 
 import static java.util.Collections.emptyList;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod8/before1.java

@@ -1,4 +1,4 @@
-// "Static import method 'java.util.Collections.emptyList'" "true"
+// "Import static method 'java.util.Collections.emptyList'" "true"
 import java.util.List;
 public class X {
     List<String> get() {

resources-en/src/messages/QuickFixBundle.properties

@@ -225,7 +225,7 @@ orderEntry.fix.add.library.to.classpath=Add library ''{0}'' to classpath
 orderEntry.fix.family.add.library.to.classpath=Add library to classpath
 orderEntry.fix.circular.dependency.warning=Adding dependency on module ''{0}'' will introduce circular dependency between modules ''{1}'' and ''{2}''.\nAdd dependency anyway?
 orderEntry.fix.title.circular.dependency.warning=Circular Dependency Warning
-static.import.method.text=Static import method
+static.import.method.text=Import static method
 static.import.method.choose.method.to.import=Choose Method to Import
 
 add.library.title.dialog=Add ''{0}'' Library to Project