Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IType;
Expand Down Expand Up @@ -131,8 +132,8 @@ protected void findReferences(IType type, Set<String> pkgs, boolean binary, IPro
if (type == null) {
return;
}
// ignore private classes
if (Flags.isPrivate(type.getFlags())) {
// ignore (package) private classes
if (isBundlePrivateMember(type)) {
return;
}

Expand All @@ -142,7 +143,7 @@ protected void findReferences(IType type, Set<String> pkgs, boolean binary, IPro
SubMonitor subMonitor = SubMonitor.convert(monitor, methods.length * 3 + fields.length + 2 + subTypes.length);

for (int i = 0; i < methods.length; i++) {
if (!Flags.isPrivate(methods[i].getFlags())) {
if (!isBundlePrivateMember(methods[i])) {
String methodSignature = methods[i].getSignature();
addPackages(Signature.getThrownExceptionTypes(methodSignature), pkgs, type, binary,
subMonitor.split(1));
Expand All @@ -151,7 +152,7 @@ protected void findReferences(IType type, Set<String> pkgs, boolean binary, IPro
}
}
for (int i = 0; i < fields.length; i++) {
if (!Flags.isPrivate(fields[i].getFlags())) {
if (!isBundlePrivateMember(fields[i])) {
addPackage(fields[i].getTypeSignature(), pkgs, type, binary, subMonitor.split(1));
}
}
Expand All @@ -164,6 +165,11 @@ protected void findReferences(IType type, Set<String> pkgs, boolean binary, IPro
}
}

private static boolean isBundlePrivateMember(IMember type) throws JavaModelException {
int flags = type.getFlags();
return Flags.isPrivate(flags) || Flags.isPackageDefault(type.getFlags());
}

protected final void addPackage(String typeSignature, Set<String> pkgs, IType type, boolean binary,
IProgressMonitor monitor) throws JavaModelException {
if (typeSignature == null) {
Expand Down
Loading