From dfba534e2e2c48c20066cf5eb21b37562d7f813a Mon Sep 17 00:00:00 2001 From: Alex Tkachman Date: Sun, 23 Sep 2012 14:20:25 +0200 Subject: [PATCH] clean to green --- .../caches/JetFromJavaDescriptorHelper.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java b/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java index aaf94b2e1ba..7e03d6ad9bc 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java @@ -28,9 +28,9 @@ import jet.runtime.typeinfo.JetValueParameter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; -import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.kt.JetValueParameterAnnotation; +import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.util.QualifiedNamesUtil; @@ -134,13 +134,14 @@ class JetFromJavaDescriptorHelper { PsiClass containingClass = method.getContainingClass(); if (containingClass != null) { - FqName classFQN = new FqName(containingClass.getQualifiedName()); + final String qualifiedName = containingClass.getQualifiedName(); + assert qualifiedName != null; - if (classFQN != null) { - if (classFQN.shortName().toString().equals(JvmAbi.PACKAGE_CLASS)) { - FqName classParentFQN = QualifiedNamesUtil.withoutLastSegment(classFQN); - return QualifiedNamesUtil.combine(classParentFQN, Name.identifier(method.getName())); - } + FqName classFQN = new FqName(qualifiedName); + + if (classFQN.shortName().toString().equals(JvmAbi.PACKAGE_CLASS)) { + FqName classParentFQN = QualifiedNamesUtil.withoutLastSegment(classFQN); + return QualifiedNamesUtil.combine(classParentFQN, Name.identifier(method.getName())); } }