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

fix more errors of incomplete classpath

Browse Source 
after this commit project without JDK configured is not all red
This commit is contained in:
Stepan Koltsov
2012-05-30 21:04:25 +04:00
parent a7aeba4e48
commit 7c0b8876ca
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+1 -1
View File
@@ -893,7 +893,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
if (resolved != null && resolved.getQualifiedName().equals(JvmStdlibNames.JET_OBJECT.getFqName().getFqName())) { if (resolved != null && resolved.getQualifiedName().equals(JvmStdlibNames.JET_OBJECT.getFqName().getFqName())) {
continue; continue;
} }
if (annotation && resolved.getQualifiedName().equals("java.lang.annotation.Annotation")) { if (resolved != null && annotation && resolved.getQualifiedName().equals("java.lang.annotation.Annotation")) {
continue; continue;
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+4
View File
@@ -441,6 +441,10 @@ public class OverrideResolver {
} }
private void checkOverridesForParameters(CallableMemberDescriptor declared) { private void checkOverridesForParameters(CallableMemberDescriptor declared) {
if (ErrorUtils.isError(declared)) {
return;
}
boolean fakeOverride = declared.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE; boolean fakeOverride = declared.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE;
if (!fakeOverride) { if (!fakeOverride) {
// No check if the function is not marked as 'override' // No check if the function is not marked as 'override'