Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 6296:39282f162343 jdk7u25-b12
Merge
author | ngthomas |
---|---|
date | Tue, 21 May 2013 11:41:23 -0700 |
parents | 415182744480 (current diff) cf82127fbb70 (diff) |
children | ba6c3d64b94d |
files | |
diffstat | 2 files changed, 2 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/awt/Toolkit.java Tue May 21 10:25:40 2013 -0700 +++ b/src/share/classes/java/awt/Toolkit.java Tue May 21 11:41:23 2013 -0700 @@ -48,8 +48,6 @@ import java.io.FileInputStream; import java.util.*; -import sun.util.logging.PlatformLogger; - import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import sun.awt.AppContext; @@ -1978,7 +1976,7 @@ */ public abstract boolean isModalExclusionTypeSupported(Dialog.ModalExclusionType modalExclusionType); - private static final PlatformLogger log = PlatformLogger.getLogger("java.awt.Toolkit"); + // 8014736: logging has been removed from Toolkit private static final int LONG_BITS = 64; private int[] calls = new int[LONG_BITS]; @@ -2145,12 +2143,6 @@ } synchronized int countAWTEventListeners(long eventMask) { - if (log.isLoggable(PlatformLogger.FINE)) { - if (eventMask == 0) { - log.fine("Assertion (eventMask != 0) failed"); - } - } - int ci = 0; for (; eventMask != 0; eventMask >>>= 1, ci++) { }
--- a/src/share/classes/sun/awt/SunToolkit.java Tue May 21 10:25:40 2013 -0700 +++ b/src/share/classes/sun/awt/SunToolkit.java Tue May 21 11:41:23 2013 -0700 @@ -58,7 +58,7 @@ implements WindowClosingSupport, WindowClosingListener, ComponentFactory, InputMethodSupport, KeyboardFocusManagerPeerProvider { - private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.SunToolkit"); + // 8014736: logging has been removed from SunToolkit /* Load debug settings for native code */ static { @@ -490,10 +490,6 @@ // otherwise have to be modified to precisely identify // system-generated events. setSystemGenerated(event); - AppContext eventContext = targetToAppContext(event.getSource()); - if (eventContext != null && !eventContext.equals(appContext)) { - log.fine("Event posted on wrong app context : " + event); - } PostEventQueue postEventQueue = (PostEventQueue)appContext.get(POST_EVENT_QUEUE_KEY); if (postEventQueue != null) { @@ -902,10 +898,6 @@ //with scale factors x1, x3/4, x2/3, xN, x1/N. Image im = i.next(); if (im == null) { - if (log.isLoggable(PlatformLogger.FINER)) { - log.finer("SunToolkit.getScaledIconImage: " + - "Skipping the image passed into Java because it's null."); - } continue; } if (im instanceof ToolkitImage) { @@ -918,10 +910,6 @@ iw = im.getWidth(null); ih = im.getHeight(null); } catch (Exception e){ - if (log.isLoggable(PlatformLogger.FINER)) { - log.finer("SunToolkit.getScaledIconImage: " + - "Perhaps the image passed into Java is broken. Skipping this icon."); - } continue; } if (iw > 0 && ih > 0) { @@ -993,14 +981,6 @@ try { int x = (width - bestWidth) / 2; int y = (height - bestHeight) / 2; - if (log.isLoggable(PlatformLogger.FINER)) { - log.finer("WWindowPeer.getScaledIconData() result : " + - "w : " + width + " h : " + height + - " iW : " + bestImage.getWidth(null) + " iH : " + bestImage.getHeight(null) + - " sim : " + bestSimilarity + " sf : " + bestScaleFactor + - " adjW : " + bestWidth + " adjH : " + bestHeight + - " x : " + x + " y : " + y); - } g.drawImage(bestImage, x, y, bestWidth, bestHeight, null); } finally { g.dispose(); @@ -1011,10 +991,6 @@ public static DataBufferInt getScaledIconData(java.util.List<Image> imageList, int width, int height) { BufferedImage bimage = getScaledIconImage(imageList, width, height); if (bimage == null) { - if (log.isLoggable(PlatformLogger.FINER)) { - log.finer("SunToolkit.getScaledIconData: " + - "Perhaps the image passed into Java is broken. Skipping this icon."); - } return null; } Raster raster = bimage.getRaster();