From a4171ce18efea96907998485b2a71e3d4f9dde4f Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Thu, 27 May 2004 12:26:13 +0000 Subject: [PATCH] 2004-05-27 Michael Koch * javax/swing/JPopupMenu.java (isVisible): Do not use visible directly. (setVisible): Likewise. * javax/swing/JWindow.java (JWindow): call accessible constructor. * javax/swing/RepaintManager.java (paintDirtyRegions): Use public methods to obtain iterator. From-SVN: r82319 --- libjava/ChangeLog | 10 ++++++++++ libjava/javax/swing/JPopupMenu.java | 18 +++++++++--------- libjava/javax/swing/JWindow.java | 2 +- libjava/javax/swing/RepaintManager.java | 2 +- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 092623c1f5f..7bbe7305f01 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,13 @@ +2004-05-27 Michael Koch + + * javax/swing/JPopupMenu.java + (isVisible): Do not use visible directly. + (setVisible): Likewise. + * javax/swing/JWindow.java + (JWindow): call accessible constructor. + * javax/swing/RepaintManager.java + (paintDirtyRegions): Use public methods to obtain iterator. + 2004-05-25 David Jee * java/awt/Container.java diff --git a/libjava/javax/swing/JPopupMenu.java b/libjava/javax/swing/JPopupMenu.java index 7aa54fb8d1f..e2882f8a01e 100644 --- a/libjava/javax/swing/JPopupMenu.java +++ b/libjava/javax/swing/JPopupMenu.java @@ -70,7 +70,7 @@ import javax.swing.plaf.PopupMenuUI; * DOCUMENT ME! * * @author $author$ - * @version $Revision: 1.3.8.3 $ + * @version $Revision: 1.4 $ */ public class JPopupMenu extends JComponent implements Accessible, MenuElement { @@ -471,7 +471,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement */ public boolean isVisible() { - return super.visible; + return super.isVisible(); } /** @@ -481,7 +481,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement */ public void setVisible(boolean visible) { - super.visible = visible; + super.setVisible(visible); firePopupMenuWillBecomeVisible(); @@ -800,7 +800,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement * DOCUMENT ME! * * @author $author$ - * @version $Revision: 1.3.8.3 $ + * @version $Revision: 1.4 $ */ private interface Popup { @@ -824,7 +824,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement * DOCUMENT ME! * * @author $author$ - * @version $Revision: 1.3.8.3 $ + * @version $Revision: 1.4 $ */ private class LightWeightPopup extends JPanel implements Popup { @@ -870,7 +870,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement * DOCUMENT ME! * * @author $author$ - * @version $Revision: 1.3.8.3 $ + * @version $Revision: 1.4 $ */ private class MediumWeightPopup extends Panel implements Popup { @@ -917,7 +917,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement * DOCUMENT ME! * * @author $author$ - * @version $Revision: 1.3.8.3 $ + * @version $Revision: 1.4 $ */ private class HeavyWeightPopup extends JWindow implements Popup { @@ -958,7 +958,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement * DOCUMENT ME! * * @author $author$ - * @version $Revision: 1.3.8.3 $ + * @version $Revision: 1.4 $ */ public static class Separator extends JSeparator { @@ -984,7 +984,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement * DOCUMENT ME! * * @author $author$ - * @version $Revision: 1.3.8.3 $ + * @version $Revision: 1.4 $ */ protected class AccessibleJPopupMenu extends AccessibleJComponent { diff --git a/libjava/javax/swing/JWindow.java b/libjava/javax/swing/JWindow.java index 2c3c27f3703..eb478eb4b72 100644 --- a/libjava/javax/swing/JWindow.java +++ b/libjava/javax/swing/JWindow.java @@ -80,7 +80,7 @@ public class JWindow extends Window implements Accessible, RootPaneContainer public JWindow() { - super(); + super(null); // FIXME: This throws an exception. } // huuu ? diff --git a/libjava/javax/swing/RepaintManager.java b/libjava/javax/swing/RepaintManager.java index ace19cb27a5..5219e222e35 100644 --- a/libjava/javax/swing/RepaintManager.java +++ b/libjava/javax/swing/RepaintManager.java @@ -438,7 +438,7 @@ public class RepaintManager dirtyComponents.clear(); // step 2: paint those roots - Iterator i = roots.iterator(AbstractMap.ENTRIES); + Iterator i = roots.values().iterator(); while(i.hasNext()) { AbstractMap.BasicMapEntry ent = (AbstractMap.BasicMapEntry) i.next(); -- 2.30.2