From 7c0b8876caee920648dfc0d9ed462f194af084ed Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Wed, 30 May 2012 21:04:25 +0400 Subject: [PATCH] fix more errors of incomplete classpath after this commit project without JDK configured is not all red --- .../jet/lang/resolve/java/JavaDescriptorResolver.java | 2 +- .../src/org/jetbrains/jet/lang/resolve/OverrideResolver.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 506ce076cac..123a25788d4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -893,7 +893,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes if (resolved != null && resolved.getQualifiedName().equals(JvmStdlibNames.JET_OBJECT.getFqName().getFqName())) { continue; } - if (annotation && resolved.getQualifiedName().equals("java.lang.annotation.Annotation")) { + if (resolved != null && annotation && resolved.getQualifiedName().equals("java.lang.annotation.Annotation")) { continue; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index 76cbabde688..a1a21125a5b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -441,6 +441,10 @@ public class OverrideResolver { } private void checkOverridesForParameters(CallableMemberDescriptor declared) { + if (ErrorUtils.isError(declared)) { + return; + } + boolean fakeOverride = declared.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE; if (!fakeOverride) { // No check if the function is not marked as 'override'