From 922040b4dd961d7a072157f99406966e6235034a Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 12 Jul 2019 21:47:34 +0200
Subject: [PATCH] java: remove FQNs from change type fixes (IDEA-145570)

GitOrigin-RevId: d6bca8039c7d47615cb40ed2def7f5572784e99b
---
 .../codeInsight/daemon/impl/quickfix/VariableTypeFix.java       | 2 +-
 .../daemon/impl/quickfix/VariableTypeFromCallFix.java           | 2 +-
 .../daemonCodeAnalyzer/quickFix/varTypeFromCall/after1.java     | 2 +-
 .../quickFix/varTypeFromCall/after2TypeParamsInOneCall.java     | 2 +-
 .../quickFix/varTypeFromCall/afterAnotherParamTypeChange.java   | 2 +-
 .../quickFix/varTypeFromCall/afterBoxing.java                   | 2 +-
 .../quickFix/varTypeFromCall/afterCompound.java                 | 2 +-
 .../daemonCodeAnalyzer/quickFix/varTypeFromCall/afterMixed.java | 2 +-
 .../quickFix/varTypeFromCall/afterOnNonGenericQualifier.java    | 2 +-
 .../daemonCodeAnalyzer/quickFix/varTypeFromCall/before1.java    | 2 +-
 .../quickFix/varTypeFromCall/before2TypeParamsInOneCall.java    | 2 +-
 .../quickFix/varTypeFromCall/beforeAnotherParamTypeChange.java  | 2 +-
 .../quickFix/varTypeFromCall/beforeBoxing.java                  | 2 +-
 .../quickFix/varTypeFromCall/beforeCompound.java                | 2 +-
 .../quickFix/varTypeFromCall/beforeMixed.java                   | 2 +-
 .../quickFix/varTypeFromCall/beforeOnNonGenericQualifier.java   | 2 +-
 .../quickFix/variableParameterizedType/after1.java              | 2 +-
 .../quickFix/variableParameterizedType/before1.java             | 2 +-
 .../quickFix/variableParameterizedType/before2.java             | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/after2.java        | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/after4.java        | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/after5.java        | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/afterBoxed.java    | 2 +-
 .../afterFailedInferenceDueToWrongExpectedType.java             | 2 +-
 .../afterFailedInferenceDueToWrongExpectedTypeAssignment.java   | 2 +-
 ...afterFailedInferenceDueToWrongExpectedTypeNotApplicable.java | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/afterInCall.java   | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/afterVararg.java   | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/before2.java       | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/before4.java       | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/before5.java       | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/beforeBoxed.java   | 2 +-
 .../beforeFailedInferenceDueToWrongExpectedType.java            | 2 +-
 .../beforeFailedInferenceDueToWrongExpectedTypeAssignment.java  | 2 +-
 ...eforeFailedInferenceDueToWrongExpectedTypeNotApplicable.java | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/beforeInCall.java  | 2 +-
 .../daemonCodeAnalyzer/quickFix/variableType/beforeVararg.java  | 2 +-
 .../typeMigration/TypeMigrationVariableTypeFixProvider.java     | 2 +-
 .../plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java   | 2 +-
 39 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java
index 97d588066612..8c8161261988 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java
@@ -59,7 +59,7 @@ public class VariableTypeFix extends LocalQuickFixAndIntentionActionOnPsiElement
     return QuickFixBundle.message("fix.variable.type.text",
                                   UsageViewUtil.getType(getStartElement()),
                                   myName,
-                                  type == null || !type.isValid() ? "???" : type.getCanonicalText());
+                                  type == null || !type.isValid() ? "???" : type.getPresentableText());
   }
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFromCallFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFromCallFix.java
index 48f064478072..f719970f2500 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFromCallFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFromCallFix.java
@@ -38,7 +38,7 @@ public class VariableTypeFromCallFix implements IntentionAction {
     return QuickFixBundle.message("fix.variable.type.text",
                                   UsageViewUtil.getType(myVar),
                                   myVar.getName(),
-                                  myExpressionType.getCanonicalText());
+                                  myExpressionType.getPresentableText());
   }
 
   @Override
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after1.java
index f5d44dbe1839..335a3e3dacd7 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after1.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'List<java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'List<Integer>'" "true"
 public class Test {
   void foo()  {
     List<Integer> list = new List<>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after2TypeParamsInOneCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after2TypeParamsInOneCall.java
index a7a54e2f5314..0720de1372b3 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after2TypeParamsInOneCall.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after2TypeParamsInOneCall.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'Lost<java.lang.String,java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'Lost<String, Integer>'" "true"
 public class Test {
   void foo()  {
     Lost<String, Integer> list = new Lost<>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterAnotherParamTypeChange.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterAnotherParamTypeChange.java
index fbae0b98b25b..702ded86f80c 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterAnotherParamTypeChange.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterAnotherParamTypeChange.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'Lost<java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'Lost<Integer>'" "true"
 public class Test {
   void foo()  {
     Lost<Integer> list = new Lost<>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterBoxing.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterBoxing.java
index 0818ad2a9ac3..78d463521eb7 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterBoxing.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterBoxing.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'List<java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'List<Integer>'" "true"
 public class Test {
   void foo()  {
     List<Integer> list = new List<>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterCompound.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterCompound.java
index 67cc9ed9f6bd..1ec74b76bdcf 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterCompound.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterCompound.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'Lost<java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'Lost<Integer>'" "true"
 public class Test {
   void foo()  {
     Lost<Integer> list = new Lost<>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterMixed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterMixed.java
index ce1f568e7cc5..935dac7e4d63 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterMixed.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterMixed.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'Lost<java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'Lost<Integer>'" "true"
 public class Test {
   void foo()  {
     Lost<Integer> list = new Lost<>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterOnNonGenericQualifier.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterOnNonGenericQualifier.java
index 4b9e364718cf..3626b4f59aeb 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterOnNonGenericQualifier.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterOnNonGenericQualifier.java
@@ -1,4 +1,4 @@
-// "Change field 'f' type to 'java.lang.String'" "true"
+// "Change field 'f' type to 'String'" "true"
 class Test {
   String f;
   void foo(A a)  {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before1.java
index d35d424c2488..2626d393cd25 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before1.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'List<java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'List<Integer>'" "true"
 public class Test {
   void foo()  {
     List<String> list = new List<String>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before2TypeParamsInOneCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before2TypeParamsInOneCall.java
index 9dd0ab113f92..7f0e084f4154 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before2TypeParamsInOneCall.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before2TypeParamsInOneCall.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'Lost<java.lang.String,java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'Lost<String, Integer>'" "true"
 public class Test {
   void foo()  {
     Lost<String, String> list = new Lost<String, String>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeAnotherParamTypeChange.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeAnotherParamTypeChange.java
index f4558d127cd1..ab66a1dbfa19 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeAnotherParamTypeChange.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeAnotherParamTypeChange.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'Lost<java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'Lost<Integer>'" "true"
 public class Test {
   void foo()  {
     Lost<String> list = new Lost<String>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeBoxing.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeBoxing.java
index 88778caa7dbe..dad30c7b3cd5 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeBoxing.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeBoxing.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'List<java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'List<Integer>'" "true"
 public class Test {
   void foo()  {
     List<String> list = new List<String>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeCompound.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeCompound.java
index 7f2dc11db7b0..e7ec71eb51bc 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeCompound.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeCompound.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'Lost<java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'Lost<Integer>'" "true"
 public class Test {
   void foo()  {
     Lost<String> list = new Lost<String>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeMixed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeMixed.java
index 074e647bb666..46dc73c50e6f 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeMixed.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeMixed.java
@@ -1,4 +1,4 @@
-// "Change variable 'list' type to 'Lost<java.lang.Integer>'" "true"
+// "Change variable 'list' type to 'Lost<Integer>'" "true"
 public class Test {
   void foo()  {
     Lost<String> list = new Lost<String>();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeOnNonGenericQualifier.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeOnNonGenericQualifier.java
index 1ebbbab8a4bb..6142eebd47a6 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeOnNonGenericQualifier.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeOnNonGenericQualifier.java
@@ -1,4 +1,4 @@
-// "Change field 'f' type to 'java.lang.String'" "true"
+// "Change field 'f' type to 'String'" "true"
 class Test {
   int f;
   void foo(A a)  {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/after1.java
index 7c815dc671df..9b6936e2b506 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/after1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/after1.java
@@ -1,4 +1,4 @@
-// "Change variable 'i' type to 'a.i.ii<java.lang.String>'" "true"
+// "Change variable 'i' type to 'a.i.ii<String>'" "true"
 class a
 {
   class i {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before1.java
index 74da8a65c2a8..a76ea4918297 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before1.java
@@ -1,4 +1,4 @@
-// "Change variable 'i' type to 'a.i.ii<java.lang.String>'" "true"
+// "Change variable 'i' type to 'a.i.ii<String>'" "true"
 class a
 {
   class i {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before2.java
index c3533aa3a2d9..e00da16a5837 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before2.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before2.java
@@ -1,4 +1,4 @@
-// "Change variable 's' type to 'O.f<java.lang.String>'" "false"
+// "Change variable 's' type to 'O.f<String>'" "false"
 
 class O {
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after2.java
index d2f02dbe44b1..c672cb2cf80d 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after2.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after2.java
@@ -1,4 +1,4 @@
-// "Change variable 'i' type to 'java.lang.String'" "true"
+// "Change variable 'i' type to 'String'" "true"
 import java.io.*;
 
 class a {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after4.java
index 4b4f439c9357..da2c3c4402d8 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after4.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after4.java
@@ -1,4 +1,4 @@
-// "Change field 's' type to 'java.lang.Runnable'" "true"
+// "Change field 's' type to 'Runnable'" "true"
 
 class a {
     Runnable s = new Runnable() {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after5.java
index 84d685079ce1..4c7068da10c0 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after5.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after5.java
@@ -1,4 +1,4 @@
-// "Change parameter 'i' type to 'java.lang.String'" "true"
+// "Change parameter 'i' type to 'String'" "true"
 
 class Base {
  void foo(String i) {}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterBoxed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterBoxed.java
index 3d2f0a5e81af..38fa4ed7ea5e 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterBoxed.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterBoxed.java
@@ -1,4 +1,4 @@
-// "Change parameter 'a' type to 'java.lang.Long[]'" "true"
+// "Change parameter 'a' type to 'Long[]'" "true"
 
 class Base {
   void m(Long[] a) {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedType.java
index ccea5e7c4883..eea73c864c28 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedType.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedType.java
@@ -1,4 +1,4 @@
-// "Change variable 'foo' type to 'java.util.List<java.lang.String>'" "true"
+// "Change variable 'foo' type to 'List<String>'" "true"
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedTypeAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedTypeAssignment.java
index a7297a2d5e66..82bf610e4976 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedTypeAssignment.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedTypeAssignment.java
@@ -1,4 +1,4 @@
-// "Change variable 'foo' type to 'java.util.List<java.lang.String>'" "true"
+// "Change variable 'foo' type to 'List<String>'" "true"
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedTypeNotApplicable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedTypeNotApplicable.java
index 5861eb786683..bd7a73524e2f 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedTypeNotApplicable.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterFailedInferenceDueToWrongExpectedTypeNotApplicable.java
@@ -1,4 +1,4 @@
-// "Change variable 'foo' type to 'java.lang.String'" "true"
+// "Change variable 'foo' type to 'String'" "true"
 
 import java.util.List;
 import java.util.Set;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterInCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterInCall.java
index f70713593395..53480d0d387b 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterInCall.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterInCall.java
@@ -1,4 +1,4 @@
-// "Change parameter 'i' type to 'java.lang.String'" "true"
+// "Change parameter 'i' type to 'String'" "true"
 
 class Ex{
  void foo(String i) {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterVararg.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterVararg.java
index d3f05c041881..6d6d7f08dcd0 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterVararg.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterVararg.java
@@ -1,4 +1,4 @@
-// "Change field 'foo' type to 'java.lang.String[]'" "true"
+// "Change field 'foo' type to 'String[]'" "true"
 
 class Base {
   private String[] foo;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before2.java
index 9591611b1755..1ff972852224 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before2.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before2.java
@@ -1,4 +1,4 @@
-// "Change variable 'i' type to 'java.lang.String'" "true"
+// "Change variable 'i' type to 'String'" "true"
 import java.io.*;
 
 class a {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before4.java
index b93daef185e9..8b2fc66abc29 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before4.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before4.java
@@ -1,4 +1,4 @@
-// "Change field 's' type to 'java.lang.Runnable'" "true"
+// "Change field 's' type to 'Runnable'" "true"
 
 class a {
     String s = <caret>new Runnable() {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before5.java
index e2ce5b4c3de7..6614aa82be5e 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before5.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before5.java
@@ -1,4 +1,4 @@
-// "Change parameter 'i' type to 'java.lang.String'" "true"
+// "Change parameter 'i' type to 'String'" "true"
 
 class Base {
  void foo(int i) {}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeBoxed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeBoxed.java
index 68caaa1e749a..329ce285aab5 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeBoxed.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeBoxed.java
@@ -1,4 +1,4 @@
-// "Change parameter 'a' type to 'java.lang.Long[]'" "true"
+// "Change parameter 'a' type to 'Long[]'" "true"
 
 class Base {
   void m(long[] a) {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedType.java
index 802171f834a2..164b0a8f743f 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedType.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedType.java
@@ -1,4 +1,4 @@
-// "Change variable 'foo' type to 'java.util.List<java.lang.String>'" "true"
+// "Change variable 'foo' type to 'List<String>'" "true"
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedTypeAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedTypeAssignment.java
index 42be9d9e4e0e..da6387ea0ac1 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedTypeAssignment.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedTypeAssignment.java
@@ -1,4 +1,4 @@
-// "Change variable 'foo' type to 'java.util.List<java.lang.String>'" "true"
+// "Change variable 'foo' type to 'List<String>'" "true"
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedTypeNotApplicable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedTypeNotApplicable.java
index f9612e9aa742..4b4e711f34e6 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedTypeNotApplicable.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeFailedInferenceDueToWrongExpectedTypeNotApplicable.java
@@ -1,4 +1,4 @@
-// "Change variable 'foo' type to 'java.lang.String'" "true"
+// "Change variable 'foo' type to 'String'" "true"
 
 import java.util.List;
 import java.util.Set;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInCall.java
index 4c4999a6492a..8264a3f89244 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInCall.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInCall.java
@@ -1,4 +1,4 @@
-// "Change parameter 'i' type to 'java.lang.String'" "true"
+// "Change parameter 'i' type to 'String'" "true"
 
 class Ex{
  void foo(int i) {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeVararg.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeVararg.java
index acdd4b75e4c2..52e8a3f17fff 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeVararg.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeVararg.java
@@ -1,4 +1,4 @@
-// "Change field 'foo' type to 'java.lang.String[]'" "true"
+// "Change field 'foo' type to 'String[]'" "true"
 
 class Base {
   private String foo;
diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java
index 8ca731f957ad..0bc8823d4b80 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java
@@ -43,7 +43,7 @@ public class TypeMigrationVariableTypeFixProvider implements ChangeVariableTypeQ
       @NotNull
       @Override
       public String getText() {
-        return "Migrate \'" + myName + "\' type to \'" + getReturnType().getCanonicalText() + "\'";
+        return "Migrate \'" + myName + "\' type to \'" + getReturnType().getPresentableText() + "\'";
       }
 
       @Override
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java
index 78a7f8059016..44aaa33a23bd 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java
@@ -73,7 +73,7 @@ public class JavaFxEventHandlerInspectionTest extends AbstractJavaFXTestCase {
   }
 
   public void testQuickfixFieldType() {
-    doQuickfixTest("Change field 'table' type to 'javafx.scene.control.TableView<java.util.Map<java.lang.String,java.lang.Double>>'");
+    doQuickfixTest("Change field 'table' type to 'TableView<Map<String, Double>>'");
   }
 
   public void testQuickfixNoFieldNested() {