8263454: com.apple.laf.AquaFileChooserUI ignores the result of String…

….trim()

Reviewed-by: serb, pbansal, kizune, trebari, psadhukhan

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2037,11 +2037,9 @@ String getApproveButtonText(final JFileChooser fc) {
         // Try to get the custom text.  If none, use the fallback
         String getApproveButtonText(final JFileChooser fc, final String fallbackText) {
             final String buttonText = fc.getApproveButtonText();
-            if (buttonText != null) {
-                buttonText.trim();
-                if (!buttonText.isEmpty()) return buttonText;
-            }
-            return fallbackText;
+            return buttonText != null
+                    ? buttonText
+                    : fallbackText;
         }
 
         int getApproveButtonMnemonic(final JFileChooser fc) {
@@ -2056,11 +2054,9 @@ String getApproveButtonToolTipText(final JFileChooser fc) {
 
         String getApproveButtonToolTipText(final JFileChooser fc, final String fallbackText) {
             final String tooltipText = fc.getApproveButtonToolTipText();
-            if (tooltipText != null) {
-                tooltipText.trim();
-                if (!tooltipText.isEmpty()) return tooltipText;
-            }
-            return fallbackText;
+            return tooltipText != null
+                    ? tooltipText
+                    : fallbackText;
         }
 
         String getCancelButtonToolTipText(final JFileChooser fc) {