Lines 576-586
Link Here
|
576 |
} |
576 |
} |
577 |
} |
577 |
} |
578 |
} |
578 |
} |
579 |
MethodBinding[] nonVisible = (MethodBinding[]) nonVisibleDefaultMethods.get(inheritedMethod.selector); |
|
|
580 |
if (nonVisible != null) |
581 |
for (int i = 0, l = nonVisible.length; i < l; i++) |
582 |
if (areMethodsCompatible(nonVisible[i], inheritedMethod)) |
583 |
continue nextMethod; |
584 |
|
579 |
|
585 |
if (!inheritedMethod.isDefault() || inheritedMethod.declaringClass.fPackage == this.type.fPackage) { |
580 |
if (!inheritedMethod.isDefault() || inheritedMethod.declaringClass.fPackage == this.type.fPackage) { |
586 |
if (existingMethods == null) { |
581 |
if (existingMethods == null) { |
Lines 592-597
Link Here
|
592 |
} |
587 |
} |
593 |
this.inheritedMethods.put(inheritedMethod.selector, existingMethods); |
588 |
this.inheritedMethods.put(inheritedMethod.selector, existingMethods); |
594 |
} else { |
589 |
} else { |
|
|
590 |
MethodBinding[] nonVisible = (MethodBinding[]) nonVisibleDefaultMethods.get(inheritedMethod.selector); |
591 |
if (nonVisible != null) |
592 |
for (int i = 0, l = nonVisible.length; i < l; i++) |
593 |
if (areMethodsCompatible(nonVisible[i], inheritedMethod)) |
594 |
continue nextMethod; |
595 |
if (nonVisible == null) { |
595 |
if (nonVisible == null) { |
596 |
nonVisible = new MethodBinding[] {inheritedMethod}; |
596 |
nonVisible = new MethodBinding[] {inheritedMethod}; |
597 |
} else { |
597 |
} else { |