equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. Oracle designates this |
7 * published by the Free Software Foundation. Oracle designates this |
630 !hiderClass.isSubClass(hideeClass, types)) { |
630 !hiderClass.isSubClass(hideeClass, types)) { |
631 return false; |
631 return false; |
632 } |
632 } |
633 |
633 |
634 // Hidee must be accessible in hider's class. |
634 // Hidee must be accessible in hider's class. |
635 // The method isInheritedIn is poorly named: it checks only access. |
635 return hidee.isAccessibleIn(hiderClass, types); |
636 return hidee.isInheritedIn(hiderClass, types); |
|
637 } |
636 } |
638 |
637 |
639 @DefinedBy(Api.LANGUAGE_MODEL) |
638 @DefinedBy(Api.LANGUAGE_MODEL) |
640 public boolean overrides(ExecutableElement riderEl, |
639 public boolean overrides(ExecutableElement riderEl, |
641 ExecutableElement rideeEl, TypeElement typeEl) { |
640 ExecutableElement rideeEl, TypeElement typeEl) { |