diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/awt/Window.java | 22 |
2 files changed, 11 insertions, 17 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 451d6a1a..cad0018 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-07-22 Tom Tromey <tromey@redhat.com> + + * java/awt/Window.java (getWarningString): Just return the + string. + (Window): Set warningString; check with security manager. + 2003-07-22 Scott Gilbertson <scottg@mantatest.com> * gnu/awt/xlib/XGraphicsConfiguration.java 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; } /** |