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

clean to green

Browse Source
This commit is contained in:
Alex Tkachman
2012-09-23 14:20:25 +02:00
parent b9c7f607ef
commit dfba534e2e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java
+8 -7
View File
@@ -28,9 +28,9 @@ import jet.runtime.typeinfo.JetValueParameter;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; 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.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.kt.JetValueParameterAnnotation; 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.lang.resolve.name.Name;
import org.jetbrains.jet.util.QualifiedNamesUtil; import org.jetbrains.jet.util.QualifiedNamesUtil;
@@ -134,13 +134,14 @@ class JetFromJavaDescriptorHelper {
PsiClass containingClass = method.getContainingClass(); PsiClass containingClass = method.getContainingClass();
if (containingClass != null) { if (containingClass != null) {
FqName classFQN = new FqName(containingClass.getQualifiedName()); final String qualifiedName = containingClass.getQualifiedName();
assert qualifiedName != null;
if (classFQN != null) { FqName classFQN = new FqName(qualifiedName);
if (classFQN.shortName().toString().equals(JvmAbi.PACKAGE_CLASS)) {
FqName classParentFQN = QualifiedNamesUtil.withoutLastSegment(classFQN); if (classFQN.shortName().toString().equals(JvmAbi.PACKAGE_CLASS)) {
return QualifiedNamesUtil.combine(classParentFQN, Name.identifier(method.getName())); FqName classParentFQN = QualifiedNamesUtil.withoutLastSegment(classFQN);
} return QualifiedNamesUtil.combine(classParentFQN, Name.identifier(method.getName()));
} }
} }