stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7155298: Editable TextArea/TextField are blocking GUI applications from exit

Browse Source 
Stop default caret's timer by setVisible(false) when dispose

Reviewed-by: anthony, ant
This commit is contained in:
Sean Chou 2012-03-31 16:55:56 +08:00
parent 6dd51e0e8e
commit 045668b454
4 changed files with 207 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java
View File

@ -168,6 +168,8 @@ class XTextAreaPeer extends XComponentPeer implements TextAreaPeer {
public void dispose() {
XToolkit.specialPeerMap.remove(jtext);
// visible caret has a timer thread which must be stopped
jtext.getCaret().setVisible(false);
jtext.removeNotify();
textPane.removeNotify();
super.dispose();

2
jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java
View File

@ -104,6 +104,8 @@ public class XTextFieldPeer extends XComponentPeer implements TextFieldPeer {
public void dispose() {
XToolkit.specialPeerMap.remove(xtext);
// visible caret has a timer thread which must be stopped
xtext.getCaret().setVisible(false);
xtext.removeNotify();
super.dispose();
}

101
jdk/test/java/awt/TextArea/DisposeTest/TestDispose.java Normal file
View File

@ -0,0 +1,101 @@
/*
* Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* Portions Copyright (c) 2012 IBM Corporation
*/
/* @test
* @bug 7155298
* @run main/othervm/timeout=60 TestDispose
* @summary Editable TextArea blocks GUI application from exit.
* @author Sean Chou
*/
import java.awt.FlowLayout;
import java.awt.Frame;
import java.awt.TextArea;
import java.awt.Toolkit;
import java.lang.reflect.InvocationTargetException;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import sun.awt.SunToolkit;
public class TestDispose {
public static Frame frame = null;
public static TextArea textArea = null;
public static volatile Process worker = null;
public void testDispose() throws InvocationTargetException,
InterruptedException {
SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
frame = new JFrame("Test");
textArea = new TextArea("editable textArea");
textArea.setEditable(true);
// textArea.setEditable(false); // this testcase passes if textArea is non-editable
frame.setLayout(new FlowLayout());
frame.add(textArea);
frame.pack();
frame.setVisible(true);
}
});
toolkit.realSync();
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
frame.dispose();
}
});
toolkit.realSync();
}
public static void main(String[] args) throws Exception{
if(args.length == 0) {
Runtime.getRuntime().addShutdownHook(new Thread(){
public void run() {
worker.destroy();
}
});
System.out.println(System.getProperty("java.home")+"/bin/java TestDispose workprocess");
worker = Runtime.getRuntime().exec(System.getProperty("java.home")+"/bin/java TestDispose workprocess");
worker.waitFor();
return;
}
TestDispose app = new TestDispose();
app.testDispose();
}
}

102
jdk/test/java/awt/TextField/DisposeTest/TestDispose.java Normal file
View File

@ -0,0 +1,102 @@
/*
* Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* Portions Copyright (c) 2012 IBM Corporation
*/
/* @test
* @bug 7155298
* @run main/othervm/timeout=60 TestDispose
* @summary Editable TextField blocks GUI application from exit.
* @author Sean Chou
*/
import java.awt.FlowLayout;
import java.awt.Frame;
import java.awt.TextField;
import java.awt.Toolkit;
import java.lang.reflect.InvocationTargetException;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import sun.awt.SunToolkit;
public class TestDispose {
public static Frame frame = null;
public static TextField textField = null;
public static volatile Process worker = null;
public void testDispose() throws InvocationTargetException,
InterruptedException {
SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
frame = new JFrame("Test");
textField = new TextField("editable textArea");
textField.setEditable(true);
// textField.setEditable(false); // this testcase passes if textField is non-editable
frame.setLayout(new FlowLayout());
frame.add(textField);
frame.pack();
frame.setVisible(true);
}
});
toolkit.realSync();
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
frame.dispose();
}
});
toolkit.realSync();
}
public static void main(String[] args) throws Exception{
if(args.length == 0) {
Runtime.getRuntime().addShutdownHook(new Thread(){
public void run() {
worker.destroy();
}
});
System.out.println(System.getProperty("java.home")+"/bin/java TestDispose workprocess");
worker = Runtime.getRuntime().exec(System.getProperty("java.home")+"/bin/java TestDispose workprocess");
worker.waitFor();
return;
}
TestDispose app = new TestDispose();
app.testDispose();
}
}