8300549: JFileChooser Approve button tooltip is null in Aqua L&F in CUSTOM_DIALOG mode

Reviewed-by: aivanov, abhiscxk

Author: Tejesh R

src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java

@@ -162,6 +162,7 @@ public class AquaFileChooserUI extends FileChooserUI {
     protected String filenameTextFieldToolTipText = null;
     protected String filterComboBoxToolTipText = null;
     protected String openDirectoryButtonToolTipText = null;
+    protected String chooseButtonToolTipText = null;
 
     protected String cancelOpenButtonToolTipText = null;
     protected String cancelSaveButtonToolTipText = null;
@@ -323,6 +324,7 @@ protected void installStrings(final JFileChooser fc) {
         // Mac-specific, required
         newFolderExistsErrorText = getString("FileChooser.newFolderExistsErrorText", "That name is already taken");
         chooseButtonText = getString("FileChooser.chooseButtonText", "Choose");
+        chooseButtonToolTipText = getString("FileChooser.chooseButtonToolTipText", "Choose selected file");
         newFolderButtonText = getString("FileChooser.newFolderButtonText", "New");
         newFolderTitleText = getString("FileChooser.newFolderTitleText", "New Folder");
 
@@ -397,6 +399,7 @@ protected void uninstallStrings(final JFileChooser fc) {
         cancelSaveButtonToolTipText = null;
         cancelChooseButtonToolTipText = null;
         cancelNewFolderButtonToolTipText = null;
+        chooseButtonToolTipText = null;
 
         saveButtonToolTipText = null;
         openButtonToolTipText = null;
@@ -2051,9 +2054,9 @@ int getApproveButtonMnemonic(final JFileChooser fc) {
             return fc.getApproveButtonMnemonic();
         }
 
-        // No fallback
         String getApproveButtonToolTipText(final JFileChooser fc) {
-            return getApproveButtonToolTipText(fc, null);
+            // Fallback to "Choose selected file"
+            return getApproveButtonToolTipText(fc, chooseButtonToolTipText);
         }
 
         String getApproveButtonToolTipText(final JFileChooser fc, final String fallbackText) {

src/java.desktop/macosx/classes/com/apple/laf/resources/aqua.properties

@@ -60,6 +60,7 @@ FileChooser.saveTitle.textAndMnemonic=Save
 FileChooser.openTitle.textAndMnemonic=Open
 FileChooser.newFolderExistsError.textAndMnemonic=That name is already taken
 FileChooser.chooseButton.textAndMnemonic=Choose
+FileChooser.chooseButtonToolTip.textAndMnemonic=Choose selected file
 
 FileChooser.newFolderButton.textAndMnemonic=New Folder
 FileChooser.newFolderTitle.textAndMnemonic=New Folder