mirror of
https://github.com/openjdk/jdk.git
synced 2026-05-11 22:19:43 +00:00
8210286: Drop of sun.awt.HToolkit class
Reviewed-by: dmarkov, prr
This commit is contained in:
parent
c7f8499529
commit
9651df7696
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2018, 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
|
||||
@ -169,18 +169,9 @@ public abstract class GraphicsEnvironment {
|
||||
String nm = System.getProperty("java.awt.headless");
|
||||
|
||||
if (nm == null) {
|
||||
/* No need to ask for DISPLAY when run in a browser */
|
||||
if (System.getProperty("javaplugin.version") != null) {
|
||||
headless = defaultHeadless = Boolean.FALSE;
|
||||
} else {
|
||||
String osName = System.getProperty("os.name");
|
||||
if (osName.contains("OS X") && "sun.awt.HToolkit".equals(
|
||||
System.getProperty("awt.toolkit")))
|
||||
{
|
||||
headless = defaultHeadless = Boolean.TRUE;
|
||||
} else {
|
||||
final String display = System.getenv("DISPLAY");
|
||||
headless = defaultHeadless =
|
||||
final String osName = System.getProperty("os.name");
|
||||
final String display = System.getenv("DISPLAY");
|
||||
headless = defaultHeadless =
|
||||
("Linux".equals(osName) ||
|
||||
"SunOS".equals(osName) ||
|
||||
"FreeBSD".equals(osName) ||
|
||||
@ -188,8 +179,6 @@ public abstract class GraphicsEnvironment {
|
||||
"OpenBSD".equals(osName) ||
|
||||
"AIX".equals(osName)) &&
|
||||
(display == null || display.trim().isEmpty());
|
||||
}
|
||||
}
|
||||
} else {
|
||||
headless = Boolean.valueOf(nm);
|
||||
}
|
||||
|
||||
@ -1,317 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2017, 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. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
package sun.awt;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.datatransfer.Clipboard;
|
||||
import java.awt.dnd.DragGestureListener;
|
||||
import java.awt.dnd.DragGestureRecognizer;
|
||||
import java.awt.dnd.DragSource;
|
||||
import java.awt.im.InputMethodHighlight;
|
||||
import java.awt.im.spi.InputMethodDescriptor;
|
||||
import java.awt.image.ColorModel;
|
||||
import java.awt.peer.FramePeer;
|
||||
import java.awt.peer.KeyboardFocusManagerPeer;
|
||||
import java.awt.peer.SystemTrayPeer;
|
||||
import java.awt.peer.TrayIconPeer;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
|
||||
/*
|
||||
* HToolkit is a platform independent Toolkit used
|
||||
* with the HeadlessToolkit. It is primarily used
|
||||
* in embedded JRE's that do not have sun/awt/X11 classes.
|
||||
*/
|
||||
public final class HToolkit extends SunToolkit implements ComponentFactory {
|
||||
|
||||
private static final KeyboardFocusManagerPeer kfmPeer = new KeyboardFocusManagerPeer() {
|
||||
@Override
|
||||
public void setCurrentFocusedWindow(Window win) {}
|
||||
@Override
|
||||
public Window getCurrentFocusedWindow() { return null; }
|
||||
@Override
|
||||
public void setCurrentFocusOwner(Component comp) {}
|
||||
@Override
|
||||
public Component getCurrentFocusOwner() { return null; }
|
||||
@Override
|
||||
public void clearGlobalFocusOwner(Window activeWindow) {}
|
||||
};
|
||||
|
||||
public HToolkit() {
|
||||
}
|
||||
|
||||
/*
|
||||
* Component peer objects - unsupported.
|
||||
*/
|
||||
|
||||
@Override
|
||||
public FramePeer createLightweightFrame(LightweightFrame target)
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public KeyboardFocusManagerPeer getKeyboardFocusManagerPeer() {
|
||||
// See 6833019.
|
||||
return kfmPeer;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TrayIconPeer createTrayIcon(TrayIcon target)
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public SystemTrayPeer createSystemTray(SystemTray target)
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isTraySupported() {
|
||||
return false;
|
||||
}
|
||||
|
||||
public GlobalCursorManager getGlobalCursorManager()
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
/*
|
||||
* Headless toolkit - unsupported.
|
||||
*/
|
||||
@Override
|
||||
protected void loadSystemColors(int[] systemColors)
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ColorModel getColorModel()
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getScreenResolution()
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<java.awt.font.TextAttribute, ?> mapInputMethodHighlight(
|
||||
InputMethodHighlight highlight)
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Deprecated(since = "10")
|
||||
public int getMenuShortcutKeyMask()
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMenuShortcutKeyMaskEx()
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getLockingKeyState(int keyCode)
|
||||
throws UnsupportedOperationException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLockingKeyState(int keyCode, boolean on)
|
||||
throws UnsupportedOperationException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Cursor createCustomCursor(Image cursor, Point hotSpot, String name)
|
||||
throws IndexOutOfBoundsException, HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dimension getBestCursorSize(int preferredWidth, int preferredHeight)
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaximumCursorColors()
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends DragGestureRecognizer> T
|
||||
createDragGestureRecognizer(Class<T> abstractRecognizerClass,
|
||||
DragSource ds, Component c,
|
||||
int srcActions, DragGestureListener dgl)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dimension getScreenSize()
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Insets getScreenInsets(GraphicsConfiguration gc)
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDynamicLayout(boolean dynamic)
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isDynamicLayoutSet()
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDynamicLayoutActive()
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Clipboard getSystemClipboard()
|
||||
throws HeadlessException {
|
||||
throw new HeadlessException();
|
||||
}
|
||||
|
||||
/*
|
||||
* Printing
|
||||
*/
|
||||
@Override
|
||||
public PrintJob getPrintJob(Frame frame, String jobtitle,
|
||||
JobAttributes jobAttributes,
|
||||
PageAttributes pageAttributes) {
|
||||
if (frame != null) {
|
||||
// Should never happen
|
||||
throw new HeadlessException();
|
||||
}
|
||||
throw new IllegalArgumentException(
|
||||
"PrintJob not supported in a headless environment");
|
||||
}
|
||||
|
||||
@Override
|
||||
public PrintJob getPrintJob(Frame frame, String doctitle, Properties props)
|
||||
{
|
||||
if (frame != null) {
|
||||
// Should never happen
|
||||
throw new HeadlessException();
|
||||
}
|
||||
throw new IllegalArgumentException(
|
||||
"PrintJob not supported in a headless environment");
|
||||
}
|
||||
|
||||
/*
|
||||
* Headless toolkit - supported.
|
||||
*/
|
||||
|
||||
@Override
|
||||
public void sync() {
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean syncNativeQueue(final long timeout) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void beep() {
|
||||
// Send alert character
|
||||
System.out.write(0x07);
|
||||
}
|
||||
|
||||
/*
|
||||
* Modality
|
||||
*/
|
||||
@Override
|
||||
public boolean isModalityTypeSupported(Dialog.ModalityType modalityType) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isModalExclusionTypeSupported(Dialog.ModalExclusionType exclusionType) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDesktopSupported() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isTaskbarSupported() {
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean isWindowOpacityControlSupported() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isWindowShapingSupported() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isWindowTranslucencySupported() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void grab(Window w) { }
|
||||
|
||||
@Override
|
||||
public void ungrab(Window w) { }
|
||||
|
||||
protected boolean syncNativeQueue() { return false; }
|
||||
|
||||
@Override
|
||||
public InputMethodDescriptor getInputMethodAdapterDescriptor()
|
||||
throws AWTException
|
||||
{
|
||||
return (InputMethodDescriptor)null;
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user