diff options
| author | Roman Kennke <roman@kennke.org> | 2005-06-03 11:55:28 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2005-06-03 11:55:28 +0000 |
| commit | 4e02ce8ebd02fec0948467e842f0489d572a6875 (patch) | |
| tree | ff1da0bea21e114c48b7627ba519d2f4840ba34e /javax/swing/ActionMap.java | |
| parent | 9715835487537f2f2700168890584b66bdd06713 (diff) | |
| download | classpath-4e02ce8ebd02fec0948467e842f0489d572a6875.tar.gz | |
2005-06-03 Roman Kennke <roman@kennke.org>
* javax/swing/SwingUtilites.java
(replaceUIActionMap): Fixed loop again. Now correctly, I hope.
* javax/swing/ActionMap.java
(setParent): Make sure we don't build a loop.
* javax/swing/plaf/basic/BasicTextUI.java
(createActionMap): Create ActionMapUIResource instead of
plain ActionMap.
Diffstat (limited to 'javax/swing/ActionMap.java')
| -rw-r--r-- | javax/swing/ActionMap.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/javax/swing/ActionMap.java b/javax/swing/ActionMap.java index 26d1d6fa9..939affe85 100644 --- a/javax/swing/ActionMap.java +++ b/javax/swing/ActionMap.java @@ -133,7 +133,8 @@ public class ActionMap */ public void setParent(ActionMap parentMap) { - parent = parentMap; + if (parentMap != this) + parent = parentMap; } /** |