Skip to content

Commit 6e8835c

Browse files
committed
7110890: reg test TranslucentShapedFrameTest fails to create non-opaque frame
Reviewed-by: prr
1 parent bf19581 commit 6e8835c

File tree

2 files changed

+19
-45
lines changed

2 files changed

+19
-45
lines changed

test/jdk/java/awt/Window/TranslucentShapedFrameTest/TSFrame.java

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,27 +22,24 @@
2222
*/
2323

2424
import java.awt.BorderLayout;
25+
import java.awt.Canvas;
2526
import java.awt.Color;
27+
import java.awt.Component;
2628
import java.awt.Dimension;
2729
import java.awt.Frame;
30+
import java.awt.GradientPaint;
2831
import java.awt.Graphics;
29-
import java.awt.GraphicsConfiguration;
32+
import java.awt.Graphics2D;
3033
import java.awt.GraphicsDevice;
3134
import java.awt.GraphicsDevice.WindowTranslucency;
32-
import java.awt.GraphicsEnvironment;
3335
import java.awt.RenderingHints;
3436
import java.awt.event.MouseAdapter;
3537
import java.awt.event.MouseEvent;
3638
import java.awt.event.WindowAdapter;
3739
import java.awt.event.WindowEvent;
38-
import java.awt.Canvas;
39-
import java.awt.Component;
40-
import java.awt.GradientPaint;
41-
import java.awt.Graphics2D;
42-
import java.awt.Paint;
43-
import java.util.Random;
4440
import java.awt.geom.Ellipse2D;
45-
import javax.swing.JApplet;
41+
import java.util.Random;
42+
4643
import javax.swing.JButton;
4744
import javax.swing.JComponent;
4845
import javax.swing.JFrame;
@@ -107,31 +104,6 @@ public void paintComponent(Graphics g) {
107104
setUndecorated(true);
108105
}
109106
}
110-
private static class NonOpaqueJAppletFrame extends JFrame {
111-
JPanel p;
112-
NonOpaqueJAppletFrame() {
113-
super("NonOpaque Swing JAppletFrame");
114-
JApplet ja = new JApplet() {
115-
public void paint(Graphics g) {
116-
super.paint(g);
117-
System.err.println("JAppletFrame paint called");
118-
}
119-
};
120-
p = new JPanel() {
121-
public void paintComponent(Graphics g) {
122-
super.paintComponent(g);
123-
render(g, getWidth(), getHeight(), true);
124-
g.setColor(Color.red);
125-
g.drawString("Non-Opaque Swing JFrame", 10, 15);
126-
}
127-
};
128-
p.setDoubleBuffered(false);
129-
p.setOpaque(false);
130-
ja.add(p);
131-
add(ja);
132-
setUndecorated(true);
133-
}
134-
}
135107
private static class NonOpaqueFrame extends Frame {
136108
NonOpaqueFrame() {
137109
super("NonOpaque AWT Frame");
@@ -177,7 +149,6 @@ public static Frame createGui(
177149
if (useNonOpaque) {
178150
if (useSwing) {
179151
frame = new NonOpaqueJFrame();
180-
// frame = new NonOpaqueJAppletFrame(gc);
181152
} else {
182153
frame = new NonOpaqueFrame();
183154
}
@@ -224,11 +195,7 @@ public void mouseClicked(MouseEvent e) {
224195
}
225196
});
226197
frame.setPreferredSize(new Dimension(800, 600));
227-
228-
if (useShape) {
229-
frame.setUndecorated(true);
230-
}
231-
198+
frame.setUndecorated(true);
232199
frame.setLocation(450, 10);
233200
frame.pack();
234201

test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -31,19 +31,19 @@
3131
* @run main/manual/othervm TranslucentShapedFrameTest
3232
* @run main/manual/othervm -Dsun.java2d.noddraw=true TranslucentShapedFrameTest
3333
*/
34+
3435
import java.awt.Color;
3536
import java.awt.Frame;
3637
import java.awt.GraphicsConfiguration;
3738
import java.awt.GraphicsDevice;
3839
import java.awt.GraphicsDevice.WindowTranslucency;
39-
import java.awt.GraphicsEnvironment;
4040
import java.awt.Shape;
4141
import java.awt.geom.Ellipse2D;
4242
import java.util.concurrent.CountDownLatch;
43+
4344
import javax.swing.JSlider;
4445
import javax.swing.SwingUtilities;
4546
import javax.swing.UIManager;
46-
import javax.swing.UnsupportedLookAndFeelException;
4747

4848
public class TranslucentShapedFrameTest extends javax.swing.JFrame {
4949
Frame testFrame;
@@ -145,14 +145,15 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
145145

146146
createDisposeGrp.add(createFrameBtn);
147147
createFrameBtn.setText("Create Frame");
148+
createFrameBtn.setSelected(true);
148149
createFrameBtn.addActionListener(new java.awt.event.ActionListener() {
149150
public void actionPerformed(java.awt.event.ActionEvent evt) {
150151
createFrameBtnActionPerformed(evt);
151152
}
152153
});
153154

154155
createDisposeGrp.add(disposeFrameBtn);
155-
disposeFrameBtn.setSelected(true);
156+
disposeFrameBtn.setEnabled(false);
156157
disposeFrameBtn.setText("Dispose Frame");
157158
disposeFrameBtn.addActionListener(new java.awt.event.ActionListener() {
158159
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -268,6 +269,9 @@ private void disposeFrameBtnActionPerformed(java.awt.event.ActionEvent evt) {//G
268269
testFrame.dispose();
269270
testFrame = null;
270271
}
272+
disposeFrameBtn.setEnabled(false);
273+
createFrameBtn.setEnabled(true);
274+
useSwingCb.setEnabled(true);
271275
}//GEN-LAST:event_disposeFrameBtnActionPerformed
272276

273277
private void createFrameBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_createFrameBtnActionPerformed
@@ -277,6 +281,9 @@ private void createFrameBtnActionPerformed(java.awt.event.ActionEvent evt) {//GE
277281
useSwingCb.isSelected(), shapedCb.isSelected(),
278282
(transl < 100), nonOpaqueChb.isSelected(),
279283
(float)transl/100f);
284+
createFrameBtn.setEnabled(false);
285+
disposeFrameBtn.setEnabled(true);
286+
useSwingCb.setEnabled(false);
280287
}//GEN-LAST:event_createFrameBtnActionPerformed
281288

282289
private void passedBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_passedBtnActionPerformed

0 commit comments

Comments
 (0)