[gui][PATCH] setJMenuBar()/getJMenubar()

[Olga Rodimina]

Hi,

This patch sets setJMenuBar() and getJMenuBar() methods to public in
JFrame and JApplet. It also removes these method from JWindow, since
JMenuBar cannot be set for JWindow.

I'll be committing this patch to java-gui-branch.

Olga.
-------------- next part --------------
? .snprj
? libjava.proj
? patch
? resources
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2660.2.162
diff -c -p -u -r1.2660.2.162 ChangeLog
--- ChangeLog	10 Jun 2004 11:25:13 -0000	1.2660.2.162
+++ ChangeLog	10 Jun 2004 14:54:19 -0000
@@ -1,3 +1,15 @@
+2004-06-10  Olga Rodimina <rodimina@redhat.com>
+
+	* javax/swing/JApplet.java:
+	(getJMenuBar): Made public.
+	(setJMenuBar): Likewise.
+	* javax/swing/JFrame.java:
+	(getJMenuBar): Made public.
+	(setJMenuBar): Likewise.
+	* javax/swing/JWindow.java:
+	(getJMenuBar): Removed.
+	(setJMenuBar): Removed.
+
 2004-06-10  Michael Koch  <konqueror@gmx.de>
 
 	* javax/swing/JEditorPane.java
Index: javax/swing/JApplet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JApplet.java,v
retrieving revision 1.3.2.2
diff -c -p -u -r1.3.2.2 JApplet.java
--- javax/swing/JApplet.java	7 Jun 2004 12:41:08 -0000	1.3.2.2
+++ javax/swing/JApplet.java	10 Jun 2004 14:54:19 -0000
@@ -137,10 +137,10 @@ public class JApplet extends Applet impl
     {    return close_action;   }
 
     
-    JMenuBar getJMenuBar()
+    public JMenuBar getJMenuBar()
     {    return getRootPane().getJMenuBar();   }
     
-    void setJMenuBar(JMenuBar menubar)
+    public void setJMenuBar(JMenuBar menubar)
     {    getRootPane().setJMenuBar(menubar); }
     
     
Index: javax/swing/JFrame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFrame.java,v
retrieving revision 1.4.2.4
diff -c -p -u -r1.4.2.4 JFrame.java
--- javax/swing/JFrame.java	8 Jun 2004 08:42:53 -0000	1.4.2.4
+++ javax/swing/JFrame.java	10 Jun 2004 14:54:19 -0000
@@ -113,10 +113,10 @@ public class JFrame extends Frame implem
     return d;
   }
 
-    JMenuBar getJMenuBar()
+  public JMenuBar getJMenuBar()
     {    return getRootPane().getJMenuBar();   }
     
-    void setJMenuBar(JMenuBar menubar)
+  public void setJMenuBar(JMenuBar menubar)
     {    getRootPane().setJMenuBar(menubar); }
     
 
Index: javax/swing/JWindow.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JWindow.java,v
retrieving revision 1.3.18.4
diff -c -p -u -r1.3.18.4 JWindow.java
--- javax/swing/JWindow.java	7 Jun 2004 14:00:35 -0000	1.3.18.4
+++ javax/swing/JWindow.java	10 Jun 2004 14:54:19 -0000
@@ -116,13 +116,6 @@ public class JWindow extends Window impl
     return d;
   }
 
-    JMenuBar getJMenuBar()
-    {    return getRootPane().getJMenuBar();   }
-    
-    void setJMenuBar(JMenuBar menubar)
-    {    getRootPane().setJMenuBar(menubar); }
-    
-
   public  void setLayout(LayoutManager manager)
   {    super.setLayout(manager);  }