This patch fixes another Mauve regression pointed out by Mark.
BasicFileChooserUI should return the FileChooser's getApproveButtonText
as long as it is not null.

2005-11-01  Anthony Balkissoon  <[EMAIL PROTECTED]>

        * javax/swing/plaf/basic/BasicFileChooserUI.java:
        (getApproveButtonText): First use the JFileChooser's approve button 
        text, but if it is null, then try otherwise.

--Tony
? JFileChooser.txt
Index: javax/swing/plaf/basic/BasicFileChooserUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java,v
retrieving revision 1.15
diff -u -r1.15 BasicFileChooserUI.java
--- javax/swing/plaf/basic/BasicFileChooserUI.java	18 Oct 2005 22:10:32 -0000	1.15
+++ javax/swing/plaf/basic/BasicFileChooserUI.java	1 Nov 2005 19:05:30 -0000
@@ -1909,7 +1909,9 @@
    */
   public String getApproveButtonText(JFileChooser fc)
   {
-    if (fc.getDialogType() == JFileChooser.SAVE_DIALOG)
+    if (fc.getApproveButtonText() != null)
+      return fc.getApproveButtonText();
+    else if (fc.getDialogType() == JFileChooser.SAVE_DIALOG)
       return saveButtonText;
     else
       return openButtonText;
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches

Reply via email to