2005-11-27 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD --> generics from the release of Classpath 0.19
	to 2005/11/27.

1 files changed, 9 insertions, 9 deletions

diff --git a/javax/swing/SwingUtilities.java b/javax/swing/SwingUtilities.java
index 43f632b54..2d737eeb5 100644
--- a/javax/swing/SwingUtilities.java
+++ b/javax/swing/SwingUtilities.java
@@ -1138,14 +1138,12 @@ public class SwingUtilities
     else
       {
         ActionMap parent = child.getParent();
-        while(parent != null)
+        while (parent != null && !(parent instanceof ActionMapUIResource))
           {
             child = parent;
             parent = child.getParent();
           }
-
-        if (child != null)
-          child.setParent(uiActionMap);
+        child.setParent(uiActionMap);
       }
   }
 
@@ -1181,11 +1179,13 @@ public class SwingUtilities
       component.setInputMap(condition, uiInputMap);
     else
       {
-        while(child.getParent() != null
-              && !(child.getParent() instanceof InputMapUIResource))
-          child = child.getParent();
-        if (child != null)
-          child.setParent(uiInputMap);
+        InputMap parent = child.getParent();
+        while (parent != null && !(parent instanceof InputMapUIResource))
+          {
+            child = parent;
+            parent = parent.getParent();
+          }
+        child.setParent(uiInputMap);
       }
   }