Skip to content

Commit cf04973

Browse files
BobHansonBobHanson
authored
Merge pull request #109 from BobHanson/master
JTextArea preferred height, new transpiler for j2sIgnore
2 parents 14571de + 67a378e commit cf04973

33 files changed

+926
-445
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

5.37 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar‎

104 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190326062559
1+
20190404154041

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip‎

5.37 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/net.sf.j2s.core.jar‎

104 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190326062559
1+
20190404154041

‎sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java‎

Lines changed: 189 additions & 189 deletions
Large diffs are not rendered by default.

‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎

5.37 KB
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,12 @@ public void removeKeyListener(KeyListener l) {
477477
((JSComponentUI)ui).enableJSKeys(false);
478478
}
479479

480+
protected void jsInputMapSet() {
481+
if (ui != null)
482+
((JSComponentUI)ui).enableJSKeys(true);
483+
}
484+
485+
480486

481487
/**
482488
* Invoker must be focusable and could cross from popupmenu to associated component

‎sources/net.sf.j2s.java.core/src/java/io/File.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1749,7 +1749,7 @@ public boolean canExecute() {
17491749
private static File generateFile(String prefix, String suffix, File dir)
17501750
throws IOException
17511751
{
1752-
long n = new Random().nextLong();
1752+
long n = new Random().nextInt(); // was nextLong()
17531753
if (n == Long.MIN_VALUE) {
17541754
n = 0; // corner case
17551755
} else {

0 commit comments

Comments
 (0)