diff options
| author | Tom Tromey <tromey@redhat.com> | 2003-07-23 09:53:34 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-07-23 09:53:34 +0000 |
| commit | 5c798f921aa4118b8189aed1ab4f1dced24340dd (patch) | |
| tree | de0ce9c72ec9447a95474e18c45a3210b3e9b015 /libjava/java/awt | |
| parent | 78ace45e998cd5c89df568a1f16092bed90f17c5 (diff) | |
| download | gcc-5c798f921aa4118b8189aed1ab4f1dced24340dd.zip gcc-5c798f921aa4118b8189aed1ab4f1dced24340dd.tar.gz gcc-5c798f921aa4118b8189aed1ab4f1dced24340dd.tar.bz2 | |
Window.java (getWarningString): Just return the string.
* java/awt/Window.java (getWarningString): Just return the
string.
(Window): Set warningString; check with security manager.
From-SVN: r69699
Diffstat (limited to 'libjava/java/awt')
| -rw-r--r-- | libjava/java/awt/Window.java | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java index c286381..1491ec6 100644 --- a/libjava/java/awt/Window.java +++ b/libjava/java/awt/Window.java @@ -159,9 +159,10 @@ public class Window extends Container implements Accessible // FIXME: add to owner's "owned window" list //owner.owned.add(this); // this should be a weak reference - /* FIXME: Security check - SecurityManager.checkTopLevelWindow(...) - */ + // FIXME: make this text visible in the window. + SecurityManager s = System.getSecurityManager(); + if (s != null && ! s.checkTopLevelWindow(this)) + warningString = System.getProperty("awt.appletWarning"); if (gc != null && gc.getDevice().getType() != GraphicsDevice.TYPE_RASTER_SCREEN) @@ -315,20 +316,7 @@ public class Window extends Container implements Accessible */ public final String getWarningString() { - boolean secure = true; - /* boolean secure = SecurityManager.checkTopLevelWindow(...) */ - - if (!secure) - { - if (warningString != null) - return warningString; - else - { - String warning = System.getProperty("awt.appletWarning"); - return warning; - } - } - return null; + return warningString; } /** |