diff options
author | jfrijters <jfrijters> | 2011-07-28 17:32:44 +0400 |
---|---|---|
committer | jfrijters <jfrijters> | 2011-07-28 17:32:44 +0400 |
commit | d69306c84206121cf31d119429f9828e7344fcc8 (patch) | |
tree | b1bc4859f08c8d638f057c4a74da4681c7329431 /openjdk/sun | |
parent | f128649a6f53edf57d89d37ff52d2541cfab0198 (diff) |
Complete migration to OpenJDK 7. Thanks to Volker Berlin for the bulk of this patch.
Diffstat (limited to 'openjdk/sun')
-rw-r--r-- | openjdk/sun/awt/SunToolkit.java | 11 | ||||
-rw-r--r-- | openjdk/sun/font/StandardGlyphVector.java | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/openjdk/sun/awt/SunToolkit.java b/openjdk/sun/awt/SunToolkit.java index 9d2f4ef0..df32417e 100644 --- a/openjdk/sun/awt/SunToolkit.java +++ b/openjdk/sun/awt/SunToolkit.java @@ -48,6 +48,8 @@ import sun.misc.SoftCache; import sun.awt.image.*; import sun.security.action.GetPropertyAction; import sun.security.action.GetBooleanAction; +import sun.util.logging.PlatformLogger; + import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Constructor; @@ -222,11 +224,8 @@ public abstract class SunToolkit extends Toolkit public abstract RobotPeer createRobot(Robot target, GraphicsDevice screen) throws AWTException; - public KeyboardFocusManagerPeer createKeyboardFocusManagerPeer(KeyboardFocusManager manager) throws HeadlessException { - KeyboardFocusManagerPeerImpl peer = new KeyboardFocusManagerPeerImpl(manager); - return peer; - } - + public abstract KeyboardFocusManagerPeer createKeyboardFocusManagerPeer(KeyboardFocusManager manager) throws HeadlessException; + /** * The AWT lock is typically only used on Unix platforms to synchronize * access to Xlib, OpenGL, etc. However, these methods are implemented @@ -1965,7 +1964,7 @@ public abstract class SunToolkit extends Toolkit } } - protected static void dumpPeers(final Logger aLog) { + protected static void dumpPeers(final PlatformLogger aLog) { AWTAutoShutdown.getInstance().dumpPeers(aLog); } diff --git a/openjdk/sun/font/StandardGlyphVector.java b/openjdk/sun/font/StandardGlyphVector.java index 424643c3..2c19870c 100644 --- a/openjdk/sun/font/StandardGlyphVector.java +++ b/openjdk/sun/font/StandardGlyphVector.java @@ -68,7 +68,7 @@ public class StandardGlyphVector extends GlyphVector{ } this.frc = frc; this.glyphs = str; - this.font2D = FontManager.getFont2D(font); + this.font2D = FontUtilities.getFont2D(font); this.strike = font2D.getStrike(font, frc); } @@ -445,7 +445,7 @@ public class StandardGlyphVector extends GlyphVector{ return false; } for (int i = 0; i < str.length(); ++i) { - if (FontManager.isNonSimpleChar(str.charAt(i))) { + if (FontUtilities.isNonSimpleChar(str.charAt(i))) { return false; } } |