jdk-sandbox: comparison jdk/src/share/classes/java/awt/Container.java

equal deleted inserted replaced

-:487e1aa949c4
+:ef327bd847c0
 import java.util.Arrays;
 import java.util.EventListener;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.logging.*;
 import javax.accessibility.*;
+import sun.util.logging.PlatformLogger;
 import sun.awt.AppContext;
 import sun.awt.CausedFocusEvent;
 import sun.awt.PeerEvent;
 import sun.awt.SunToolkit;
 * @see       LayoutManager
 * @since     JDK1.0
 */
 public class Container extends Component {
-private static final Logger log = Logger.getLogger("java.awt.Container");
+private static final PlatformLogger log = PlatformLogger.getLogger("java.awt.Container");
-private static final Logger eventLog = Logger.getLogger("java.awt.event.Container");
+private static final PlatformLogger eventLog = PlatformLogger.getLogger("java.awt.event.Container");
 private static final Component[] EMPTY_ARRAY = new Component[0];
 /**
 * The components in this container.
 * all descendant containers).
 */
 private transient int numOfHWComponents = 0;
 private transient int numOfLWComponents = 0;
-private static final Logger mixingLog = Logger.getLogger("java.awt.mixing.Container");
+private static final PlatformLogger mixingLog = PlatformLogger.getLogger("java.awt.mixing.Container");
 /**
 * @serialField ncomponents                     int
 *       The number of components in this container.
 *       This value can be null.
 // Should only be called while holding tree lock
 int numListening(long mask) {
 int superListening = super.numListening(mask);
 if (mask == AWTEvent.HIERARCHY_EVENT_MASK) {
-if (eventLog.isLoggable(Level.FINE)) {
+if (eventLog.isLoggable(PlatformLogger.FINE)) {
 // Verify listeningChildren is correct
 int sum = 0;
 for (Component comp : component) {
 sum += comp.numListening(mask);
 }
 if (listeningChildren != sum) {
-eventLog.log(Level.FINE, "Assertion (listeningChildren == sum) failed");
+eventLog.fine("Assertion (listeningChildren == sum) failed");
 }
 }
 return listeningChildren + superListening;
 } else if (mask == AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK) {
-if (eventLog.isLoggable(Level.FINE)) {
+if (eventLog.isLoggable(PlatformLogger.FINE)) {
 // Verify listeningBoundsChildren is correct
 int sum = 0;
 for (Component comp : component) {
 sum += comp.numListening(mask);
 }
 if (listeningBoundsChildren != sum) {
-eventLog.log(Level.FINE, "Assertion (listeningBoundsChildren == sum) failed");
+eventLog.fine("Assertion (listeningBoundsChildren == sum) failed");
 }
 }
 return listeningBoundsChildren + superListening;
 } else {
 // assert false;
-if (eventLog.isLoggable(Level.FINE)) {
+if (eventLog.isLoggable(PlatformLogger.FINE)) {
-eventLog.log(Level.FINE, "This code must never be reached");
+eventLog.fine("This code must never be reached");
 }
 return superListening;
 }
 }
 // Should only be called while holding tree lock
 void adjustListeningChildren(long mask, int num) {
-if (eventLog.isLoggable(Level.FINE)) {
+if (eventLog.isLoggable(PlatformLogger.FINE)) {
 boolean toAssert = (mask == AWTEvent.HIERARCHY_EVENT_MASK ||
 mask == AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK ||
 mask == (AWTEvent.HIERARCHY_EVENT_MASK |
 AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK));
 if (!toAssert) {
-eventLog.log(Level.FINE, "Assertion failed");
+eventLog.fine("Assertion failed");
 }
 }
 if (num == 0)
 return;
 }
 }
 // Should only be called while holding tree lock
 int countHierarchyMembers() {
-if (log.isLoggable(Level.FINE)) {
+if (log.isLoggable(PlatformLogger.FINE)) {
 // Verify descendantsCount is correct
 int sum = 0;
 for (Component comp : component) {
 sum += comp.countHierarchyMembers();
 }
 if (descendantsCount != sum) {
-log.log(Level.FINE, "Assertion (descendantsCount == sum) failed");
+log.fine("Assertion (descendantsCount == sum) failed");
 }
 }
 return descendantsCount + 1;
 }
 recursiveSubtractAndApplyShape(shape, fromZorder, getBottommostComponentIndex());
 }
 final void recursiveSubtractAndApplyShape(Region shape, int fromZorder, int toZorder) {
 checkTreeLock();
-if (mixingLog.isLoggable(Level.FINE)) {
+if (mixingLog.isLoggable(PlatformLogger.FINE)) {
 mixingLog.fine("this = " + this +
 "; shape=" + shape + "; fromZ=" + fromZorder + "; toZ=" + toZorder);
 }
 if (fromZorder == -1) {
 return;
 recursiveApplyCurrentShape(fromZorder, getBottommostComponentIndex());
 }
 final void recursiveApplyCurrentShape(int fromZorder, int toZorder) {
 checkTreeLock();
-if (mixingLog.isLoggable(Level.FINE)) {
+if (mixingLog.isLoggable(PlatformLogger.FINE)) {
 mixingLog.fine("this = " + this +
 "; fromZ=" + fromZorder + "; toZ=" + toZorder);
 }
 if (fromZorder == -1) {
 return;
 }
 @Override
 void mixOnShowing() {
 synchronized (getTreeLock()) {
-if (mixingLog.isLoggable(Level.FINE)) {
+if (mixingLog.isLoggable(PlatformLogger.FINE)) {
 mixingLog.fine("this = " + this);
 }
 if (!isMixingNeeded()) {
 return;
 }
 @Override
 void mixOnHiding(boolean isLightweight) {
 synchronized (getTreeLock()) {
-if (mixingLog.isLoggable(Level.FINE)) {
+if (mixingLog.isLoggable(PlatformLogger.FINE)) {
 mixingLog.fine("this = " + this +
 "; isLightweight=" + isLightweight);
 }
 if (isLightweight) {
 recursiveHideHeavyweightChildren();
 }
 @Override
 void mixOnReshaping() {
 synchronized (getTreeLock()) {
-if (mixingLog.isLoggable(Level.FINE)) {
+if (mixingLog.isLoggable(PlatformLogger.FINE)) {
 mixingLog.fine("this = " + this);
 }
 boolean isMixingNeeded = isMixingNeeded();
 }
 @Override
 void mixOnZOrderChanging(int oldZorder, int newZorder) {
 synchronized (getTreeLock()) {
-if (mixingLog.isLoggable(Level.FINE)) {
+if (mixingLog.isLoggable(PlatformLogger.FINE)) {
 mixingLog.fine("this = " + this +
 "; oldZ=" + oldZorder + "; newZ=" + newZorder);
 }
 if (!isMixingNeeded()) {
 }
 @Override
 void mixOnValidating() {
 synchronized (getTreeLock()) {
-if (mixingLog.isLoggable(Level.FINE)) {
+if (mixingLog.isLoggable(PlatformLogger.FINE)) {
 mixingLog.fine("this = " + this);
 }
 if (!isMixingNeeded()) {
 return;
 * Our own mouse event for when we're dragged over from another hw
 * container
 */
 private static final int  LWD_MOUSE_DRAGGED_OVER = 1500;
-private static final Logger eventLog = Logger.getLogger("java.awt.event.LightweightDispatcher");
+private static final PlatformLogger eventLog = PlatformLogger.getLogger("java.awt.event.LightweightDispatcher");
 LightweightDispatcher(Container nativeContainer) {
 this.nativeContainer = nativeContainer;
 mouseEventTarget = null;
 eventMask = 0;
 break;
 case MouseEvent.MOUSE_WHEEL:
 // This may send it somewhere that doesn't have MouseWheelEvents
 // enabled.  In this case, Component.dispatchEventImpl() will
 // retarget the event to a parent that DOES have the events enabled.
-if (eventLog.isLoggable(Level.FINEST) && (mouseOver != null)) {
+if (eventLog.isLoggable(PlatformLogger.FINEST) && (mouseOver != null)) {
-eventLog.log(Level.FINEST, "retargeting mouse wheel to " +
+eventLog.finest("retargeting mouse wheel to " +
 mouseOver.getName() + ", " +
 mouseOver.getClass());
 }
 retargetMouseEvent(mouseOver, id, e);
 break;
 }
 e.consume();

changeset 3938	ef327bd847c0
parent 2805	9f18d7e66042
child 3972	8942e64cf57d