Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5802] classlib6/core/src/openjdk/sun/sun
|
From: <ls...@us...> - 2011-03-05 13:01:25
|
Revision: 5802
http://jnode.svn.sourceforge.net/jnode/?rev=5802&view=rev
Author: lsantha
Date: 2011-03-05 13:01:15 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
Integrating OpenJDK 6 b22.
Modified Paths:
--------------
classlib6/core/src/openjdk/sun/sun/awt/SunToolkit.java
classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDragSourceContextPeer.java
classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetContextPeer.java
classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetEvent.java
classlib6/core/src/openjdk/sun/sun/awt/image/BadDepthException.java
classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceData.java
classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceManager.java
classlib6/core/src/openjdk/sun/sun/awt/image/BufImgVolatileSurfaceManager.java
classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageDevice.java
classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageGraphicsConfig.java
classlib6/core/src/openjdk/sun/sun/awt/image/ByteArrayImageSource.java
classlib6/core/src/openjdk/sun/sun/awt/image/ByteBandedRaster.java
classlib6/core/src/openjdk/sun/sun/awt/image/ByteComponentRaster.java
classlib6/core/src/openjdk/sun/sun/awt/image/ByteInterleavedRaster.java
classlib6/core/src/openjdk/sun/sun/awt/image/BytePackedRaster.java
classlib6/core/src/openjdk/sun/sun/awt/image/DataBufferNative.java
classlib6/core/src/openjdk/sun/sun/awt/image/FileImageSource.java
classlib6/core/src/openjdk/sun/sun/awt/image/GifImageDecoder.java
classlib6/core/src/openjdk/sun/sun/awt/image/ImageAccessException.java
classlib6/core/src/openjdk/sun/sun/awt/image/ImageConsumerQueue.java
classlib6/core/src/openjdk/sun/sun/awt/image/ImageDecoder.java
classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetchable.java
classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetcher.java
classlib6/core/src/openjdk/sun/sun/awt/image/ImageFormatException.java
classlib6/core/src/openjdk/sun/sun/awt/image/ImageRepresentation.java
classlib6/core/src/openjdk/sun/sun/awt/image/ImageWatched.java
classlib6/core/src/openjdk/sun/sun/awt/image/ImagingLib.java
classlib6/core/src/openjdk/sun/sun/awt/image/InputStreamImageSource.java
classlib6/core/src/openjdk/sun/sun/awt/image/IntegerComponentRaster.java
classlib6/core/src/openjdk/sun/sun/awt/image/IntegerInterleavedRaster.java
classlib6/core/src/openjdk/sun/sun/awt/image/JPEGImageDecoder.java
classlib6/core/src/openjdk/sun/sun/awt/image/NativeLibLoader.java
classlib6/core/src/openjdk/sun/sun/awt/image/OffScreenImage.java
classlib6/core/src/openjdk/sun/sun/awt/image/OffScreenImageSource.java
classlib6/core/src/openjdk/sun/sun/awt/image/PNGImageDecoder.java
classlib6/core/src/openjdk/sun/sun/awt/image/PixelConverter.java
classlib6/core/src/openjdk/sun/sun/awt/image/ShortBandedRaster.java
classlib6/core/src/openjdk/sun/sun/awt/image/ShortComponentRaster.java
classlib6/core/src/openjdk/sun/sun/awt/image/ShortInterleavedRaster.java
classlib6/core/src/openjdk/sun/sun/awt/image/SunVolatileImage.java
classlib6/core/src/openjdk/sun/sun/awt/image/SunWritableRaster.java
classlib6/core/src/openjdk/sun/sun/awt/image/SurfaceManager.java
classlib6/core/src/openjdk/sun/sun/awt/image/ToolkitImage.java
classlib6/core/src/openjdk/sun/sun/awt/image/VolatileSurfaceManager.java
classlib6/core/src/openjdk/sun/sun/awt/image/WritableRasterNative.java
classlib6/core/src/openjdk/sun/sun/awt/image/XbmImageDecoder.java
classlib6/core/src/openjdk/sun/sun/corba/Bridge.java
classlib6/core/src/openjdk/sun/sun/java2d/pisces/Dasher.java
classlib6/core/src/openjdk/sun/sun/java2d/pisces/LineSink.java
classlib6/core/src/openjdk/sun/sun/java2d/pisces/PiscesCache.java
classlib6/core/src/openjdk/sun/sun/java2d/pisces/PiscesMath.java
classlib6/core/src/openjdk/sun/sun/java2d/pisces/PiscesRenderingEngine.java
classlib6/core/src/openjdk/sun/sun/java2d/pisces/PiscesTileGenerator.java
classlib6/core/src/openjdk/sun/sun/java2d/pisces/Renderer.java
classlib6/core/src/openjdk/sun/sun/java2d/pisces/Stroker.java
classlib6/core/src/openjdk/sun/sun/java2d/pisces/Transform4.java
classlib6/core/src/openjdk/sun/sun/management/jmxremote/ConnectorBootstrap.java
classlib6/core/src/openjdk/sun/sun/management/jmxremote/LocalRMIServerSocketFactory.java
classlib6/core/src/openjdk/sun/sun/management/jmxremote/SSLContextRMIServerSocketFactory.java
classlib6/core/src/openjdk/sun/sun/management/jmxremote/SingleEntryRegistry.java
classlib6/core/src/openjdk/sun/sun/management/jmxremote/package.html
classlib6/core/src/openjdk/sun/sun/management/resources/agent.properties
classlib6/core/src/openjdk/sun/sun/management/resources/agent_de.properties
classlib6/core/src/openjdk/sun/sun/management/resources/agent_es.properties
classlib6/core/src/openjdk/sun/sun/management/resources/agent_fr.properties
classlib6/core/src/openjdk/sun/sun/management/resources/agent_it.properties
classlib6/core/src/openjdk/sun/sun/management/resources/agent_ja.properties
classlib6/core/src/openjdk/sun/sun/management/resources/agent_ko.properties
classlib6/core/src/openjdk/sun/sun/management/resources/agent_sv.properties
classlib6/core/src/openjdk/sun/sun/management/resources/agent_zh_CN.properties
classlib6/core/src/openjdk/sun/sun/management/resources/agent_zh_TW.properties
classlib6/core/src/openjdk/sun/sun/misc/ASCIICaseInsensitiveComparator.java
classlib6/core/src/openjdk/sun/sun/misc/BASE64Decoder.java
classlib6/core/src/openjdk/sun/sun/misc/BASE64Encoder.java
classlib6/core/src/openjdk/sun/sun/misc/CEFormatException.java
classlib6/core/src/openjdk/sun/sun/misc/CEStreamExhausted.java
classlib6/core/src/openjdk/sun/sun/misc/CRC16.java
classlib6/core/src/openjdk/sun/sun/misc/Cache.java
classlib6/core/src/openjdk/sun/sun/misc/CharacterDecoder.java
classlib6/core/src/openjdk/sun/sun/misc/CharacterEncoder.java
classlib6/core/src/openjdk/sun/sun/misc/ClassFileTransformer.java
classlib6/core/src/openjdk/sun/sun/misc/ClassLoaderUtil.java
classlib6/core/src/openjdk/sun/sun/misc/Cleaner.java
classlib6/core/src/openjdk/sun/sun/misc/Compare.java
classlib6/core/src/openjdk/sun/sun/misc/CompoundEnumeration.java
classlib6/core/src/openjdk/sun/sun/misc/ConditionLock.java
classlib6/core/src/openjdk/sun/sun/misc/DoubleConsts.java
classlib6/core/src/openjdk/sun/sun/misc/ExtensionDependency.java
classlib6/core/src/openjdk/sun/sun/misc/ExtensionInfo.java
classlib6/core/src/openjdk/sun/sun/misc/ExtensionInstallationException.java
classlib6/core/src/openjdk/sun/sun/misc/ExtensionInstallationProvider.java
classlib6/core/src/openjdk/sun/sun/misc/FloatConsts.java
classlib6/core/src/openjdk/sun/sun/misc/FloatingDecimal.java
classlib6/core/src/openjdk/sun/sun/misc/FormattedFloatingDecimal.java
classlib6/core/src/openjdk/sun/sun/misc/FpUtils.java
classlib6/core/src/openjdk/sun/sun/misc/GC.java
classlib6/core/src/openjdk/sun/sun/misc/HexDumpEncoder.java
classlib6/core/src/openjdk/sun/sun/misc/InvalidJarIndexException.java
classlib6/core/src/openjdk/sun/sun/misc/JarFilter.java
classlib6/core/src/openjdk/sun/sun/misc/JarIndex.java
classlib6/core/src/openjdk/sun/sun/misc/JavaIOFileDescriptorAccess.java
classlib6/core/src/openjdk/sun/sun/misc/JavaLangAccess.java
classlib6/core/src/openjdk/sun/sun/misc/JavaNetAccess.java
classlib6/core/src/openjdk/sun/sun/misc/JavaUtilJarAccess.java
classlib6/core/src/openjdk/sun/sun/misc/LRUCache.java
classlib6/core/src/openjdk/sun/sun/misc/Launcher.java
classlib6/core/src/openjdk/sun/sun/misc/Lock.java
classlib6/core/src/openjdk/sun/sun/misc/MessageUtils.java
classlib6/core/src/openjdk/sun/sun/misc/NativeSignalHandler.java
classlib6/core/src/openjdk/sun/sun/misc/Perf.java
classlib6/core/src/openjdk/sun/sun/misc/PerformanceLogger.java
classlib6/core/src/openjdk/sun/sun/misc/ProxyGenerator.java
classlib6/core/src/openjdk/sun/sun/misc/Queue.java
classlib6/core/src/openjdk/sun/sun/misc/REException.java
classlib6/core/src/openjdk/sun/sun/misc/Ref.java
classlib6/core/src/openjdk/sun/sun/misc/Regexp.java
classlib6/core/src/openjdk/sun/sun/misc/RegexpPool.java
classlib6/core/src/openjdk/sun/sun/misc/RegexpTarget.java
classlib6/core/src/openjdk/sun/sun/misc/Request.java
classlib6/core/src/openjdk/sun/sun/misc/RequestProcessor.java
classlib6/core/src/openjdk/sun/sun/misc/Resource.java
classlib6/core/src/openjdk/sun/sun/misc/Service.java
classlib6/core/src/openjdk/sun/sun/misc/ServiceConfigurationError.java
classlib6/core/src/openjdk/sun/sun/misc/SharedSecrets.java
classlib6/core/src/openjdk/sun/sun/misc/Signal.java
classlib6/core/src/openjdk/sun/sun/misc/SignalHandler.java
classlib6/core/src/openjdk/sun/sun/misc/SoftCache.java
classlib6/core/src/openjdk/sun/sun/misc/Sort.java
classlib6/core/src/openjdk/sun/sun/misc/Timeable.java
classlib6/core/src/openjdk/sun/sun/misc/Timer.java
classlib6/core/src/openjdk/sun/sun/misc/UCDecoder.java
classlib6/core/src/openjdk/sun/sun/misc/UCEncoder.java
classlib6/core/src/openjdk/sun/sun/misc/URLClassPath.java
classlib6/core/src/openjdk/sun/sun/misc/UUDecoder.java
classlib6/core/src/openjdk/sun/sun/misc/UUEncoder.java
classlib6/core/src/openjdk/sun/sun/misc/Unsafe.java
classlib6/core/src/openjdk/sun/sun/misc/VM.java
classlib6/core/src/openjdk/sun/sun/misc/VMNotification.java
classlib6/core/src/openjdk/sun/sun/net/NetworkClient.java
classlib6/core/src/openjdk/sun/sun/net/www/MessageHeader.java
classlib6/core/src/openjdk/sun/sun/reflect/misc/MethodUtil.java
classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry.properties
classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_de.properties
classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_es.properties
classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_fr.properties
classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_it.properties
classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_ja.properties
classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_ko.properties
classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_sv.properties
classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid.properties
classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_de.properties
classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_es.properties
classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_fr.properties
classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_it.properties
classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_ja.properties
classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_ko.properties
classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_sv.properties
classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_zh_CN.properties
classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_zh_TW.properties
Added Paths:
-----------
classlib6/core/src/openjdk/sun/sun/awt/AWTAccessor.java
classlib6/core/src/openjdk/sun/sun/misc/JavaSecurityAccess.java
classlib6/core/src/openjdk/sun/sun/rmi/server/Activation.java
Added: classlib6/core/src/openjdk/sun/sun/awt/AWTAccessor.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/AWTAccessor.java (rev 0)
+++ classlib6/core/src/openjdk/sun/sun/awt/AWTAccessor.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * 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
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.awt;
+
+import java.awt.*;
+import java.awt.event.InputEvent;
+import java.awt.geom.Point2D;
+import java.awt.image.BufferedImage;
+
+import sun.misc.Unsafe;
+import java.awt.peer.ComponentPeer;
+
+import java.security.AccessController;
+import java.security.AccessControlContext;
+
+/**
+ * The AWTAccessor utility class.
+ * The main purpose of this class is to enable accessing
+ * private and package-private fields of classes from
+ * different classes/packages. See sun.misc.SharedSecretes
+ * for another example.
+ */
+public final class AWTAccessor {
+
+ private static final Unsafe unsafe = Unsafe.getUnsafe();
+
+ /*
+ * We don't need any objects of this class.
+ * It's rather a collection of static methods
+ * and interfaces.
+ */
+ private AWTAccessor() {
+ }
+
+ /*
+ * An interface of accessor for the java.awt.Component class.
+ */
+ public interface ComponentAccessor {
+ /*
+ * Returns the acc this component was constructed with.
+ */
+ AccessControlContext getAccessControlContext(Component comp);
+ }
+
+ /*
+ * An accessor for the AWTEvent class.
+ */
+ public interface AWTEventAccessor {
+ /**
+ * Sets the flag on this AWTEvent indicating that it was
+ * generated by the system.
+ */
+ void setSystemGenerated(AWTEvent ev);
+
+ /**
+ * Indicates whether this AWTEvent was generated by the system.
+ */
+ boolean isSystemGenerated(AWTEvent ev);
+
+
+ /*
+ * Returns the acc this event was constructed with.
+ */
+ AccessControlContext getAccessControlContext(AWTEvent ev);
+
+ }
+
+ /*
+ * Accessor instances are initialized in the static initializers of
+ * corresponding AWT classes by using setters defined below.
+ */
+ private static ComponentAccessor componentAccessor;
+ private static AWTEventAccessor awtEventAccessor;
+
+ /*
+ * Set an accessor object for the java.awt.Component class.
+ */
+ public static void setComponentAccessor(ComponentAccessor ca) {
+ componentAccessor = ca;
+ }
+
+ /*
+ * Retrieve the accessor object for the java.awt.Component class.
+ */
+ public static ComponentAccessor getComponentAccessor() {
+ if (componentAccessor == null) {
+ unsafe.ensureClassInitialized(Component.class);
+ }
+
+ return componentAccessor;
+ }
+
+ /*
+ * Set an accessor object for the java.awt.AWTEvent class.
+ */
+ public static void setAWTEventAccessor(AWTEventAccessor aea) {
+ awtEventAccessor = aea;
+ }
+
+ /*
+ * Retrieve the accessor object for the java.awt.AWTEvent class.
+ */
+ public static AWTEventAccessor getAWTEventAccessor() {
+ if (awtEventAccessor == null) {
+ unsafe.ensureClassInitialized(AWTEvent.class);
+ }
+ return awtEventAccessor;
+ }
+}
Modified: classlib6/core/src/openjdk/sun/sun/awt/SunToolkit.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/SunToolkit.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/SunToolkit.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1997, 2008, 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 sun.awt;
@@ -859,6 +859,15 @@
return AccessController.doPrivileged(new GetBooleanAction("sun.awt.erasebackgroundonresize"));
}
+
+ /**
+ * Makes the window OverrideRedirect, on X11 platforms. See
+ * ICCCM specification for more details about OverrideRedirect
+ * windows. Implemented in XToolkit, no-op in WToolkit.
+ */
+ public void setOverrideRedirect(Window target) {
+ }
+
static SoftCache imgCache = new SoftCache();
static synchronized Image getImageFromHash(Toolkit tk, URL url) {
Modified: classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDragSourceContextPeer.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDragSourceContextPeer.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDragSourceContextPeer.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -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 sun.awt.dnd;
Modified: classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetContextPeer.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetContextPeer.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetContextPeer.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2010, 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 sun.awt.dnd;
@@ -57,6 +57,7 @@
import sun.awt.SunToolkit;
import sun.awt.datatransfer.DataTransferer;
import sun.awt.datatransfer.ToolkitThreadBlockedHandler;
+import sun.security.util.SecurityConstants;
/**
* <p>
@@ -216,6 +217,17 @@
throws UnsupportedFlavorException, IOException,
InvalidDnDOperationException
{
+ SecurityManager sm = System.getSecurityManager();
+ try {
+ if (!dropComplete && sm != null) {
+ sm.checkSystemClipboardAccess();
+ }
+ } catch (Exception e) {
+ Thread currentThread = Thread.currentThread();
+ currentThread.getUncaughtExceptionHandler().uncaughtException(currentThread, e);
+ return null;
+ }
+
Long lFormat = null;
Transferable localTransferable = local;
Modified: classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetEvent.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetEvent.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetEvent.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -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 sun.awt.dnd;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BadDepthException.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/BadDepthException.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/BadDepthException.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceData.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceData.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceData.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2010, 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 sun.awt.image;
@@ -49,7 +49,7 @@
private BufferedImageGraphicsConfig graphicsConfig;
RenderLoops solidloops;
- private static native void initIDs(Class ICM);
+ private static native void initIDs(Class ICM, Class ICMColorData);
private static final int DCM_RGBX_RED_MASK = 0xff000000;
private static final int DCM_RGBX_GREEN_MASK = 0x00ff0000;
@@ -67,7 +67,7 @@
private static final int DCM_ARGBBM_BLUE_MASK = 0x000000ff;
static {
- initIDs(IndexColorModel.class);
+ initIDs(IndexColorModel.class, ICMColorData.class);
}
public static SurfaceData createData(BufferedImage bufImg) {
@@ -403,7 +403,7 @@
// their pixels are immediately retrievable anyway.
}
- public static native void freeNativeICMData(IndexColorModel icm);
+ private static native void freeNativeICMData(long pData);
/**
* Returns destination Image associated with this SurfaceData.
@@ -411,4 +411,19 @@
public Object getDestination() {
return bufImg;
}
+
+ public static final class ICMColorData {
+ private long pData = 0L;
+
+ private ICMColorData(long pData) {
+ this.pData = pData;
+ }
+
+ public void finalize() {
+ if (pData != 0L) {
+ BufImgSurfaceData.freeNativeICMData(pData);
+ pData = 0L;
+ }
+ }
+ }
}
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceManager.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceManager.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceManager.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BufImgVolatileSurfaceManager.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/BufImgVolatileSurfaceManager.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/BufImgVolatileSurfaceManager.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageDevice.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageDevice.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageDevice.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2000, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageGraphicsConfig.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageGraphicsConfig.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageGraphicsConfig.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ByteArrayImageSource.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/ByteArrayImageSource.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/ByteArrayImageSource.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ByteBandedRaster.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/ByteBandedRaster.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/ByteBandedRaster.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1997, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ByteComponentRaster.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/ByteComponentRaster.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/ByteComponentRaster.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1997, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ByteInterleavedRaster.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/ByteInterleavedRaster.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/ByteInterleavedRaster.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1998, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BytePackedRaster.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/BytePackedRaster.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/BytePackedRaster.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1997, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/DataBufferNative.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/DataBufferNative.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/DataBufferNative.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2001, 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/sun/sun/awt/image/FileImageSource.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/FileImageSource.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/FileImageSource.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995-1996 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 1996, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/GifImageDecoder.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/GifImageDecoder.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/GifImageDecoder.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -585,9 +585,16 @@
System.out.print("Reading a " + width + " by " + height + " " +
(interlace ? "" : "non-") + "interlaced image...");
}
-
+ int initCodeSize = ExtractByte(block, 9);
+ if (initCodeSize >= 12) {
+ if (verbose) {
+ System.out.println("Invalid initial code size: " +
+ initCodeSize);
+ }
+ return false;
+ }
boolean ret = parseImage(x, y, width, height,
- interlace, ExtractByte(block, 9),
+ interlace, initCodeSize,
block, rasline, model);
if (!ret) {
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageAccessException.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/ImageAccessException.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageAccessException.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageConsumerQueue.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/ImageConsumerQueue.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageConsumerQueue.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageDecoder.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/ImageDecoder.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageDecoder.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetchable.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetchable.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetchable.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 2001, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetcher.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetcher.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetcher.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 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 sun.awt.image;
Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageFormatException.java
===================================================================
--- classlib6/core/src/openjdk/sun/sun/awt/image/ImageFormatException.java 2011-03-05 11:39:52 UTC (rev 5801)
+++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageFormatException.java 2011-03-05 13:01:15 UTC (rev 5802)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 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 info...
[truncated message content] |
