Skip to content

Commit 40bae9d

Browse files
authored
Merge pull request #49 from BobHanson/yadav1
Yadav1
2 parents dafc2ef + 6839b1d commit 40bae9d

File tree

6 files changed

+16
-5
lines changed

6 files changed

+16
-5
lines changed
1 Byte
Binary file not shown.
1 Byte
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ public boolean visit(SynchronizedStatement node) {
914914
// checking that it is not null
915915
buffer.append("if(!(");
916916
node.getExpression().accept(this);
917-
buffer.append("){throw new NullPointerException()}else");
917+
buffer.append(")){throw new NullPointerException()}else");
918918
node.getBody().accept(this);
919919
return false;
920920
}
4.54 KB
Binary file not shown.

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@
6262
import swingjs.JSUtil;
6363

6464
/**
65+
*
66+
* SWINGJS NOTE! As of 6/23/2018 java.awt.Window has been moved to
67+
* subclass JComponent. It is fair to say that there will be issues
68+
* with this, but the reason was to allow JInternalFrame to subclass JFrame
69+
* instead of duplicating in code all of its functionality.
70+
*
71+
*
6572
* A <code>Window</code> object is a top-level window with no borders and no
6673
* menubar.
6774
* The default layout for a window is <code>BorderLayout</code>.
@@ -3353,10 +3360,14 @@ public void setBackground(Color bgColor) {
33533360
}
33543361
*/
33553362

3356-
@SuppressWarnings("unused")
3357-
private transient boolean opaque = true;
3363+
private boolean opaque = true;
3364+
3365+
public boolean isOpaque() {
3366+
// SwingJS
3367+
return opaque;
3368+
}
33583369

3359-
public void setOpaque(boolean opaque) {
3370+
public void setOpaque(boolean opaque) {
33603371
synchronized (getTreeLock()) {
33613372
//TODO ?
33623373
// GraphicsConfiguration gc = getGraphicsConfiguration();

sources/net.sf.j2s.java.core/src/swingjs/plaf/HTML5LookAndFeel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ public Object createValue(UIDefaults table) {
998998

999999
"Desktop.minOnScreenInsets", threeInsets,
10001000
"Desktop.background", table.get("desktop"),
1001-
"Desktop.ancestorInputMap",
1001+
//"Desktop.ancestorInputMap",
10021002
// new UIDefaults.LazyInputMap(new Object[] {
10031003
// "ctrl F5", "restore",
10041004
// "ctrl F4", "close",

0 commit comments

Comments
 (0)