From 9eb74bf2547939be13d60d0535305b833fb3f6d0 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 23 Jul 2003 09:53:34 +0000
Subject: 	* java/awt/Window.java (getWarningString): Just return the 
 string. 	(Window): Set warningString; check with security manager.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69699 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/java/awt/Window.java | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'libjava/java')

diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java
index c286381c36a..1491ec6c650 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;
   }
 
   /**
-- 
cgit v1.2.3