Skip to content

3.2.7_v4 automatically switches extends Label and JLabel #141

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
Jan 17, 2020
Merged

3.2.7_v4 automatically switches extends Label and JLabel #141

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/swingjs/net.sf.j2s.core.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20200116195702
20200116221246
Binary file modified sources/net.sf.j2s.core/dist/swingjs/ver/3.2.7/net.sf.j2s.core.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/ver/3.2.7/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20200116195702
20200116221246
21 changes: 17 additions & 4 deletions sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@

// TODO: superclass inheritance for JAXB XmlAccessorType

//BH 2020.01.16 -- 3.2.7-v4 replaces extends java.awt.Component and javax.swing.JComponent
//BH 2020.01.12 -- 3.2.7-v3 fixes JAXB annotation marshalling for 3.2.7
//BH 2020.01.11 -- 3.2.7-v3 corrects and rewrites synthetic bridge creation with much cleaner heap usage
//BH 2020.01.09 -- 3.2.7-v2 introduces @j2sAlias as a way of adding a custom method name, as in exports.
Expand Down Expand Up @@ -2004,7 +2005,8 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
this$0Name0 = this$0Name;
this$0Name = null;
finalShortClassName = getFinalJ2SClassName(
(isLambda ? getMyJavaClassNameLambda(true) : getUnreplacedJavaClassNameQualified(binding)), FINAL_P);
(isLambda ? getMyJavaClassNameLambda(true) : getUnreplacedJavaClassNameQualified(binding)),
FINAL_P);
if (finalShortClassName.startsWith("P$.")) {
// java.lang.x will return x, not P$.x
finalShortClassName = finalShortClassName.substring(3);
Expand Down Expand Up @@ -2143,14 +2145,24 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
} else {
hasDependents = true;
String superclassName = getUnreplacedJavaClassNameQualified(superclass);
if (superclassName == null || superclassName.length() == 0 || "java.lang.Object".equals(superclassName)) {
switch (superclassName == null ? "" : superclassName) {
case "":
case "java.lang.Object":
buffer.append("null");
} else {
break;
case "java.awt.Component":
buffer.append("'java.awt.Label'");
break;
case "javax.swing.JComponent":
buffer.append("'javax.swing.JLabel'");
break;
default:
if (isAnonymous) {
buffer.append(getFinalJ2SClassNameQualifier(null, superclass, superclassName, FINAL_ESCAPE));
} else {
buffer.append(getFinalInnerClassList(superclass, superclassName));
}
break;
}
}

Expand Down Expand Up @@ -2183,7 +2195,8 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
int pt = buffer.length();
while (!b.isTopLevel()) {
b = b.getDeclaringClass();
buffer.insert(pt, "'" + getFinalJ2SClassName(getUnreplacedJavaClassNameQualified(b), FINAL_RAW) + "',");
buffer.insert(pt,
"'" + getFinalJ2SClassName(getUnreplacedJavaClassNameQualified(b), FINAL_RAW) + "',");
}
}
buffer.append("'");
Expand Down