Commit 130de160 by Sascha Brawer Committed by Tom Tromey

Toolkit.java (getSystemEventQueue): Call SecurityManager if one is installed.

2003-09-11  Sascha Brawer  <brawer@dandelis.ch>

	* java/awt/Toolkit.java (getSystemEventQueue): Call SecurityManager
	if one is installed. Improve Javadoc.
	(getSystemEventQueueImpl): Improve Javadoc.

From-SVN: r71308
parent c203255a
2003-09-11 Sascha Brawer <brawer@dandelis.ch>
* java/awt/Toolkit.java (getSystemEventQueue): Call SecurityManager
if one is installed. Improve Javadoc.
(getSystemEventQueueImpl): Improve Javadoc.
2003-09-11 Tom Tromey <tromey@redhat.com> 2003-09-11 Tom Tromey <tromey@redhat.com>
* java/io/natFilePosix.cc (getCanonicalPath): Handle case where * java/io/natFilePosix.cc (getCanonicalPath): Handle case where
......
...@@ -803,23 +803,58 @@ public abstract class Toolkit ...@@ -803,23 +803,58 @@ public abstract class Toolkit
return props.getProperty(key, def); return props.getProperty(key, def);
} }
/** /**
* Returns the event queue for the applet. Despite the word "System" * Returns the event queue that is suitable for the calling context.
* in the name of this method, there is no guarantee that the same queue *
* is shared system wide. * <p>Despite the word “System” in the name of this
* method, a toolkit may provide different event queues for each
* applet. There is no guarantee that the same queue is shared
* system-wide.
*
* <p>The implementation first checks whether a
* SecurityManager has been installed. If so, its {@link
* java.lang.SecurityManager#checkAwtEventQueueAccess()} method gets
* called. The security manager will throw a SecurityException if it
* does not grant the permission to access the event queue.
* *
* @return The event queue for this applet (or application) * <p>Next, the call is delegated to {@link
* #getSystemEventQueueImpl()}.
*
* @return The event queue for this applet (or application).
*
* @throws SecurityException if a security manager has been
* installed, and it does not grant the permission to access the
* event queue.
*/ */
public final EventQueue getSystemEventQueue() public final EventQueue getSystemEventQueue()
{ {
SecurityManager sm;
sm = System.getSecurityManager();
if (sm != null)
sm.checkAwtEventQueueAccess();
return getSystemEventQueueImpl(); return getSystemEventQueueImpl();
} }
/** /**
* // FIXME: What does this do? * Returns the event queue that is suitable for the calling context.
*
* <p>Despite the word “,System”, in the name of this
* method, a toolkit may provide different event queues for each
* applet. There is no guarantee that the same queue is shared
* system-wide.
*
* <p>No security checks are performed, which is why this method
* may only be called by Toolkits.
*
* @see #getSystemEventQueue()
*/ */
protected abstract EventQueue getSystemEventQueueImpl(); protected abstract EventQueue getSystemEventQueueImpl();
/** /**
* @since 1.3 * @since 1.3
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment