Skip to content

Commit 7678b47

Browse files
authored
Merge pull request #244 from BobHanson/hanson1
Hanson1
2 parents c264522 + 0896fc9 commit 7678b47

File tree

15 files changed

+271
-278
lines changed

15 files changed

+271
-278
lines changed
-3 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20230124211103
1+
20230202011832
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20230124211103
1+
20230202011832

sources/net.sf.j2s.java.core/.j2s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ j2s.compiler.read.annotations=true
99
# customizable list for what annotations to skip
1010
j2s.compiler.ignored.annotations=CallerSensitive;ConstructorProperties;Deprecated;Override;SafeVarargs;SuppressWarnings;FunctionalInterface;Documented;Inherited;Native;Repeatable;Retention;Transient;
1111

12-
#j2s.compiler.nonqualified.packages=org.w3c.dom
12+
j2s.compiler.nonqualified.packages=test.js
1313

1414
#output file name for logging methods declared - delete the file to regenerate a listing
1515
#j2s.log.methods.declared=methodsDeclared.csv
-3.35 KB
Binary file not shown.

sources/net.sf.j2s.java.core/src/java/awt/AWTKeyStroke.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -695,9 +695,12 @@ public String toString() {
695695
}
696696

697697
public String 秘toString() {
698-
// SwingJS just the keycode, avoiding VKCollection.js
699-
return getModifiersText(modifiers)
700-
+ (onKeyRelease ? "released" : "pressed") + " " + keyCode;
698+
if (keyCode == KeyEvent.VK_UNDEFINED) {
699+
return getModifiersText(modifiers) + "typed " + keyChar;
700+
} else {
701+
return getModifiersText(modifiers) +
702+
(onKeyRelease ? "released" : "pressed") + " " + keyCode;
703+
}
701704
}
702705

703706
static private String getModifiersText(int modifiers) {

sources/net.sf.j2s.java.core/src/javajs/api/GenericZipInputStream.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

sources/net.sf.j2s.java.core/src/javajs/api/GenericZipTools.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

sources/net.sf.j2s.java.core/src/javajs/api/ZInputStream.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)