Fixed KT-5299 J2K: When generating named this@type, do not insert FQN

#KT-5299 Fixed

j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt

@@ -358,13 +358,13 @@ class ExpressionVisitor(private val converter: Converter,
     }
 
     override fun visitSuperExpression(expression: PsiSuperExpression) {
-        val qualifier = expression.getQualifier()
-        result = SuperExpression(if (qualifier != null) Identifier(qualifier.getQualifiedName()!!) else Identifier.Empty)
+        val qualifier = expression.getQualifier()?.getReferenceName()
+        result = SuperExpression(if (qualifier != null) Identifier(qualifier) else Identifier.Empty)
     }
 
     override fun visitThisExpression(expression: PsiThisExpression) {
-        val qualifier = expression.getQualifier()
-        result = ThisExpression(if (qualifier != null) Identifier(qualifier.getQualifiedName()!!) else Identifier.Empty)
+        val qualifier = expression.getQualifier()?.getReferenceName()
+        result = ThisExpression(if (qualifier != null) Identifier(qualifier) else Identifier.Empty)
     }
 
     override fun visitTypeCastExpression(expression: PsiTypeCastExpression) {

j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java

@@ -1,4 +1,6 @@
 //file
+package a.b;
+
 class Base {
   void foo();
 }

j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt

@@ -1,3 +1,5 @@
+package a.b
+
 class Base() {
     fun foo()
 }

j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java

@@ -1,4 +1,6 @@
 //file
+package a.b
+
 class Base {
   void foo() {}
 }

j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt

@@ -1,3 +1,5 @@
+package a.b
+
 class Base() {
     fun foo() {
     }