1 files changed, 8 insertions, 4 deletions
diff --git a/javax/swing/SwingUtilities.java b/javax/swing/SwingUtilities.java
index 29d769b90..13470f304 100644
--- a/javax/swing/SwingUtilities.java
+++ b/javax/swing/SwingUtilities.java
@@ -365,7 +365,7 @@ public class SwingUtilities
    * @return the first ancestor Window of <code>comp</code> or
    *     <code>null</code> if <code>comp</code> is not contained in a Window
    */
-  public Window getWindowAncestor(Component comp)
+  public static Window getWindowAncestor(Component comp)
   {
     return (Window) getAncestorOfClass(Window.class, comp);
   }
@@ -1128,9 +1128,13 @@ public class SwingUtilities
       component.setActionMap(uiActionMap);
     else
       {
-        while(child.getParent() != null
-              && !(child.getParent() instanceof ActionMapUIResource))
-          child = child.getParent();
+        ActionMap parent = child.getParent();
+        while(parent != null)
+          {
+            child = parent;
+            parent = child.getParent();
+          }
+
         if (child != null)
           child.setParent(uiActionMap);
       }