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

Minor, remove useless method

Browse Source
This commit is contained in:
Alexander Udalov
2013-08-19 16:45:47 +04:00
parent dc048f0edd
commit 2191073761
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java
+2 -2
View File
@@ -38,7 +38,7 @@ public final class DescriptorResolverUtils {
if (javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED) {
FqName fqName = javaClass.getFqName();
if (fqName != null && PackageClassUtils.isPackageClassFqName(fqName)) {
return javaClass.findAnnotation(JvmAnnotationNames.KOTLIN_PACKAGE.getFqName().asString()) != null;
return javaClass.findAnnotation(JvmAnnotationNames.KOTLIN_PACKAGE.getFqName()) != null;
}
}
return false;
@@ -46,7 +46,7 @@ public final class DescriptorResolverUtils {
public static boolean isCompiledKotlinClass(@NotNull JavaClass javaClass) {
if (javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED) {
return javaClass.findAnnotation(JvmAnnotationNames.KOTLIN_CLASS.getFqName().asString()) != null;
return javaClass.findAnnotation(JvmAnnotationNames.KOTLIN_CLASS.getFqName()) != null;
}
return false;
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+1 -1
View File
@@ -216,7 +216,7 @@ public final class JavaClassResolver {
}
if (KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.equals(qualifiedName.parent())) {
if (javaClass.findAnnotation(JvmAnnotationNames.ASSERT_INVISIBLE_IN_RESOLVER.getFqName().asString()) != null) {
if (javaClass.findAnnotation(JvmAnnotationNames.ASSERT_INVISIBLE_IN_RESOLVER.getFqName()) != null) {
if (ApplicationManager.getApplication().isInternal()) {
LOG.error("classpath is configured incorrectly:" +
" class " + qualifiedName + " from runtime must not be loaded by compiler");
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java
+4 -13
View File
@@ -16,7 +16,10 @@
package org.jetbrains.jet.lang.resolve.java.structure;
import com.intellij.psi.*;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiCompiledElement;
import com.intellij.psi.PsiTypeParameter;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -56,18 +59,6 @@ public class JavaClass extends JavaClassifierImpl
return qualifiedName == null ? null : new FqName(qualifiedName);
}
@Nullable
public JavaAnnotation findAnnotation(@NotNull String fqName) {
PsiModifierList modifierList = getPsi().getModifierList();
if (modifierList != null) {
PsiAnnotation annotation = modifierList.findAnnotation(fqName);
if (annotation != null) {
return new JavaAnnotationImpl(annotation);
}
}
return null;
}
@NotNull
@Override
public Name getName() {