azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NPE fixed

Browse Source
This commit is contained in:
Sergey Ignatov
2011-11-22 13:13:41 +04:00
parent 357d1dab82
commit fb0cf96488
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java
+2 -2
View File
@@ -95,7 +95,7 @@ public class TypeVisitor extends PsiTypeVisitor<Type> {
} }
@NotNull @NotNull
private String getClassTypeName(@NotNull PsiClassType classType) { private static String getClassTypeName(@NotNull PsiClassType classType) {
String canonicalTypeStr = classType.getCanonicalText(); String canonicalTypeStr = classType.getCanonicalText();
if (canonicalTypeStr.equals("java.lang.Object")) return "Any"; if (canonicalTypeStr.equals("java.lang.Object")) return "Any";
if (canonicalTypeStr.equals("java.lang.Byte")) return "Byte"; if (canonicalTypeStr.equals("java.lang.Byte")) return "Byte";
@@ -106,7 +106,7 @@ public class TypeVisitor extends PsiTypeVisitor<Type> {
if (canonicalTypeStr.equals("java.lang.Long")) return "Long"; if (canonicalTypeStr.equals("java.lang.Long")) return "Long";
if (canonicalTypeStr.equals("java.lang.Short")) return "Short"; if (canonicalTypeStr.equals("java.lang.Short")) return "Short";
if (canonicalTypeStr.equals("java.lang.Boolean")) return "Boolean"; if (canonicalTypeStr.equals("java.lang.Boolean")) return "Boolean";
return classType.getClassName(); return classType.getClassName() != null ? classType.getClassName() : classType.getCanonicalText();
} }
@Override @Override