Skip to content

Commit 4102acb

Browse files
hansonrhansonr
hansonr
authored and
hansonr
committed
swingjs/plaf support for new AWT JSxxxx classes
1 parent 45138ce commit 4102acb

File tree

6 files changed

+31
-25
lines changed

6 files changed

+31
-25
lines changed

‎sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package swingjs;
22

3-
import java.applet.Applet;
43
import java.applet.AppletContext;
54
import java.applet.AppletStub;
65
import java.applet.AudioClip;
76
import java.awt.Container;
87
import java.awt.Dimension;
98
import java.awt.Font;
10-
import java.awt.Frame;
9+
import java.awt.JSFrame;
1110
import java.awt.GraphicsConfiguration;
1211
import java.awt.Image;
1312
import java.awt.Insets;
@@ -130,7 +129,7 @@ public void addWindow(Window window) {
130129
allWindows.addLast(window);
131130
}
132131

133-
public Frame sharedOwnerFrame;
132+
public JSFrame sharedOwnerFrame;
134133

135134
public AppContext appContext;
136135

@@ -317,8 +316,8 @@ public Image getImage(URL url) {
317316
}
318317

319318
@Override
320-
public Applet getApplet(String name) {
321-
Applet applet = null;
319+
public java.applet.JSApplet getApplet(String name) {
320+
JApplet applet = null;
322321
/**
323322
* @j2sNative
324323
*
@@ -332,7 +331,7 @@ public Applet getApplet(String name) {
332331
}
333332

334333
@Override
335-
public Enumeration<Applet> getApplets() {
334+
public Enumeration<java.applet.JSApplet> getApplets() {
336335
// not supported for now
337336
return null;
338337
}

‎sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
import java.awt.Dialog;
99
import java.awt.Dialog.ModalExclusionType;
1010
import java.awt.Dialog.ModalityType;
11+
import java.awt.JSDialog;
1112
import java.awt.EventQueue;
1213
import java.awt.Font;
1314
import java.awt.FontMetrics;
14-
import java.awt.Frame;
15+
import java.awt.JSFrame;
1516
import java.awt.GraphicsConfiguration;
1617
import java.awt.Image;
1718
import java.awt.JSComponent;
@@ -176,12 +177,12 @@ public void sync() {
176177

177178
@Override
178179
public boolean isModalExclusionTypeSupported(
179-
ModalExclusionType modalExclusionType) {
180+
Dialog.ModalExclusionType modalExclusionType) {
180181
return true;
181182
}
182183

183184
@Override
184-
public boolean isModalityTypeSupported(ModalityType modalityType) {
185+
public boolean isModalityTypeSupported(Dialog.ModalityType modalityType) {
185186
return true;
186187
}
187188

@@ -514,7 +515,7 @@ public DialogPeer createDialog(Dialog target) {
514515
}
515516

516517
@Override
517-
public FramePeer createFrame(Frame target) {
518+
public FramePeer createFrame(JSFrame target) {
518519
ComponentUI ui = target.getUI();
519520
if (ui == null)
520521
return null;
@@ -925,7 +926,7 @@ public void beep() {
925926
* for now we are ignoring props
926927
*/
927928
@Override
928-
public PrintJob getPrintJob(Frame frame, String jobtitle, Properties props) {
929+
public PrintJob getPrintJob(JSFrame frame, String jobtitle, Properties props) {
929930
JSPrintJob job = (JSPrintJob) JSUtil.getInstance("swingjs.JSPrintJob");
930931
job.setProperties(jobtitle, props);
931932
return (PrintJob) (Object) job;
@@ -937,7 +938,7 @@ public PrintJob getPrintJob(Frame frame, String jobtitle, Properties props) {
937938
* for now we are ignoring jobAttributes and pageAttributes
938939
*/
939940
@Override
940-
public PrintJob getPrintJob(Frame frame, String jobtitle,
941+
public PrintJob getPrintJob(JSFrame frame, String jobtitle,
941942
JobAttributes jobAttributes, PageAttributes pageAttributes) {
942943
JSPrintJob job = (JSPrintJob) JSUtil.getInstance("swingjs.JSPrintJob");
943944
job.setAttributes(jobtitle, jobAttributes, pageAttributes);

‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1938,11 +1938,12 @@ private void setBackgroundFor(DOMNode node, Color color) {
19381938
if (node == null || isMenuItem)
19391939
return;
19401940
// if (color == null) // from paintComponentSafely
1941-
DOMNode.setStyles(node, "background-color", JSToolkit.getCSSColor(color == null ? rootPaneColor : color));
1941+
DOMNode.setStyles(node, "background-color", color == null ? null : JSToolkit.getCSSColor(color == null ? rootPaneColor : color));
19421942
if (allowPaintedBackground && jc.selfOrParentBackgroundPainted())
19431943
setTransparent(node);
19441944
else
19451945
checkTransparent(node);
1946+
19461947
}
19471948

19481949
/**

‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSLabelUI.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public DOMNode updateDOMNode() {
5757
setHorizontalButtonAlignments(label, label.getHorizontalTextPosition(),
5858
label.getHorizontalAlignment());
5959
}
60-
if (jc.isOpaque() && jc.isEnabled())
61-
setBackground(jc.getBackground());
60+
if (jc.isEnabled())
61+
setBackground(jc.isOpaque() ? jc.getBackground() : null);
6262
return domNode;
6363

6464
}

‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSToolBarUI.java‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@
3535
import java.awt.Component;
3636
import java.awt.Container;
3737
import java.awt.Dialog;
38+
import java.awt.JSDialog;
3839
import java.awt.Dimension;
39-
import java.awt.Frame;
40+
import java.awt.JSFrame;
4041
import java.awt.Graphics;
4142
import java.awt.IllegalComponentStateException;
4243
import java.awt.Insets;
@@ -527,14 +528,18 @@ protected RootPaneContainer createFloatingWindow(JToolBar toolbar) {
527528
class ToolBarDialog extends JDialog {
528529

529530

530-
public ToolBarDialog(Frame owner, String title, boolean modal) {
531+
public ToolBarDialog(JSFrame owner, String title, boolean modal) {
531532
super(owner, title, modal);
532533
}
533534

534-
public ToolBarDialog(Dialog owner, String title, boolean modal) {
535+
public ToolBarDialog(JSDialog owner, String title, boolean modal) {
535536
super(owner, title, modal);
536537
}
537538

539+
public ToolBarDialog(Dialog owner, String title, boolean modal) {
540+
super((JSDialog) owner, title, modal);
541+
}
542+
538543
// Override createRootPane() to automatically resize
539544
// the frame when contents change
540545
@Override
@@ -559,12 +564,12 @@ public void validate() {
559564

560565
JDialog dialog;
561566
Window window = SwingUtilities.getWindowAncestor(toolbar);
562-
if (window instanceof Frame) {
563-
dialog = new ToolBarDialog((Frame)window, toolbar.getName(), false);
564-
} else if (window instanceof Dialog) {
565-
dialog = new ToolBarDialog((Dialog)window, toolbar.getName(), false);
567+
if (window instanceof JSFrame) {
568+
dialog = new ToolBarDialog((JSFrame)window, toolbar.getName(), false);
569+
} else if (window instanceof JSDialog) {
570+
dialog = new ToolBarDialog((JSDialog)window, toolbar.getName(), false);
566571
} else {
567-
dialog = new ToolBarDialog((Frame)null, toolbar.getName(), false);
572+
dialog = new ToolBarDialog((JSFrame)null, toolbar.getName(), false);
568573
}
569574

570575
dialog.getRootPane().setName("ToolBar.FloatingWindow");

‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSWindowUI.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package swingjs.plaf;
22

3+
import java.awt.JSDialog;
34
import java.awt.Dialog;
45
import java.awt.Font;
56
import java.awt.FontMetrics;
@@ -131,8 +132,7 @@ public boolean requestWindowFocus() {
131132

132133
@Override
133134
public void setModalBlocked(Dialog blocker, boolean blocked) {
134-
// TODO Auto-generated method stub
135-
135+
JSDialog b = ((JSDialog) (Object) blocker);
136136
}
137137

138138
@Override

0 commit comments

Comments
 (0)