Skip to content

Fix for added applet unqualified names #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BobHanson merged 1 commit into from
Mar 18, 2018
Merged

Fix for added applet unqualified names #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar
View file
Open in desktop
Binary file not shown.
Binary file modified sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar
View file
Open in desktop
Binary file not shown.
17 changes: 15 additions & 2 deletions sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3941,7 +3941,6 @@ private String getMethodNameOrArrayForDeclaration(MethodDeclaration node, IMetho
// System.err.println("checking methodList for " + nodeName.toString() +
// " in " + methodClass.getKey());
List<String[]> methodList = getGenericMethodList(methodClass, nodeName.toString());

if (methodList != null) {
// System.err.println("have methodList for " + nodeName + " " +
// methodList.size());
Expand All @@ -3955,7 +3954,7 @@ private String getMethodNameOrArrayForDeclaration(MethodDeclaration node, IMetho
if (pname != null)
names.add(pname);
}
} else if (addUnqualified && !methodName.equals(qname)) {
} else if (addUnqualified && !methodName.equals(qname) && !classHasMethod(methodClass, methodName)) {
names = new ArrayList<String>();
names.add(methodName);
}
Expand All @@ -3970,6 +3969,20 @@ private String getMethodNameOrArrayForDeclaration(MethodDeclaration node, IMetho
return "[" + qname.substring(1) + "]";
}

private static boolean classHasMethod(ITypeBinding methodClass, String methodName) {
while (methodClass != null) {
IMethodBinding[] methods = methodClass.getDeclaredMethods();
for (int i = methods.length; --i >= 0;) {
IMethodBinding m = methods[i];
if (m.getName().equals(methodName) && m.getParameterTypes().length == 0
&& !Modifier.isPrivate(m.getModifiers()))
return true;
}
methodClass = methodClass.getSuperclass();
}
return false;
}

/**
* Determine the qualified parameter suffix for method names, including
* constructors.
Expand Down