infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-20 07:15:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10

Browse Source 
Removed logging from SunToolkit

Reviewed-by: art
This commit is contained in:
Leonid Romanov 2013-05-20 19:07:01 +04:00
parent 5c7bbef885
commit 1dedaf5bf0
2 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jdk/src/share/classes/java/awt/Toolkit.java
View File

@ -48,8 +48,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.util.*;
import sun.util.logging.PlatformLogger;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import sun.awt.AppContext;
@ -1983,7 +1981,7 @@ public abstract class Toolkit {
*/
public abstract boolean isModalExclusionTypeSupported(Dialog.ModalExclusionType modalExclusionType);
private static final PlatformLogger log = PlatformLogger.getLogger("java.awt.Toolkit");
// 8014718: logging has been removed from SunToolkit
private static final int LONG_BITS = 64;
private int[] calls = new int[LONG_BITS];
@ -2150,12 +2148,6 @@ public abstract class Toolkit {
}
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++) {
}

26
jdk/src/share/classes/sun/awt/SunToolkit.java
View File

@ -58,7 +58,7 @@ public abstract class SunToolkit extends Toolkit
implements WindowClosingSupport, WindowClosingListener,
ComponentFactory, InputMethodSupport, KeyboardFocusManagerPeerProvider {
private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.SunToolkit");
// 8014718: logging has been removed from SunToolkit
/* Load debug settings for native code */
static {
@ -496,9 +496,7 @@ public abstract class SunToolkit extends Toolkit
setSystemGenerated(event);
AppContext eventContext = targetToAppContext(event.getSource());
if (eventContext != null && !eventContext.equals(appContext)) {
if (log.isLoggable(PlatformLogger.FINE)) {
log.fine("Event posted on wrong app context : " + event);
}
throw new RuntimeException("Event posted on wrong app context : " + event);
}
PostEventQueue postEventQueue =
(PostEventQueue)appContext.get(POST_EVENT_QUEUE_KEY);
@ -889,10 +887,6 @@ public abstract class SunToolkit extends Toolkit
//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) {
@ -905,10 +899,6 @@ public abstract class SunToolkit extends Toolkit
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) {
@ -980,14 +970,6 @@ public abstract class SunToolkit extends Toolkit
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();
@ -998,10 +980,6 @@ public abstract class SunToolkit extends Toolkit
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();