There it is. I needed to disable white space ignoring in the diff tool. So, once the CR is filed, what is the expected time frame for this change to be released? Will it be in jdk8 only or in the next jdk7 maintenance release?
El lun, 24-10-2011 a las 17:22 +0400, Anthony Petrov escribió: > Hi Federico, > > Please correct the code indentation - the lines which get wrapped into > an if(){} statement need to be moved 4 spaces to the right. > > Also, please add a space before each opening { that you're adding. > > Otherwise the fix looks good. Thank you! Once you post the final version > of the patch, I can file a CR for this issue and push the fix to the > repository. >
# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /home/fede/Desarrollo/jdk7/jdk # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: src/solaris/classes/sun/awt/X11/XComponentPeer.java --- src/solaris/classes/sun/awt/X11/XComponentPeer.java Base (BASE) +++ src/solaris/classes/sun/awt/X11/XComponentPeer.java Locally Modified (Based On LOCAL) @@ -38,7 +38,6 @@ import java.awt.GraphicsConfiguration; import java.awt.Image; import java.awt.Insets; -import java.awt.KeyboardFocusManager; import java.awt.Rectangle; import java.awt.SystemColor; import java.awt.Toolkit; @@ -59,13 +58,10 @@ import java.awt.image.VolatileImage; import java.awt.peer.ComponentPeer; import java.awt.peer.ContainerPeer; -import java.awt.peer.LightweightPeer; import java.lang.reflect.*; import java.security.*; import java.util.Collection; -import java.util.HashSet; import java.util.Set; -import java.util.Vector; import sun.util.logging.PlatformLogger; import sun.awt.*; @@ -475,12 +471,16 @@ if (true) { switch(e.getID()) { case PaintEvent.UPDATE: - log.finer("XCP coalescePaintEvent : UPDATE : add : x = " + + if(log.isLoggable(PlatformLogger.FINER)) { + log.finer("XCP coalescePaintEvent : UPDATE : add : x = " + r.x + ", y = " + r.y + ", width = " + r.width + ",height = " + r.height); + } return; case PaintEvent.PAINT: - log.finer("XCP coalescePaintEvent : PAINT : add : x = " + + if(log.isLoggable(PlatformLogger.FINER)) { + log.finer("XCP coalescePaintEvent : PAINT : add : x = " + r.x + ", y = " + r.y + ", width = " + r.width + ",height = " + r.height); + } return; } } @@ -1257,7 +1257,9 @@ * ButtonPress, ButtonRelease, KeyPress, KeyRelease, EnterNotify, LeaveNotify, MotionNotify */ protected boolean isEventDisabled(XEvent e) { - enableLog.finest("Component is {1}, checking for disabled event {0}", e, (isEnabled()?"enabled":"disable")); + if(enableLog.isLoggable(PlatformLogger.FINEST)) { + enableLog.finest("Component is {1}, checking for disabled event {0}", e, (isEnabled()?"enabled":"disable")); + } if (!isEnabled()) { switch (e.get_type()) { case XConstants.ButtonPress: @@ -1267,7 +1269,9 @@ case XConstants.EnterNotify: case XConstants.LeaveNotify: case XConstants.MotionNotify: - enableLog.finer("Event {0} is disable", e); + if(enableLog.isLoggable(PlatformLogger.FINER)) { + enableLog.finer("Event {0} is disable", e); + } return true; } }