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

4379403: Need to disable the "magic AWT dump key" (CTRL+SHIFT+F1)

Browse Source 
Reviewed-by: alexsch, azvegint
This commit is contained in:
Sergey Bylokhov 2015-08-06 19:52:02 +03:00
parent f93a7de976
commit c595f6461c
4 changed files with 101 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdk/src/java.desktop/share/classes/java/awt/Window.java
View File

@ -53,6 +53,7 @@ import sun.awt.AWTAccessor;
import sun.awt.AWTPermissions;
import sun.awt.AppContext;
import sun.awt.CausedFocusEvent;
import sun.awt.DebugSettings;
import sun.awt.SunToolkit;
import sun.awt.util.IdentityArrayList;
import sun.java2d.pipe.Region;
@ -2159,11 +2160,13 @@ public class Window extends Container implements Accessible {
* @param e the keyboard event
*/
void preProcessKeyEvent(KeyEvent e) {
// Dump the list of child windows to System.out.
if (e.isActionKey() && e.getKeyCode() == KeyEvent.VK_F1 &&
e.isControlDown() && e.isShiftDown() &&
e.getID() == KeyEvent.KEY_PRESSED) {
list(System.out, 0);
// Dump the list of child windows to System.out if debug is enabled.
if (DebugSettings.getInstance().getBoolean("on", false)) {
if (e.isActionKey() && e.getKeyCode() == KeyEvent.VK_F1 &&
e.isControlDown() && e.isShiftDown() &&
e.getID() == KeyEvent.KEY_PRESSED) {
list(System.out, 0);
}
}
}

25
jdk/src/java.desktop/share/classes/sun/awt/DebugSettings.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2015, 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
@ -71,7 +71,7 @@ import sun.util.logging.PlatformLogger;
* are read the same way as described above (as before
* the fix for 4638447).
*/
final class DebugSettings {
public final class DebugSettings {
private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.debug.DebugSettings");
/* standard debug property key names */
@ -87,28 +87,21 @@ final class DebugSettings {
};
/* global instance of the settings object */
private static DebugSettings instance = null;
private static final DebugSettings instance = new DebugSettings();
private Properties props = new Properties();
private final Properties props = new Properties();
static void init() {
if (instance != null) {
static synchronized void init() {
if (!instance.props.isEmpty()) {
return;
}
NativeLibLoader.loadLibraries();
instance = new DebugSettings();
instance.loadProperties();
instance.loadNativeSettings();
}
private DebugSettings() {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() {
public Void run() {
loadProperties();
return null;
}
});
public static DebugSettings getInstance() {
return instance;
}
/*

81
jdk/test/java/awt/Debug/DumpOnKey/DumpOnKey.java Normal file
View File

@ -0,0 +1,81 @@
/*
* Copyright (c) 2015, 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.
*/
import java.awt.AWTException;
import java.awt.Frame;
import java.awt.Robot;
import java.awt.Window;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.io.PrintStream;
/**
* @test
* @bug 4379403
* @run main/othervm DumpOnKey false
* @run main/othervm DumpOnKey -Dsun.awt.nativedebug=true true
* @run main/othervm DumpOnKey -Dsun.awt.nativedebug=true -Dawtdebug.on=true true
* @run main/othervm DumpOnKey -Dsun.awt.nativedebug=false -Dawtdebug.on=true false
* @run main/othervm DumpOnKey -Dsun.awt.nativedebug=true -Dawtdebug.on=false false
* @run main/othervm DumpOnKey -Dsun.awt.nativedebug=false -Dawtdebug.on=false false
* @run main/othervm/java.security.policy=dump.policy/secure=java.lang.SecurityManager DumpOnKey -Dsun.awt.nativedebug=true true
* @run main/othervm/java.security.policy=dump.policy/secure=java.lang.SecurityManager DumpOnKey -Dsun.awt.nativedebug=true -Dawtdebug.on=false false
*/
public final class DumpOnKey {
private static volatile boolean dumped;
public static void main(final String[] args) throws AWTException {
final boolean dump = Boolean.parseBoolean(args[0]);
final Window w = new Frame() {
@Override
public void list(final PrintStream out, final int indent) {
super.list(out, indent);
dumped = true;
}
};
w.setSize(200, 200);
w.setLocationRelativeTo(null);
w.setVisible(true);
final Robot robot = new Robot();
robot.setAutoDelay(50);
robot.setAutoWaitForIdle(true);
robot.mouseMove(w.getX() + w.getWidth() / 2,
w.getY() + w.getHeight() / 2);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.keyPress(KeyEvent.VK_CONTROL);
robot.keyPress(KeyEvent.VK_SHIFT);
robot.keyPress(KeyEvent.VK_F1);
robot.keyRelease(KeyEvent.VK_F1);
robot.keyRelease(KeyEvent.VK_SHIFT);
robot.keyRelease(KeyEvent.VK_CONTROL);
w.dispose();
if (dumped != dump) {
throw new RuntimeException("Exp:" + dump + ", actual:" + dumped);
}
}
}

3
jdk/test/java/awt/Debug/DumpOnKey/dump.policy Normal file
View File

@ -0,0 +1,3 @@
grant {
permission java.awt.AWTPermission "createRobot";
};