Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5805] classlib6/core/src/openjdk
|
From: <ls...@us...> - 2011-03-06 18:56:01
|
Revision: 5805
http://jnode.svn.sourceforge.net/jnode/?rev=5805&view=rev
Author: lsantha
Date: 2011-03-06 18:55:51 +0000 (Sun, 06 Mar 2011)
Log Message:
-----------
Integrating OpenJDK 6 b22.
Modified Paths:
--------------
classlib6/core/src/openjdk/java/java/awt/AWTError.java
classlib6/core/src/openjdk/java/java/awt/AWTEvent.java
classlib6/core/src/openjdk/java/java/awt/AWTEventMulticaster.java
classlib6/core/src/openjdk/java/java/awt/AWTException.java
classlib6/core/src/openjdk/java/java/awt/AWTKeyStroke.java
classlib6/core/src/openjdk/java/java/awt/AWTPermission.java
classlib6/core/src/openjdk/java/java/awt/ActiveEvent.java
classlib6/core/src/openjdk/java/java/awt/Adjustable.java
classlib6/core/src/openjdk/java/java/awt/AttributeValue.java
classlib6/core/src/openjdk/java/java/awt/BufferCapabilities.java
classlib6/core/src/openjdk/java/java/awt/CheckboxGroup.java
classlib6/core/src/openjdk/java/java/awt/Color.java
classlib6/core/src/openjdk/java/java/awt/Component.java
classlib6/core/src/openjdk/java/java/awt/ComponentOrientation.java
classlib6/core/src/openjdk/java/java/awt/Composite.java
classlib6/core/src/openjdk/java/java/awt/CompositeContext.java
classlib6/core/src/openjdk/java/java/awt/Conditional.java
classlib6/core/src/openjdk/java/java/awt/ContainerOrderFocusTraversalPolicy.java
classlib6/core/src/openjdk/java/java/awt/DefaultFocusTraversalPolicy.java
classlib6/core/src/openjdk/java/java/awt/DefaultKeyboardFocusManager.java
classlib6/core/src/openjdk/java/java/awt/DisplayMode.java
classlib6/core/src/openjdk/java/java/awt/Event.java
classlib6/core/src/openjdk/java/java/awt/EventDispatchThread.java
classlib6/core/src/openjdk/java/java/awt/EventQueue.java
classlib6/core/src/openjdk/java/java/awt/FocusTraversalPolicy.java
classlib6/core/src/openjdk/java/java/awt/FontFormatException.java
classlib6/core/src/openjdk/java/java/awt/FontMetrics.java
classlib6/core/src/openjdk/java/java/awt/GradientPaint.java
classlib6/core/src/openjdk/java/java/awt/GradientPaintContext.java
classlib6/core/src/openjdk/java/java/awt/Graphics2D.java
classlib6/core/src/openjdk/java/java/awt/GraphicsCallback.java
classlib6/core/src/openjdk/java/java/awt/GraphicsConfigTemplate.java
classlib6/core/src/openjdk/java/java/awt/GraphicsConfiguration.java
classlib6/core/src/openjdk/java/java/awt/GraphicsDevice.java
classlib6/core/src/openjdk/java/java/awt/GraphicsEnvironment.java
classlib6/core/src/openjdk/java/java/awt/GridBagLayoutInfo.java
classlib6/core/src/openjdk/java/java/awt/HeadlessException.java
classlib6/core/src/openjdk/java/java/awt/IllegalComponentStateException.java
classlib6/core/src/openjdk/java/java/awt/ImageCapabilities.java
classlib6/core/src/openjdk/java/java/awt/Insets.java
classlib6/core/src/openjdk/java/java/awt/ItemSelectable.java
classlib6/core/src/openjdk/java/java/awt/JobAttributes.java
classlib6/core/src/openjdk/java/java/awt/KeyEventDispatcher.java
classlib6/core/src/openjdk/java/java/awt/KeyEventPostProcessor.java
classlib6/core/src/openjdk/java/java/awt/KeyboardFocusManager.java
classlib6/core/src/openjdk/java/java/awt/LayoutManager.java
classlib6/core/src/openjdk/java/java/awt/LayoutManager2.java
classlib6/core/src/openjdk/java/java/awt/LinearGradientPaint.java
classlib6/core/src/openjdk/java/java/awt/LinearGradientPaintContext.java
classlib6/core/src/openjdk/java/java/awt/MenuComponent.java
classlib6/core/src/openjdk/java/java/awt/MenuContainer.java
classlib6/core/src/openjdk/java/java/awt/MenuShortcut.java
classlib6/core/src/openjdk/java/java/awt/MouseInfo.java
classlib6/core/src/openjdk/java/java/awt/MultipleGradientPaint.java
classlib6/core/src/openjdk/java/java/awt/MultipleGradientPaintContext.java
classlib6/core/src/openjdk/java/java/awt/PageAttributes.java
classlib6/core/src/openjdk/java/java/awt/Paint.java
classlib6/core/src/openjdk/java/java/awt/PaintContext.java
classlib6/core/src/openjdk/java/java/awt/PointerInfo.java
classlib6/core/src/openjdk/java/java/awt/PopupMenu.java
classlib6/core/src/openjdk/java/java/awt/PrintGraphics.java
classlib6/core/src/openjdk/java/java/awt/PrintJob.java
classlib6/core/src/openjdk/java/java/awt/RadialGradientPaint.java
classlib6/core/src/openjdk/java/java/awt/RadialGradientPaintContext.java
classlib6/core/src/openjdk/java/java/awt/RenderingHints.java
classlib6/core/src/openjdk/java/java/awt/ScrollPane.java
classlib6/core/src/openjdk/java/java/awt/ScrollPaneAdjustable.java
classlib6/core/src/openjdk/java/java/awt/SentEvent.java
classlib6/core/src/openjdk/java/java/awt/SequencedEvent.java
classlib6/core/src/openjdk/java/java/awt/Shape.java
classlib6/core/src/openjdk/java/java/awt/SplashScreen.java
classlib6/core/src/openjdk/java/java/awt/Stroke.java
classlib6/core/src/openjdk/java/java/awt/SystemColor.java
classlib6/core/src/openjdk/java/java/awt/SystemTray.java
classlib6/core/src/openjdk/java/java/awt/Transparency.java
classlib6/core/src/openjdk/java/java/awt/TrayIcon.java
classlib6/core/src/openjdk/java/java/awt/package.html
classlib6/core/src/openjdk/sun/sun/applet/AppletAudioClip.java
classlib6/core/src/openjdk/sun/sun/applet/AppletClassLoader.java
classlib6/core/src/openjdk/sun/sun/applet/AppletEvent.java
classlib6/core/src/openjdk/sun/sun/applet/AppletEventMulticaster.java
classlib6/core/src/openjdk/sun/sun/applet/AppletIOException.java
classlib6/core/src/openjdk/sun/sun/applet/AppletIllegalArgumentException.java
classlib6/core/src/openjdk/sun/sun/applet/AppletImageRef.java
classlib6/core/src/openjdk/sun/sun/applet/AppletListener.java
classlib6/core/src/openjdk/sun/sun/applet/AppletMessageHandler.java
classlib6/core/src/openjdk/sun/sun/applet/AppletObjectInputStream.java
classlib6/core/src/openjdk/sun/sun/applet/AppletProps.java
classlib6/core/src/openjdk/sun/sun/applet/AppletResourceLoader.java
classlib6/core/src/openjdk/sun/sun/applet/AppletSecurityException.java
classlib6/core/src/openjdk/sun/sun/applet/AppletThreadGroup.java
classlib6/core/src/openjdk/sun/sun/applet/AppletViewer.java
classlib6/core/src/openjdk/sun/sun/applet/AppletViewerFactory.java
classlib6/core/src/openjdk/sun/sun/applet/AppletViewerPanel.java
classlib6/core/src/openjdk/sun/sun/applet/Main.java
classlib6/core/src/openjdk/sun/sun/awt/AWTAutoShutdown.java
classlib6/core/src/openjdk/sun/sun/awt/AWTSecurityManager.java
classlib6/core/src/openjdk/sun/sun/awt/AppContext.java
classlib6/core/src/openjdk/sun/sun/awt/CausedFocusEvent.java
classlib6/core/src/openjdk/sun/sun/awt/CharsetString.java
classlib6/core/src/openjdk/sun/sun/awt/ComponentAccessor.java
classlib6/core/src/openjdk/sun/sun/awt/ComponentFactory.java
classlib6/core/src/openjdk/sun/sun/awt/ConstrainableGraphics.java
classlib6/core/src/openjdk/sun/sun/awt/CustomCursor.java
classlib6/core/src/openjdk/sun/sun/awt/DebugSettings.java
classlib6/core/src/openjdk/sun/sun/awt/DefaultMouseInfoPeer.java
classlib6/core/src/openjdk/sun/sun/awt/DesktopBrowse.java
classlib6/core/src/openjdk/sun/sun/awt/DisplayChangedListener.java
classlib6/core/src/openjdk/sun/sun/awt/EmbeddedFrame.java
classlib6/core/src/openjdk/sun/sun/awt/EventListenerAggregate.java
classlib6/core/src/openjdk/sun/sun/awt/FocusingTextField.java
classlib6/core/src/openjdk/sun/sun/awt/FontConfiguration.java
classlib6/core/src/openjdk/sun/sun/awt/FontDescriptor.java
classlib6/core/src/openjdk/sun/sun/awt/GlobalCursorManager.java
classlib6/core/src/openjdk/sun/sun/awt/Graphics2Delegate.java
classlib6/core/src/openjdk/sun/sun/awt/HeadlessToolkit.java
classlib6/core/src/openjdk/sun/sun/awt/InputMethodSupport.java
classlib6/core/src/openjdk/sun/sun/awt/KeyboardFocusManagerPeerImpl.java
classlib6/core/src/openjdk/sun/sun/awt/ModalExclude.java
classlib6/core/src/openjdk/sun/sun/awt/ModalityEvent.java
classlib6/core/src/openjdk/sun/sun/awt/ModalityListener.java
classlib6/core/src/openjdk/sun/sun/awt/Mutex.java
classlib6/core/src/openjdk/sun/sun/awt/NativeLibLoader.java
classlib6/core/src/openjdk/sun/sun/awt/NullComponentPeer.java
classlib6/core/src/openjdk/sun/sun/awt/OSInfo.java
classlib6/core/src/openjdk/sun/sun/awt/OrientableFlowLayout.java
classlib6/core/src/openjdk/sun/sun/awt/PeerEvent.java
classlib6/core/src/openjdk/sun/sun/awt/PlatformFont.java
classlib6/core/src/openjdk/sun/sun/awt/RepaintArea.java
classlib6/core/src/openjdk/sun/sun/awt/RequestFocusController.java
classlib6/core/src/openjdk/sun/sun/awt/ScrollPaneWheelScroller.java
classlib6/core/src/openjdk/sun/sun/awt/SunDisplayChanger.java
classlib6/core/src/openjdk/sun/sun/awt/SunGraphicsCallback.java
classlib6/core/src/openjdk/sun/sun/awt/SunHints.java
classlib6/core/src/openjdk/sun/sun/awt/Symbol.java
classlib6/core/src/openjdk/sun/sun/awt/TracedEventQueue.java
classlib6/core/src/openjdk/sun/sun/awt/VariableGridLayout.java
classlib6/core/src/openjdk/sun/sun/awt/VerticalBagLayout.java
classlib6/core/src/openjdk/sun/sun/awt/WindowAccessor.java
classlib6/core/src/openjdk/sun/sun/awt/WindowClosingListener.java
classlib6/core/src/openjdk/sun/sun/awt/WindowClosingSupport.java
classlib6/core/src/openjdk/sun/sun/awt/WindowIDProvider.java
classlib6/core/src/openjdk/sun/sun/font/AttributeMap.java
classlib6/core/src/openjdk/sun/sun/font/AttributeValues.java
classlib6/core/src/openjdk/sun/sun/font/BidiUtils.java
classlib6/core/src/openjdk/sun/sun/font/CMap.java
classlib6/core/src/openjdk/sun/sun/font/CharToGlyphMapper.java
classlib6/core/src/openjdk/sun/sun/font/CompositeFont.java
classlib6/core/src/openjdk/sun/sun/font/CompositeFontDescriptor.java
classlib6/core/src/openjdk/sun/sun/font/CompositeGlyphMapper.java
classlib6/core/src/openjdk/sun/sun/font/CompositeStrike.java
classlib6/core/src/openjdk/sun/sun/font/CoreMetrics.java
classlib6/core/src/openjdk/sun/sun/font/Decoration.java
classlib6/core/src/openjdk/sun/sun/font/DelegatingShape.java
classlib6/core/src/openjdk/sun/sun/font/EAttribute.java
classlib6/core/src/openjdk/sun/sun/font/ExtendedTextLabel.java
classlib6/core/src/openjdk/sun/sun/font/ExtendedTextSourceLabel.java
classlib6/core/src/openjdk/sun/sun/font/FileFont.java
classlib6/core/src/openjdk/sun/sun/font/FileFontStrike.java
classlib6/core/src/openjdk/sun/sun/font/Font2D.java
classlib6/core/src/openjdk/sun/sun/font/Font2DHandle.java
classlib6/core/src/openjdk/sun/sun/font/FontDesignMetrics.java
classlib6/core/src/openjdk/sun/sun/font/FontFamily.java
classlib6/core/src/openjdk/sun/sun/font/FontLineMetrics.java
classlib6/core/src/openjdk/sun/sun/font/FontManager.java
classlib6/core/src/openjdk/sun/sun/font/FontManagerNativeLibrary.java
classlib6/core/src/openjdk/sun/sun/font/FontResolver.java
classlib6/core/src/openjdk/sun/sun/font/FontRunIterator.java
classlib6/core/src/openjdk/sun/sun/font/FontScaler.java
classlib6/core/src/openjdk/sun/sun/font/FontScalerException.java
classlib6/core/src/openjdk/sun/sun/font/FontStrike.java
classlib6/core/src/openjdk/sun/sun/font/FontStrikeDesc.java
classlib6/core/src/openjdk/sun/sun/font/FontStrikeDisposer.java
classlib6/core/src/openjdk/sun/sun/font/FreetypeFontScaler.java
classlib6/core/src/openjdk/sun/sun/font/GlyphLayout.java
classlib6/core/src/openjdk/sun/sun/font/GlyphList.java
classlib6/core/src/openjdk/sun/sun/font/GraphicComponent.java
classlib6/core/src/openjdk/sun/sun/font/NullFontScaler.java
classlib6/core/src/openjdk/sun/sun/font/PhysicalFont.java
classlib6/core/src/openjdk/sun/sun/font/PhysicalStrike.java
classlib6/core/src/openjdk/sun/sun/font/Script.java
classlib6/core/src/openjdk/sun/sun/font/ScriptRun.java
classlib6/core/src/openjdk/sun/sun/font/ScriptRunData.java
classlib6/core/src/openjdk/sun/sun/font/StandardGlyphVector.java
classlib6/core/src/openjdk/sun/sun/font/StandardTextSource.java
classlib6/core/src/openjdk/sun/sun/font/StrikeCache.java
classlib6/core/src/openjdk/sun/sun/font/StrikeMetrics.java
classlib6/core/src/openjdk/sun/sun/font/SunLayoutEngine.java
classlib6/core/src/openjdk/sun/sun/font/TextLabel.java
classlib6/core/src/openjdk/sun/sun/font/TextLabelFactory.java
classlib6/core/src/openjdk/sun/sun/font/TextLineComponent.java
classlib6/core/src/openjdk/sun/sun/font/TextRecord.java
classlib6/core/src/openjdk/sun/sun/font/TextSource.java
classlib6/core/src/openjdk/sun/sun/font/TextSourceLabel.java
classlib6/core/src/openjdk/sun/sun/font/TrueTypeFont.java
classlib6/core/src/openjdk/sun/sun/font/TrueTypeGlyphMapper.java
classlib6/core/src/openjdk/sun/sun/font/Type1Font.java
classlib6/core/src/openjdk/sun/sun/font/Type1GlyphMapper.java
classlib6/core/src/openjdk/sun/sun/font/Underline.java
classlib6/core/src/openjdk/sun/sun/java2d/DefaultDisposerRecord.java
classlib6/core/src/openjdk/sun/sun/java2d/Disposer.java
classlib6/core/src/openjdk/sun/sun/java2d/DisposerRecord.java
classlib6/core/src/openjdk/sun/sun/java2d/DisposerTarget.java
classlib6/core/src/openjdk/sun/sun/java2d/FontSupport.java
classlib6/core/src/openjdk/sun/sun/java2d/HeadlessGraphicsEnvironment.java
classlib6/core/src/openjdk/sun/sun/java2d/InvalidPipeException.java
classlib6/core/src/openjdk/sun/sun/java2d/NullSurfaceData.java
classlib6/core/src/openjdk/sun/sun/java2d/StateTrackable.java
classlib6/core/src/openjdk/sun/sun/java2d/StateTrackableDelegate.java
classlib6/core/src/openjdk/sun/sun/java2d/StateTracker.java
classlib6/core/src/openjdk/sun/sun/java2d/SunCompositeContext.java
classlib6/core/src/openjdk/sun/sun/java2d/SunGraphics2D.java
classlib6/core/src/openjdk/sun/sun/java2d/SunGraphicsEnvironment.java
classlib6/core/src/openjdk/sun/sun/java2d/SurfaceData.java
classlib6/core/src/openjdk/sun/sun/java2d/SurfaceDataProxy.java
Added Paths:
-----------
classlib6/core/src/openjdk/sun/sun/font/CreatedFontTracker.java
classlib6/core/src/openjdk/sun/sun/java2d/Spans.java
Modified: classlib6/core/src/openjdk/java/java/awt/AWTError.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/AWTError.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/AWTError.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 1997, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/AWTEvent.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/AWTEvent.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/AWTEvent.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
@@ -33,6 +33,12 @@
import java.util.logging.Logger;
import java.util.logging.Level;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.io.ObjectInputStream;
+import java.io.IOException;
+import sun.awt.AWTAccessor;
+
/**
* The root event class for all AWT events.
* This class and its subclasses supercede the original
@@ -97,10 +103,33 @@
*/
protected boolean consumed = false;
+ /*
+ * The event's AccessControlContext.
+ */
+ private transient volatile AccessControlContext acc =
+ AccessController.getContext();
+
+ /*
+ * Returns the acc this event was constructed with.
+ */
+ final AccessControlContext getAccessControlContext() {
+ if (acc == null) {
+ throw new SecurityException("AWTEvent is missing AccessControlContext");
+ }
+ return acc;
+ }
+
transient boolean focusManagerIsDispatching = false;
transient boolean isPosted;
/**
+ * Indicates whether this AWTEvent was generated by the system as
+ * opposed to by user code.
+ */
+ private transient boolean isSystemGenerated;
+
+
+ /**
* The event mask for selecting component events.
*/
public final static long COMPONENT_EVENT_MASK = 0x01;
@@ -230,6 +259,19 @@
if (!GraphicsEnvironment.isHeadless()) {
initIDs();
}
+ AWTAccessor.setAWTEventAccessor(new AWTAccessor.AWTEventAccessor() {
+ public void setSystemGenerated(AWTEvent ev) {
+ ev.isSystemGenerated = true;
+ }
+
+ public boolean isSystemGenerated(AWTEvent ev) {
+ return ev.isSystemGenerated;
+ }
+
+ public AccessControlContext getAccessControlContext(AWTEvent ev) {
+ return ev.getAccessControlContext();
+ }
+ });
}
private static synchronized Field get_InputEvent_CanAccessSystemClipboard() {
@@ -564,4 +606,11 @@
}
}
}
+
+ private void readObject(ObjectInputStream in)
+ throws ClassNotFoundException, IOException
+ {
+ this.acc = AccessController.getContext();
+ in.defaultReadObject();
+ }
} // class AWTEvent
Modified: classlib6/core/src/openjdk/java/java/awt/AWTEventMulticaster.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/AWTEventMulticaster.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/AWTEventMulticaster.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/AWTException.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/AWTException.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/AWTException.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 1997, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/AWTKeyStroke.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/AWTKeyStroke.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/AWTKeyStroke.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/AWTPermission.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/AWTPermission.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/AWTPermission.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/ActiveEvent.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/ActiveEvent.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/ActiveEvent.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/Adjustable.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/Adjustable.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/Adjustable.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/AttributeValue.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/AttributeValue.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/AttributeValue.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/BufferCapabilities.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/BufferCapabilities.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/BufferCapabilities.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/CheckboxGroup.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/CheckboxGroup.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/CheckboxGroup.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/Color.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/Color.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/Color.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -690,7 +690,7 @@
* @since JDK1.0
*/
public boolean equals(Object obj) {
- return obj instanceof Color && ((Color)obj).value == this.value;
+ return obj instanceof Color && ((Color)obj).getRGB() == this.getRGB();
}
/**
Modified: classlib6/core/src/openjdk/java/java/awt/Component.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/Component.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/Component.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -58,9 +58,11 @@
import java.lang.reflect.Method;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.security.AccessControlContext;
import javax.accessibility.*;
import java.util.logging.*;
import java.applet.Applet;
+import sun.awt.AWTAccessor;
import sun.security.action.GetPropertyAction;
import sun.awt.AppContext;
@@ -451,6 +453,12 @@
static final Object LOCK = new AWTTreeLock();
static class AWTTreeLock {}
+ /*
+ * The component's AccessControlContext.
+ */
+ private transient volatile AccessControlContext acc =
+ AccessController.getContext();
+
/**
* Minimum size.
* (This field perhaps should have been transient).
@@ -641,6 +649,16 @@
return changeSupportLock;
}
+ /*
+ * Returns the acc this component was constructed with.
+ */
+ final AccessControlContext getAccessControlContext() {
+ if (acc == null) {
+ throw new SecurityException("Component is missing AccessControlContext");
+ }
+ return acc;
+ }
+
boolean isPacked = false;
/**
@@ -778,6 +796,16 @@
}
}
+ static {
+ AWTAccessor.setComponentAccessor(new AWTAccessor.ComponentAccessor() {
+ public AccessControlContext getAccessControlContext(Component comp) {
+ return comp.getAccessControlContext();
+ }
+
+ });
+ }
+
+
/**
* Constructs a new component. Class <code>Component</code> can be
* extended directly to create a lightweight component that does not
@@ -4307,7 +4335,7 @@
}
if (eventLog.isLoggable(Level.FINEST)) {
- eventLog.log(Level.FINEST, "{0}", e);
+ eventLog.log(Level.FINEST, "{0}", String.valueOf(e));
}
/*
@@ -8317,6 +8345,8 @@
{
changeSupportLock = new Object();
+ acc = AccessController.getContext();
+
s.defaultReadObject();
appContext = AppContext.getAppContext();
Modified: classlib6/core/src/openjdk/java/java/awt/ComponentOrientation.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/ComponentOrientation.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/ComponentOrientation.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
/*
Modified: classlib6/core/src/openjdk/java/java/awt/Composite.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/Composite.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/Composite.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1997-1998 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/CompositeContext.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/CompositeContext.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/CompositeContext.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1997-1998 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/Conditional.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/Conditional.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/Conditional.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1998 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/ContainerOrderFocusTraversalPolicy.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/ContainerOrderFocusTraversalPolicy.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/ContainerOrderFocusTraversalPolicy.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -21,7 +21,8 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- */package java.awt;
+ */
+package java.awt;
import java.util.logging.*;
Modified: classlib6/core/src/openjdk/java/java/awt/DefaultFocusTraversalPolicy.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/DefaultFocusTraversalPolicy.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/DefaultFocusTraversalPolicy.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/DefaultKeyboardFocusManager.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/DefaultKeyboardFocusManager.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/DefaultKeyboardFocusManager.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
@@ -379,7 +379,7 @@
// should receive focus first
if (focusLog.isLoggable(Level.FINER)) {
focusLog.log(Level.FINER, "tempLost {0}, toFocus {1}",
- new Object[]{tempLost, toFocus});
+ new Object[]{String.valueOf(tempLost), String.valueOf(toFocus)});
}
if (tempLost != null) {
tempLost.requestFocusInWindow(CausedFocusEvent.Cause.ACTIVATION);
@@ -447,7 +447,8 @@
Component newFocusOwner = fe.getComponent();
if (oldFocusOwner == newFocusOwner) {
if (focusLog.isLoggable(Level.FINE)) {
- focusLog.log(Level.FINE, "Skipping {0} because focus owner is the same", new Object[] {e});
+ focusLog.log(Level.FINE, "Skipping {0} because focus owner is the same",
+ new Object[] {String.valueOf(e)});
}
// We can't just drop the event - there could be
// type-ahead markers associated with it.
@@ -554,16 +555,20 @@
FocusEvent fe = (FocusEvent)e;
Component currentFocusOwner = getGlobalFocusOwner();
if (currentFocusOwner == null) {
- if (focusLog.isLoggable(Level.FINE)) focusLog.log(Level.FINE, "Skipping {0} because focus owner is null",
- new Object[] {e});
+ if (focusLog.isLoggable(Level.FINE)) {
+ focusLog.log(Level.FINE, "Skipping {0} because focus owner is null",
+ new Object[] {String.valueOf(e)});
+ }
break;
}
// Ignore cases where a Component loses focus to itself.
// If we make a mistake because of retargeting, then the
// FOCUS_GAINED handler will correct it.
if (currentFocusOwner == fe.getOppositeComponent()) {
- if (focusLog.isLoggable(Level.FINE)) focusLog.log(Level.FINE, "Skipping {0} because current focus owner is equal to opposite",
- new Object[] {e});
+ if (focusLog.isLoggable(Level.FINE)) {
+ focusLog.log(Level.FINE, "Skipping {0} because current focus owner is equal to opposite",
+ new Object[] {String.valueOf(e)});
+ }
break;
}
@@ -631,9 +636,11 @@
Window losingFocusWindow = we.getWindow();
Window activeWindow = getGlobalActiveWindow();
Window oppositeWindow = we.getOppositeWindow();
- if (focusLog.isLoggable(Level.FINE)) focusLog.log(Level.FINE, "Active {0}, Current focused {1}, losing focus {2} opposite {3}",
- new Object[] {activeWindow, currentFocusedWindow,
- losingFocusWindow, oppositeWindow});
+ if (focusLog.isLoggable(Level.FINE)) {
+ focusLog.log(Level.FINE, "Active {0}, Current focused {1}, losing focus {2} opposite {3}",
+ new Object[] {String.valueOf(activeWindow), String.valueOf(currentFocusedWindow),
+ String.valueOf(losingFocusWindow), String.valueOf(oppositeWindow)});
+ }
if (currentFocusedWindow == null) {
break;
}
@@ -819,7 +826,10 @@
}
}
if (ke != null) {
- focusLog.log(Level.FINER, "Pumping approved event {0}", new Object[] {ke});
+ if (focusLog.isLoggable(Level.FINER)) {
+ focusLog.log(Level.FINER, "Pumping approved event {0}",
+ new Object[] {String.valueOf(ke)});
+ }
enqueuedKeyEvents.removeFirst();
}
}
@@ -841,7 +851,7 @@
Iterator iter = typeAheadMarkers.iterator();
while (iter.hasNext()) {
TypeAheadMarker marker = (TypeAheadMarker)iter.next();
- focusLog.log(Level.FINEST, " {0}", marker);
+ focusLog.log(Level.FINEST, " {0}", String.valueOf(marker));
}
}
}
@@ -869,7 +879,10 @@
// The fix is rolled out.
if (ke.getWhen() > marker.after) {
- focusLog.log(Level.FINER, "Storing event {0} because of marker {1}", new Object[] {ke, marker});
+ if (focusLog.isLoggable(Level.FINER)) {
+ focusLog.log(Level.FINER, "Storing event {0} because of marker {1}",
+ new Object[] {String.valueOf(ke), String.valueOf(marker)});
+ }
enqueuedKeyEvents.addLast(ke);
return true;
}
@@ -881,7 +894,10 @@
}
case FocusEvent.FOCUS_GAINED:
- focusLog.log(Level.FINEST, "Markers before FOCUS_GAINED on {0}", new Object[] {target});
+ if (focusLog.isLoggable(Level.FINEST)) {
+ focusLog.log(Level.FINEST, "Markers before FOCUS_GAINED on {0}",
+ new Object[] {String.valueOf(target)});
+ }
dumpMarkers();
// Search the marker list for the first marker tied to
// the Component which just gained focus. Then remove
@@ -910,7 +926,9 @@
}
} else {
// Exception condition - event without marker
- focusLog.log(Level.FINER, "Event without marker {0}", e);
+ if (focusLog.isLoggable(Level.FINER)) {
+ focusLog.log(Level.FINER, "Event without marker {0}", String.valueOf(e));
+ }
}
}
focusLog.log(Level.FINEST, "Markers after FOCUS_GAINED");
@@ -1147,8 +1165,10 @@
return;
}
+ if (focusLog.isLoggable(Level.FINER)) {
focusLog.log(Level.FINER, "Enqueue at {0} for {1}",
- new Object[] {after, untilFocused});
+ new Object[] {after, String.valueOf(untilFocused)});
+ }
int insertionIndex = 0,
i = typeAheadMarkers.size();
@@ -1187,8 +1207,10 @@
return;
}
+ if (focusLog.isLoggable(Level.FINER)) {
focusLog.log(Level.FINER, "Dequeue at {0} for {1}",
- new Object[] {after, untilFocused});
+ new Object[] {after, String.valueOf(untilFocused)});
+ }
TypeAheadMarker marker;
ListIterator iter = typeAheadMarkers.listIterator
Modified: classlib6/core/src/openjdk/java/java/awt/DisplayMode.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/DisplayMode.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/DisplayMode.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.awt;
Modified: classlib6/core/src/openjdk/java/java/awt/Event.java
===================================================================
--- classlib6/core/src/openjdk/java/java/awt/Event.java 2011-03-05 13:27:27 UTC (rev 5804)
+++ classlib6/core/src/openjdk/java/java/awt/Event.java 2011-03-06 18:55:51 UTC (rev 5805)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995-2002 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 2002, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth ...
[truncated message content] |
